Completed
Push — master ( 53c6bc...9752bc )
by Yannick
09:01
created
require/class.SpotterImport.php 3 patches
Indentation   +392 added lines, -392 removed lines patch added patch discarded remove patch
@@ -8,20 +8,20 @@  discard block
 block discarded – undo
8 8
 require_once(dirname(__FILE__).'/class.Stats.php');
9 9
 require_once(dirname(__FILE__).'/class.Source.php');
10 10
 if (isset($globalServerAPRS) && $globalServerAPRS) {
11
-    require_once(dirname(__FILE__).'/class.APRS.php');
11
+	require_once(dirname(__FILE__).'/class.APRS.php');
12 12
 }
13 13
 
14 14
 class SpotterImport {
15
-    private $all_flights = array();
16
-    private $last_delete_hourly = 0;
17
-    private $last_delete = 0;
18
-    private $stats = array();
19
-    private $tmd = 0;
20
-    private $source_location = array();
21
-    public $db = null;
22
-    public $nb = 0;
23
-
24
-    public function __construct($dbc = null) {
15
+	private $all_flights = array();
16
+	private $last_delete_hourly = 0;
17
+	private $last_delete = 0;
18
+	private $stats = array();
19
+	private $tmd = 0;
20
+	private $source_location = array();
21
+	public $db = null;
22
+	public $nb = 0;
23
+
24
+	public function __construct($dbc = null) {
25 25
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB;
26 26
 	if (!(isset($globalNoDB) && $globalNoDB)) {
27 27
 		$Connection = new Connection($dbc);
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
 		$currentdate = date('Y-m-d');
34 34
 		$sourcestat = $Stats->getStatsSource($currentdate);
35 35
 		if (!empty($sourcestat)) {
36
-		    foreach($sourcestat as $srcst) {
37
-		    	$type = $srcst['stats_type'];
36
+			foreach($sourcestat as $srcst) {
37
+				$type = $srcst['stats_type'];
38 38
 			if ($type == 'polar' || $type == 'hist') {
39
-			    $source = $srcst['source_name'];
40
-			    $data = $srcst['source_data'];
41
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
42
-	    		}
43
-		    }
39
+				$source = $srcst['source_name'];
40
+				$data = $srcst['source_data'];
41
+				$this->stats[$currentdate][$source][$type] = json_decode($data,true);
42
+				}
43
+			}
44 44
 		}
45 45
 	}
46 46
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
 		//$APRSSpotter->connect();
49 49
 	}
50 50
 
51
-    }
51
+	}
52 52
 
53
-    public function get_Schedule($id,$ident) {
53
+	public function get_Schedule($id,$ident) {
54 54
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
55 55
 	// Get schedule here, so it's done only one time
56 56
 	
@@ -70,42 +70,42 @@  discard block
 block discarded – undo
70 70
 	$operator = $Spotter->getOperator($ident);
71 71
 	$scheduleexist = false;
72 72
 	if ($Schedule->checkSchedule($operator) == 0) {
73
-	    $operator = $Translation->checkTranslation($ident);
74
-	    if ($Schedule->checkSchedule($operator) == 0) {
73
+		$operator = $Translation->checkTranslation($ident);
74
+		if ($Schedule->checkSchedule($operator) == 0) {
75 75
 		$schedule = $Schedule->fetchSchedule($operator);
76 76
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
77
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80
-		    // Should also check if route schedule = route from DB
81
-		    if ($schedule['DepartureAirportIATA'] != '') {
77
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80
+			// Should also check if route schedule = route from DB
81
+			if ($schedule['DepartureAirportIATA'] != '') {
82 82
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
83
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84
-			    if (trim($airport_icao) != '') {
83
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84
+				if (trim($airport_icao) != '') {
85 85
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
86 86
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
87
-			    }
87
+				}
88
+			}
88 89
 			}
89
-		    }
90
-		    if ($schedule['ArrivalAirportIATA'] != '') {
90
+			if ($schedule['ArrivalAirportIATA'] != '') {
91 91
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
92
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93
-			    if (trim($airport_icao) != '') {
92
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93
+				if (trim($airport_icao) != '') {
94 94
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
95 95
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
96
-			    }
96
+				}
97 97
 			}
98
-		    }
99
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
98
+			}
99
+			$Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
100 100
 		}
101
-	    } else $scheduleexist = true;
101
+		} else $scheduleexist = true;
102 102
 	} else $scheduleexist = true;
103 103
 	// close connection, at least one way will work ?
104
-       if ($scheduleexist) {
104
+	   if ($scheduleexist) {
105 105
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
106
-    		$sch = $Schedule->getSchedule($operator);
106
+			$sch = $Schedule->getSchedule($operator);
107 107
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
108
-       }
108
+	   }
109 109
 	$Spotter->db = null;
110 110
 	$Schedule->db = null;
111 111
 	$Translation->db = null;
@@ -120,78 +120,78 @@  discard block
 block discarded – undo
120 120
 	}
121 121
 	  */
122 122
 	}
123
-    }
123
+	}
124 124
 
125
-    public function checkAll() {
125
+	public function checkAll() {
126 126
 	global $globalDebug, $globalNoImport;
127 127
 	if ($globalDebug) echo "Update last seen flights data...\n";
128 128
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
129
-	    foreach ($this->all_flights as $key => $flight) {
129
+		foreach ($this->all_flights as $key => $flight) {
130 130
 		if (isset($this->all_flights[$key]['id'])) {
131
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132
-    		    $Spotter = new Spotter($this->db);
133
-        	    $real_arrival = $this->arrival($key);
134
-        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
135
-        	}
136
-	    }
131
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132
+				$Spotter = new Spotter($this->db);
133
+				$real_arrival = $this->arrival($key);
134
+				if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
135
+			}
136
+		}
137
+	}
137 138
 	}
138
-    }
139 139
 
140
-    public function arrival($key) {
140
+	public function arrival($key) {
141 141
 	global $globalClosestMinDist, $globalDebug;
142 142
 	if ($globalDebug) echo 'Update arrival...'."\n";
143 143
 	$Spotter = new Spotter($this->db);
144
-        $airport_icao = '';
145
-        $airport_time = '';
146
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
144
+		$airport_icao = '';
145
+		$airport_time = '';
146
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
147 147
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
148
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149
-    	    if (isset($closestAirports[0])) {
150
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151
-        	    $airport_icao = $closestAirports[0]['icao'];
152
-        	    $airport_time = $this->all_flights[$key]['datetime'];
153
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155
-        	    foreach ($closestAirports as $airport) {
156
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157
-        		    $airport_icao = $airport['icao'];
158
-        		    $airport_time = $this->all_flights[$key]['datetime'];
159
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160
-        		    break;
161
-        		}
162
-        	    }
163
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
164
-        		$airport_icao = $closestAirports[0]['icao'];
165
-        		$airport_time = $this->all_flights[$key]['datetime'];
166
-        	} else {
167
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168
-        	}
169
-    	    } else {
170
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171
-    	    }
172
-
173
-        } else {
174
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175
-        }
176
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177
-    }
178
-
179
-
180
-
181
-    public function del() {
148
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149
+			if (isset($closestAirports[0])) {
150
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151
+				$airport_icao = $closestAirports[0]['icao'];
152
+				$airport_time = $this->all_flights[$key]['datetime'];
153
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155
+				foreach ($closestAirports as $airport) {
156
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157
+					$airport_icao = $airport['icao'];
158
+					$airport_time = $this->all_flights[$key]['datetime'];
159
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160
+					break;
161
+				}
162
+				}
163
+			} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
164
+				$airport_icao = $closestAirports[0]['icao'];
165
+				$airport_time = $this->all_flights[$key]['datetime'];
166
+			} else {
167
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168
+			}
169
+			} else {
170
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171
+			}
172
+
173
+		} else {
174
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175
+		}
176
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177
+	}
178
+
179
+
180
+
181
+	public function del() {
182 182
 	global $globalDebug, $globalNoImport, $globalNoDB;
183 183
 	// Delete old infos
184 184
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
185 185
 	foreach ($this->all_flights as $key => $flight) {
186
-	    if (isset($flight['lastupdate'])) {
186
+		if (isset($flight['lastupdate'])) {
187 187
 		if ($flight['lastupdate'] < (time()-5900)) {
188
-		    $this->delKey($key);
188
+			$this->delKey($key);
189
+		}
189 190
 		}
190
-	    }
191 191
 	}
192
-    }
192
+	}
193 193
 
194
-    public function delKey($key) {
194
+	public function delKey($key) {
195 195
 	global $globalDebug, $globalNoImport, $globalNoDB;
196 196
 	// Delete old infos
197 197
 	if (isset($this->all_flights[$key]['id'])) {
@@ -206,9 +206,9 @@  discard block
 block discarded – undo
206 206
 		}
207 207
 	}
208 208
 	unset($this->all_flights[$key]);
209
-    }
209
+	}
210 210
 
211
-    public function add($line) {
211
+	public function add($line) {
212 212
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate;
213 213
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
214 214
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
@@ -234,19 +234,19 @@  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
-		    if (isset($line['source_name'])) $source = $line['source_name'];
244
-		    else $source = '';
245
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
246
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
247
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
248
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
249
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
242
+			$current_date = date('Y-m-d');
243
+			if (isset($line['source_name'])) $source = $line['source_name'];
244
+			else $source = '';
245
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
246
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
247
+				$this->stats[$current_date][$source]['msg']['date'] = time();
248
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
249
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
250 250
 		}
251 251
 		
252 252
 		/*
@@ -262,49 +262,49 @@  discard block
 block discarded – undo
262 262
 		//$this->db = $dbc;
263 263
 
264 264
 		//$hex = trim($line['hex']);
265
-	        if (!isset($line['id'])) $id = trim($line['hex']);
266
-	        else $id = trim($line['id']);
265
+			if (!isset($line['id'])) $id = trim($line['hex']);
266
+			else $id = trim($line['id']);
267 267
 		
268 268
 		if (!isset($this->all_flights[$id])) {
269
-		    $this->all_flights[$id] = array();
270
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
271
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
272
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
273
-		    if (!isset($line['id'])) {
269
+			$this->all_flights[$id] = array();
270
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
271
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
272
+			if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
273
+			if (!isset($line['id'])) {
274 274
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
275 275
 //			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')));
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') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
277 277
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
278
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
279
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
280
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
278
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
279
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
280
+			if ($globalAllFlights !== FALSE) $dataFound = true;
281 281
 		}
282 282
 		if (isset($line['source_type']) && $line['source_type'] != '') {
283
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
283
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
284 284
 		}
285 285
 		
286 286
 		//print_r($this->all_flights);
287 287
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
288
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
289
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
288
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
289
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
290 290
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
291
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
292
-		    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') {
291
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
292
+			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') {
293 293
 			$timeelapsed = microtime(true);
294 294
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
295
-			    $Spotter = new Spotter($this->db);
296
-			    if (isset($this->all_flights[$id]['source_type'])) {
295
+				$Spotter = new Spotter($this->db);
296
+				if (isset($this->all_flights[$id]['source_type'])) {
297 297
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
298
-			    } else {
298
+				} else {
299 299
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
300
-			    }
301
-			    $Spotter->db = null;
302
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
303
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
300
+				}
301
+				$Spotter->db = null;
302
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
303
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
304
+			}
304 305
 			}
305
-		    }
306
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
307
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
306
+			if ($globalAllFlights !== FALSE) $dataFound = true;
307
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
308 308
 		}
309 309
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
310 310
 			$icao = $line['aircraft_icao'];
@@ -334,9 +334,9 @@  discard block
 block discarded – undo
334 334
 		}
335 335
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
336 336
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
337
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
337
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
338 338
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
339
-		    } else {
339
+			} else {
340 340
 				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";
341 341
 				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";
342 342
 				/*
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 				print_r($line);
346 346
 				*/
347 347
 				return '';
348
-		    }
348
+			}
349 349
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
350 350
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
351 351
 			return '';
@@ -361,21 +361,21 @@  discard block
 block discarded – undo
361 361
 		}
362 362
 
363 363
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
364
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
364
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
365 365
 		}
366 366
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
367
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
367
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
368 368
 		}
369 369
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
370
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
370
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
371 371
 		}
372 372
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
373
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
373
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
374 374
 		}
375 375
  
376 376
 		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'])) {
377 377
 
378
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
378
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
379 379
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 2300) {
380 380
 				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
381 381
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
@@ -384,23 +384,23 @@  discard block
 block discarded – undo
384 384
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
385 385
 				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']));
386 386
 			} else {
387
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
388
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
387
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
388
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
389 389
 				$timeelapsed = microtime(true);
390
-            			$Spotter = new Spotter($this->db);
391
-            			$fromsource = NULL;
392
-            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
393
-            			elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
390
+						$Spotter = new Spotter($this->db);
391
+						$fromsource = NULL;
392
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
393
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
394 394
 				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
395 395
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
396 396
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
397
-            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
397
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
398 398
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
399 399
 				$Spotter->db = null;
400 400
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
401
-			    }
401
+				}
402 402
 			}
403
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
403
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
404 404
 		    
405 405
 /*
406 406
 		    if (!isset($line['id'])) {
@@ -410,86 +410,86 @@  discard block
 block discarded – undo
410 410
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
411 411
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
412 412
   */
413
-		    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']));
413
+			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']));
414 414
 
415
-		    //$putinarchive = true;
416
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
415
+			//$putinarchive = true;
416
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
417 417
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
418
-		    }
419
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
418
+			}
419
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
420 420
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
421
-		    }
422
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
423
-		    		$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' => ''));
424
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
421
+			}
422
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
423
+					$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' => ''));
424
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
425 425
 			$timeelapsed = microtime(true);
426 426
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
427 427
 				$Spotter = new Spotter($this->db);
428 428
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
429 429
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
430
-		    		$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' => ''));
430
+					$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' => ''));
431 431
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
432
-                        }
433
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
432
+						}
433
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
434 434
 			$timeelapsed = microtime(true);
435 435
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
436
-			    $Spotter = new Spotter($this->db);
437
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
438
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
436
+				$Spotter = new Spotter($this->db);
437
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
438
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
439 439
 				$Translation = new Translation($this->db);
440 440
 				$ident = $Translation->checkTranslation(trim($line['ident']));
441 441
 				$route = $Spotter->getRouteInfo($ident);
442 442
 				$Translation->db = null;
443
-			    }
444
-			    $Spotter->db = null;
445
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
446
-                    	}
443
+				}
444
+				$Spotter->db = null;
445
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
446
+						}
447 447
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
448
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
449
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
448
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
449
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
450 450
 				//    $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']));
451
-		    		$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']));
452
-		    	    }
451
+					$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']));
452
+					}
453 453
 			}
454 454
 			if (!isset($globalFork)) $globalFork = TRUE;
455 455
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
456 456
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
457 457
 			}
458
-		    }
458
+			}
459 459
 		}
460 460
 
461 461
 		if (isset($line['speed']) && $line['speed'] != '') {
462 462
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
463
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
464
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
465
-		    //$dataFound = true;
463
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
464
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
465
+			//$dataFound = true;
466 466
 		} 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'])) {
467
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
468
-		    if ($distance > 1000 && $distance < 10000) {
469
-		    // use datetime
467
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
468
+			if ($distance > 1000 && $distance < 10000) {
469
+			// use datetime
470 470
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
471 471
 			$speed = $speed*3.6;
472 472
 			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
473 473
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
474
-		    }
474
+			}
475 475
 		}
476 476
 
477 477
 
478 478
 
479
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
480
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
481
-	    	    else unset($timediff);
482
-	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
479
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
480
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
481
+				else unset($timediff);
482
+				if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
483 483
 			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'])) {
484
-			    if ($timediff > $globalAircraftMaxUpdate || !$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'])) {
484
+				if ($timediff > $globalAircraftMaxUpdate || !$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'])) {
485 485
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
486 486
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
487 487
 				$this->all_flights[$id]['putinarchive'] = true;
488 488
 				$this->tmd = 0;
489 489
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
490
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
491
-				    $timeelapsed = microtime(true);
492
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
490
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
491
+					$timeelapsed = microtime(true);
492
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
493 493
 					$Spotter = new Spotter($this->db);
494 494
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
495 495
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
@@ -497,18 +497,18 @@  discard block
 block discarded – undo
497 497
 					$Spotter->db = null;
498 498
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
499 499
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
500
-				    }
500
+					}
501
+				}
501 502
 				}
502
-			    }
503 503
 			}
504 504
 
505 505
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
506
-			    //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) {
506
+				//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) {
507 507
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
508 508
 				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') {
509
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
510
-				    $dataFound = true;
511
-				    $this->all_flights[$id]['time_last_coord'] = time();
509
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
510
+					$dataFound = true;
511
+					$this->all_flights[$id]['time_last_coord'] = time();
512 512
 				}
513 513
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
514 514
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
@@ -519,20 +519,20 @@  discard block
 block discarded – undo
519 519
 				    //$putinarchive = true;
520 520
 				}
521 521
 				*/
522
-			    /*
522
+				/*
523 523
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
524 524
 				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";
525 525
 			    }
526 526
 			    */
527 527
 			}
528 528
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
529
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
530
-			    //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) {
529
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
530
+				//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) {
531 531
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
532 532
 				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') {
533
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
534
-				    $dataFound = true;
535
-				    $this->all_flights[$id]['time_last_coord'] = time();
533
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
534
+					$dataFound = true;
535
+					$this->all_flights[$id]['time_last_coord'] = time();
536 536
 				}
537 537
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
538 538
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
@@ -550,77 +550,77 @@  discard block
 block discarded – undo
550 550
 			    */
551 551
 			}
552 552
 
553
-		    } else if ($globalDebug && $timediff > 30) {
553
+			} else if ($globalDebug && $timediff > 30) {
554 554
 			$this->tmd = $this->tmd + 1;
555 555
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
556 556
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
557 557
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
558 558
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
559
-		    }
559
+			}
560 560
 		}
561 561
 		if (isset($line['last_update']) && $line['last_update'] != '') {
562
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
563
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
562
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
563
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
564 564
 		}
565 565
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
566
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
567
-		    //$dataFound = true;
566
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
567
+			//$dataFound = true;
568 568
 		}
569 569
 		if (isset($line['format_source']) && $line['format_source'] != '') {
570
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
570
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
571 571
 		}
572 572
 		if (isset($line['source_name']) && $line['source_name'] != '') {
573
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
573
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
574 574
 		}
575 575
 		if (isset($line['emergency']) && $line['emergency'] != '') {
576
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
577
-		    //$dataFound = true;
576
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
577
+			//$dataFound = true;
578 578
 		}
579 579
 		if (isset($line['ground']) && $line['ground'] != '') {
580
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
580
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
581 581
 			// Here we force archive of flight because after ground it's a new one (or should be)
582 582
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
583 583
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
584 584
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
585
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
585
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
586 586
 			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']));
587
-		    }
588
-		    if ($line['ground'] != 1) $line['ground'] = 0;
589
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
590
-		    //$dataFound = true;
587
+			}
588
+			if ($line['ground'] != 1) $line['ground'] = 0;
589
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
590
+			//$dataFound = true;
591 591
 		}
592 592
 		if (isset($line['squawk']) && $line['squawk'] != '') {
593
-		    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'])) {
594
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
595
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
596
-			    $highlight = '';
597
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
598
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
599
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
600
-			    if ($highlight != '') {
593
+			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'])) {
594
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
595
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
596
+				$highlight = '';
597
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
598
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
599
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
600
+				if ($highlight != '') {
601 601
 				$timeelapsed = microtime(true);
602 602
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
603
-				    $Spotter = new Spotter($this->db);
604
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
605
-				    $Spotter->db = null;
606
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
603
+					$Spotter = new Spotter($this->db);
604
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
605
+					$Spotter->db = null;
606
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
607 607
 				}
608 608
 				//$putinarchive = true;
609 609
 				//$highlight = '';
610
-			    }
610
+				}
611 611
 			    
612
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
613
-		    //$dataFound = true;
612
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
613
+			//$dataFound = true;
614 614
 		}
615 615
 
616 616
 		if (isset($line['altitude']) && $line['altitude'] != '') {
617
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
617
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
618 618
 			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;
619 619
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
620 620
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
621 621
 			//$dataFound = true;
622
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
623
-		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
622
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
623
+			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
624 624
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 2300) {
625 625
 				if ($globalDebug) echo '--- Reset because of altitude'."\n";
626 626
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
@@ -629,27 +629,27 @@  discard block
 block discarded – undo
629 629
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
630 630
 				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']));
631 631
 			}
632
-		    }
633
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
632
+			}
633
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
634 634
 		}
635 635
 
636 636
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
637
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
637
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
638 638
 		}
639 639
 		
640 640
 		if (isset($line['heading']) && $line['heading'] != '') {
641
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
642
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
643
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
644
-		    //$dataFound = true;
641
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
642
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
643
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
644
+			//$dataFound = true;
645 645
   		} 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']) {
646
-  		    $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']);
647
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
648
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
649
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
646
+  			$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']);
647
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
648
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
649
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
650 650
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
651
-  		    // If not enough messages and ACARS set heading to 0
652
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
651
+  			// If not enough messages and ACARS set heading to 0
652
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
653 653
   		}
654 654
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
655 655
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -661,125 +661,125 @@  discard block
 block discarded – undo
661 661
 		//if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
662 662
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
663 663
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
664
-		    $this->all_flights[$id]['lastupdate'] = time();
665
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
666
-		        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'])) {
667
-			    //print_r($this->all_flights);
668
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
669
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
670
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
664
+			$this->all_flights[$id]['lastupdate'] = time();
665
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
666
+				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'])) {
667
+				//print_r($this->all_flights);
668
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
669
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
670
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
671 671
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
672
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
673
-				    $timeelapsed = microtime(true);
674
-				    $SpotterLive = new SpotterLive($this->db);
675
-				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
672
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
673
+					$timeelapsed = microtime(true);
674
+					$SpotterLive = new SpotterLive($this->db);
675
+					if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
676 676
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
677 677
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
678
-				    } elseif (isset($line['id'])) {
678
+					} elseif (isset($line['id'])) {
679 679
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
680 680
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
681
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
681
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
682 682
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
683 683
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
684
-				    } else $recent_ident = '';
685
-				    $SpotterLive->db=null;
686
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
687
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
684
+					} else $recent_ident = '';
685
+					$SpotterLive->db=null;
686
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
687
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
688 688
 				} else $recent_ident = '';
689
-			    } else {
689
+				} else {
690 690
 				$recent_ident = '';
691 691
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
692
-			    }
693
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
694
-			    if($recent_ident == "")
695
-			    {
692
+				}
693
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
694
+				if($recent_ident == "")
695
+				{
696 696
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
697 697
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
698 698
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
699 699
 				//adds the spotter data for the archive
700 700
 				$ignoreImport = false;
701 701
 				foreach($globalAirportIgnore as $airportIgnore) {
702
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
702
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
703 703
 					$ignoreImport = true;
704
-				    }
704
+					}
705 705
 				}
706 706
 				if (count($globalAirportAccept) > 0) {
707
-				    $ignoreImport = true;
708
-				    foreach($globalAirportIgnore as $airportIgnore) {
707
+					$ignoreImport = true;
708
+					foreach($globalAirportIgnore as $airportIgnore) {
709 709
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
710
-					    $ignoreImport = false;
710
+						$ignoreImport = false;
711
+					}
711 712
 					}
712
-				    }
713 713
 				}
714 714
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
715
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
715
+					foreach($globalAirlineIgnore as $airlineIgnore) {
716 716
 					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)) {
717
-					    $ignoreImport = true;
717
+						$ignoreImport = true;
718
+					}
718 719
 					}
719
-				    }
720 720
 				}
721 721
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
722
-				    $ignoreImport = true;
723
-				    foreach($globalAirlineAccept as $airlineAccept) {
722
+					$ignoreImport = true;
723
+					foreach($globalAirlineAccept as $airlineAccept) {
724 724
 					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)) {
725
-					    $ignoreImport = false;
725
+						$ignoreImport = false;
726
+					}
726 727
 					}
727
-				    }
728 728
 				}
729 729
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
730
-				    $ignoreImport = true;
731
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
730
+					$ignoreImport = true;
731
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
732 732
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
733
-					    $ignoreImport = false;
733
+						$ignoreImport = false;
734
+					}
734 735
 					}
735
-				    }
736 736
 				}
737 737
 				
738 738
 				if (!$ignoreImport) {
739
-				    $highlight = '';
740
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
741
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
742
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
743
-				    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')));
744
-				    $timeelapsed = microtime(true);
745
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
739
+					$highlight = '';
740
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
741
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
742
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
743
+					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')));
744
+					$timeelapsed = microtime(true);
745
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
746 746
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
747
-					    $Spotter = new Spotter($this->db);
748
-					    $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']);
749
-					    $Spotter->db = null;
750
-					    if ($globalDebug && isset($result)) echo $result."\n";
747
+						$Spotter = new Spotter($this->db);
748
+						$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']);
749
+						$Spotter->db = null;
750
+						if ($globalDebug && isset($result)) echo $result."\n";
751
+					}
751 752
 					}
752
-				    }
753
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
754
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
753
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
754
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
755 755
 
756
-				    // Add source stat in DB
757
-				    $Stats = new Stats($this->db);
758
-				    if (!empty($this->stats)) {
756
+					// Add source stat in DB
757
+					$Stats = new Stats($this->db);
758
+					if (!empty($this->stats)) {
759 759
 					if ($globalDebug) echo 'Add source stats : ';
760
-				        foreach($this->stats as $date => $data) {
761
-					    foreach($data as $source => $sourced) {
762
-					        //print_r($sourced);
763
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
764
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
765
-				    		if (isset($sourced['msg'])) {
766
-				    		    if (time() - $sourced['msg']['date'] > 10) {
767
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
768
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
769
-			    			        unset($this->stats[$date][$source]['msg']);
770
-			    			    }
771
-			    			}
772
-			    		    }
773
-			    		    if ($date != date('Y-m-d')) {
774
-			    			unset($this->stats[$date]);
775
-			    		    }
776
-				    	}
777
-				    	if ($globalDebug) echo 'Done'."\n";
778
-
779
-				    }
780
-				    $Stats->db = null;
781
-				    }
782
-				    $this->del();
760
+						foreach($this->stats as $date => $data) {
761
+						foreach($data as $source => $sourced) {
762
+							//print_r($sourced);
763
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
764
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
765
+							if (isset($sourced['msg'])) {
766
+								if (time() - $sourced['msg']['date'] > 10) {
767
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
768
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
769
+									unset($this->stats[$date][$source]['msg']);
770
+								}
771
+							}
772
+							}
773
+							if ($date != date('Y-m-d')) {
774
+							unset($this->stats[$date]);
775
+							}
776
+						}
777
+						if ($globalDebug) echo 'Done'."\n";
778
+
779
+					}
780
+					$Stats->db = null;
781
+					}
782
+					$this->del();
783 783
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
784 784
 				//$ignoreImport = false;
785 785
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -797,41 +797,41 @@  discard block
 block discarded – undo
797 797
 			*/
798 798
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
799 799
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
800
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
801
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
802
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
800
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
801
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
802
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
803 803
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
804
-					    $SpotterLive = new SpotterLive($this->db);
805
-					    $SpotterLive->deleteLiveSpotterData();
806
-					    $SpotterLive->db=null;
804
+						$SpotterLive = new SpotterLive($this->db);
805
+						$SpotterLive->deleteLiveSpotterData();
806
+						$SpotterLive->db=null;
807 807
 					}
808
-				    }
809
-				    if ($globalDebug) echo " Done\n";
810
-				    $this->last_delete = time();
808
+					}
809
+					if ($globalDebug) echo " Done\n";
810
+					$this->last_delete = time();
811 811
 				}
812
-			    } else {
812
+				} else {
813 813
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) {
814
-				    $this->all_flights[$id]['id'] = $recent_ident;
815
-				    $this->all_flights[$id]['addedSpotter'] = 1;
814
+					$this->all_flights[$id]['id'] = $recent_ident;
815
+					$this->all_flights[$id]['addedSpotter'] = 1;
816 816
 				}
817 817
 				if (isset($globalDaemon) && !$globalDaemon) {
818
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
818
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
819 819
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
820
-					    $Spotter = new Spotter($this->db);
821
-					    $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']);
822
-					    $Spotter->db = null;
820
+						$Spotter = new Spotter($this->db);
821
+						$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']);
822
+						$Spotter->db = null;
823
+					}
823 824
 					}
824
-				    }
825 825
 				}
826 826
 				
827
-			    }
827
+				}
828 828
 			}
829
-		    }
830
-		    //adds the spotter LIVE data
831
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
832
-		    //echo "\nAdd in Live !! \n";
833
-		    //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";
834
-		    if ($globalDebug) {
829
+			}
830
+			//adds the spotter LIVE data
831
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
832
+			//echo "\nAdd in Live !! \n";
833
+			//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";
834
+			if ($globalDebug) {
835 835
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
836 836
 				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";
837 837
 				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";
@@ -839,60 +839,60 @@  discard block
 block discarded – undo
839 839
 				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";
840 840
 				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";
841 841
 			}
842
-		    }
843
-		    $ignoreImport = false;
844
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
845
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
842
+			}
843
+			$ignoreImport = false;
844
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
845
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
846 846
 
847
-		    foreach($globalAirportIgnore as $airportIgnore) {
848
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
849
-			    $ignoreImport = true;
847
+			foreach($globalAirportIgnore as $airportIgnore) {
848
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
849
+				$ignoreImport = true;
850
+			}
850 851
 			}
851
-		    }
852
-		    if (count($globalAirportAccept) > 0) {
853
-		        $ignoreImport = true;
854
-		        foreach($globalAirportIgnore as $airportIgnore) {
855
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
852
+			if (count($globalAirportAccept) > 0) {
853
+				$ignoreImport = true;
854
+				foreach($globalAirportIgnore as $airportIgnore) {
855
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
856 856
 				$ignoreImport = false;
857
-			    }
857
+				}
858 858
 			}
859
-		    }
860
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
859
+			}
860
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
861 861
 			foreach($globalAirlineIgnore as $airlineIgnore) {
862
-			    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)) {
862
+				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)) {
863 863
 				$ignoreImport = true;
864
-			    }
864
+				}
865 865
 			}
866
-		    }
867
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
866
+			}
867
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
868 868
 			$ignoreImport = true;
869 869
 			foreach($globalAirlineAccept as $airlineAccept) {
870
-			    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)) {
870
+				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)) {
871 871
 				$ignoreImport = false;
872
-			    }
872
+				}
873
+			}
873 874
 			}
874
-		    }
875
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
875
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
876 876
 			$ignoreImport = true;
877 877
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
878
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
879
-			        $ignoreImport = false;
880
-			    }
878
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
879
+					$ignoreImport = false;
880
+				}
881
+			}
881 882
 			}
882
-		    }
883 883
 
884
-		    if (!$ignoreImport) {
884
+			if (!$ignoreImport) {
885 885
 			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'])) {
886 886
 				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')));
887 887
 				$timeelapsed = microtime(true);
888 888
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
889
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
889
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
890 890
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
891 891
 					$SpotterLive = new SpotterLive($this->db);
892 892
 					$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']);
893 893
 					$SpotterLive->db = null;
894 894
 					if ($globalDebug) echo $result."\n";
895
-				    }
895
+					}
896 896
 				}
897 897
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
898 898
 					$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']);
@@ -904,7 +904,7 @@  discard block
 block discarded – undo
904 904
 				//if ($line['format_source'] != 'aprs') {
905 905
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
906 906
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
907
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
907
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
908 908
 					$source = $this->all_flights[$id]['source_name'];
909 909
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
910 910
 					if (!isset($this->source_location[$source])) {
@@ -930,7 +930,7 @@  discard block
 block discarded – undo
930 930
 					if ($stats_heading == 16) $stats_heading = 0;
931 931
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
932 932
 						for ($i=0;$i<=15;$i++) {
933
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
933
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
934 934
 						}
935 935
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
936 936
 					} else {
@@ -943,17 +943,17 @@  discard block
 block discarded – undo
943 943
 					//var_dump($this->stats);
944 944
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
945 945
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
946
-						    end($this->stats[$current_date][$source]['hist']);
947
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
946
+							end($this->stats[$current_date][$source]['hist']);
947
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
948 948
 						} else $mini = 0;
949 949
 						for ($i=$mini;$i<=$distance;$i+=10) {
950
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
950
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
951 951
 						}
952 952
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
953 953
 					} else {
954 954
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
955 955
 					}
956
-				    }
956
+					}
957 957
 				}
958 958
 
959 959
 				$this->all_flights[$id]['lastupdate'] = time();
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
 			//$this->del();
964 964
 			
965 965
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
966
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
966
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
967 967
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
968 968
 				$SpotterLive = new SpotterLive($this->db);
969 969
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
@@ -971,19 +971,19 @@  discard block
 block discarded – undo
971 971
 				//SpotterLive->deleteLiveSpotterData();
972 972
 				if ($globalDebug) echo " Done\n";
973 973
 				$this->last_delete_hourly = time();
974
-			    } else {
974
+				} else {
975 975
 				$this->del();
976 976
 				$this->last_delete_hourly = time();
977
-			    }
977
+				}
978 978
 			}
979 979
 			
980
-		    }
981
-		    //$ignoreImport = false;
980
+			}
981
+			//$ignoreImport = false;
982 982
 		}
983 983
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
984 984
 		if ($send) return $this->all_flights[$id];
985
-	    }
985
+		}
986
+	}
986 987
 	}
987
-    }
988 988
 }
989 989
 ?>
Please login to merge, or discard this patch.
Spacing   +149 added lines, -149 removed lines patch added patch discarded remove patch
@@ -33,12 +33,12 @@  discard block
 block discarded – undo
33 33
 		$currentdate = date('Y-m-d');
34 34
 		$sourcestat = $Stats->getStatsSource($currentdate);
35 35
 		if (!empty($sourcestat)) {
36
-		    foreach($sourcestat as $srcst) {
36
+		    foreach ($sourcestat as $srcst) {
37 37
 		    	$type = $srcst['stats_type'];
38 38
 			if ($type == 'polar' || $type == 'hist') {
39 39
 			    $source = $srcst['source_name'];
40 40
 			    $data = $srcst['source_data'];
41
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
41
+			    $this->stats[$currentdate][$source][$type] = json_decode($data, true);
42 42
 	    		}
43 43
 		    }
44 44
 		}
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
     }
52 52
 
53
-    public function get_Schedule($id,$ident) {
53
+    public function get_Schedule($id, $ident) {
54 54
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
55 55
 	// Get schedule here, so it's done only one time
56 56
 	
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 		$schedule = $Schedule->fetchSchedule($operator);
76 76
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
77 77
 		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
78
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime']));
79
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime']));
80 80
 		    // Should also check if route schedule = route from DB
81 81
 		    if ($schedule['DepartureAirportIATA'] != '') {
82 82
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 			    }
97 97
 			}
98 98
 		    }
99
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
99
+		    $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']);
100 100
 		}
101 101
 	    } else $scheduleexist = true;
102 102
 	} else $scheduleexist = true;
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
        if ($scheduleexist) {
105 105
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
106 106
     		$sch = $Schedule->getSchedule($operator);
107
-		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
107
+		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport' => $sch['arrival_airport_icao'], 'departure_airport' => $sch['departure_airport_icao'], 'departure_airport_time' => $sch['departure_airport_time'], 'arrival_airport_time' => $sch['arrival_airport_time']));
108 108
        }
109 109
 	$Spotter->db = null;
110 110
 	$Schedule->db = null;
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132 132
     		    $Spotter = new Spotter($this->db);
133 133
         	    $real_arrival = $this->arrival($key);
134
-        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
134
+        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
135 135
         	}
136 136
 	    }
137 137
 	}
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         $airport_time = '';
146 146
         if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
147 147
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
148
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
148
+	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist);
149 149
     	    if (isset($closestAirports[0])) {
150 150
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151 151
         	    $airport_icao = $closestAirports[0]['icao'];
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
         		    break;
161 161
         		}
162 162
         	    }
163
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
163
+        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) {
164 164
         		$airport_icao = $closestAirports[0]['icao'];
165 165
         		$airport_time = $this->all_flights[$key]['datetime'];
166 166
         	} else {
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         } else {
174 174
         	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175 175
         }
176
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
176
+        return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time);
177 177
     }
178 178
 
179 179
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
185 185
 	foreach ($this->all_flights as $key => $flight) {
186 186
 	    if (isset($flight['lastupdate'])) {
187
-		if ($flight['lastupdate'] < (time()-5900)) {
187
+		if ($flight['lastupdate'] < (time() - 5900)) {
188 188
 		    $this->delKey($key);
189 189
 		}
190 190
 	    }
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 			$real_arrival = $this->arrival($key);
201 201
 			$Spotter = new Spotter($this->db);
202 202
 			if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
203
-				$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']);
203
+				$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']);
204 204
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
205 205
 			}
206 206
 		}
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	$send = false;
234 234
 	
235 235
 	// SBS format is CSV format
236
-	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
236
+	if (is_array($line) && (isset($line['hex']) || isset($line['id']))) {
237 237
 	    //print_r($line);
238 238
   	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
239 239
 
@@ -267,25 +267,25 @@  discard block
 block discarded – undo
267 267
 		
268 268
 		if (!isset($this->all_flights[$id])) {
269 269
 		    $this->all_flights[$id] = array();
270
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
271
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
272
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
270
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
271
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'altitude_previous' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true, 'source_type' => ''));
272
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time()));
273 273
 		    if (!isset($line['id'])) {
274 274
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
275 275
 //			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')));
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') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
277
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
277
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
278 278
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
279
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
279
+		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
280 280
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
281 281
 		}
282 282
 		if (isset($line['source_type']) && $line['source_type'] != '') {
283
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
283
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type']));
284 284
 		}
285 285
 		
286 286
 		//print_r($this->all_flights);
287 287
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
288
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
288
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex'])));
289 289
 		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
290 290
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
291 291
 		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
@@ -294,13 +294,13 @@  discard block
 block discarded – undo
294 294
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
295 295
 			    $Spotter = new Spotter($this->db);
296 296
 			    if (isset($this->all_flights[$id]['source_type'])) {
297
-				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
297
+				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']);
298 298
 			    } else {
299 299
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
300 300
 			    }
301 301
 			    $Spotter->db = null;
302
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
303
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
302
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
303
+			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
304 304
 			}
305 305
 		    }
306 306
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
 			$Spotter = new Spotter($this->db);
312 312
 			if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
313 313
 			$Spotter->db = null;
314
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
314
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao));
315 315
 		}
316 316
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) {
317 317
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 				$Spotter = new Spotter($this->db);
320 320
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
321 321
 				$Spotter->db = null;
322
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
322
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
323 323
 			}
324 324
 		}
325 325
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
@@ -327,15 +327,15 @@  discard block
 block discarded – undo
327 327
 			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
328 328
 			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
329 329
 			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
330
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
330
+			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
331 331
 		}
332 332
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
333
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
333
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA'));
334 334
 		}
335 335
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
336
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
336
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) {
337 337
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
338
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
338
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime']));
339 339
 		    } else {
340 340
 				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";
341 341
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
@@ -346,31 +346,31 @@  discard block
 block discarded – undo
346 346
 				*/
347 347
 				return '';
348 348
 		    }
349
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
349
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) {
350 350
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
351 351
 			return '';
352
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
352
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) {
353 353
 			if ($globalDebug) echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
354 354
 			return '';
355 355
 		} elseif (!isset($line['datetime'])) {
356 356
 			date_default_timezone_set('UTC');
357
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
357
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s')));
358 358
 		} else {
359 359
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
360 360
 			return '';
361 361
 		}
362 362
 
363 363
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
364
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
364
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration']));
365 365
 		}
366 366
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
367
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
367
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints']));
368 368
 		}
369 369
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
370
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
370
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id'])));
371 371
 		}
372 372
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
373
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
373
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name'])));
374 374
 		}
375 375
  
376 376
 		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'])) {
@@ -378,13 +378,13 @@  discard block
 block discarded – undo
378 378
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
379 379
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 2300) {
380 380
 				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
381
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
382
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
383
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
384
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
385
-				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']));
381
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
382
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
383
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
384
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
385
+				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']));
386 386
 			} else {
387
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
387
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
388 388
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
389 389
 				$timeelapsed = microtime(true);
390 390
             			$Spotter = new Spotter($this->db);
@@ -394,13 +394,13 @@  discard block
 block discarded – undo
394 394
 				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
395 395
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
396 396
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
397
-            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
397
+            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource);
398 398
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
399 399
 				$Spotter->db = null;
400
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
400
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
401 401
 			    }
402 402
 			}
403
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
403
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
404 404
 		    
405 405
 /*
406 406
 		    if (!isset($line['id'])) {
@@ -410,25 +410,25 @@  discard block
 block discarded – undo
410 410
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
411 411
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
412 412
   */
413
-		    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']));
413
+		    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']));
414 414
 
415 415
 		    //$putinarchive = true;
416 416
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
417
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
417
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time']));
418 418
 		    }
419 419
 		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
420
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
420
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time']));
421 421
 		    }
422 422
 		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
423
-		    		$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' => ''));
423
+		    		$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' => ''));
424 424
 		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
425 425
 			$timeelapsed = microtime(true);
426 426
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
427 427
 				$Spotter = new Spotter($this->db);
428 428
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
429 429
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
430
-		    		$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' => ''));
431
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
430
+		    		$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' => ''));
431
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
432 432
                         }
433 433
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
434 434
 			$timeelapsed = microtime(true);
@@ -442,34 +442,34 @@  discard block
 block discarded – undo
442 442
 				$Translation->db = null;
443 443
 			    }
444 444
 			    $Spotter->db = null;
445
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
445
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
446 446
                     	}
447 447
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
448 448
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
449 449
 			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
450 450
 				//    $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']));
451
-		    		$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']));
451
+		    		$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']));
452 452
 		    	    }
453 453
 			}
454 454
 			if (!isset($globalFork)) $globalFork = TRUE;
455 455
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
456
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
456
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident']));
457 457
 			}
458 458
 		    }
459 459
 		}
460 460
 
461 461
 		if (isset($line['speed']) && $line['speed'] != '') {
462 462
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
463
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
464
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
463
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed'])));
464
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true));
465 465
 		    //$dataFound = true;
466 466
 		} 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'])) {
467
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
467
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm');
468 468
 		    if ($distance > 1000 && $distance < 10000) {
469 469
 		    // use datetime
470 470
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
471 471
 			$speed = $speed*3.6;
472
-			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
472
+			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed)));
473 473
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
474 474
 		    }
475 475
 		}
@@ -477,11 +477,11 @@  discard block
 block discarded – undo
477 477
 
478 478
 
479 479
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
480
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
480
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']);
481 481
 	    	    else unset($timediff);
482
-	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
482
+	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')))) {
483 483
 			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'])) {
484
-			    if ($timediff > $globalAircraftMaxUpdate || !$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'])) {
484
+			    if ($timediff > $globalAircraftMaxUpdate || !$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'])) {
485 485
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
486 486
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
487 487
 				$this->all_flights[$id]['putinarchive'] = true;
@@ -491,11 +491,11 @@  discard block
 block discarded – undo
491 491
 				    $timeelapsed = microtime(true);
492 492
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
493 493
 					$Spotter = new Spotter($this->db);
494
-					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
494
+					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
495 495
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
496 496
 					else $this->all_flights[$id]['over_country'] = '';
497 497
 					$Spotter->db = null;
498
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
498
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
499 499
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
500 500
 				    }
501 501
 				}
@@ -505,13 +505,13 @@  discard block
 block discarded – undo
505 505
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
506 506
 			    //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) {
507 507
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
508
-				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') {
508
+				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') {
509 509
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
510 510
 				    $dataFound = true;
511 511
 				    $this->all_flights[$id]['time_last_coord'] = time();
512 512
 				}
513 513
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
514
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
514
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude']));
515 515
 				/*
516 516
 				if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) {
517 517
 				    $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -529,13 +529,13 @@  discard block
 block discarded – undo
529 529
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
530 530
 			    //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) {
531 531
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
532
-				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') {
532
+				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') {
533 533
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
534 534
 				    $dataFound = true;
535 535
 				    $this->all_flights[$id]['time_last_coord'] = time();
536 536
 				}
537 537
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
538
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
538
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude']));
539 539
 				/*
540 540
 				if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) {
541 541
 				    $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -553,46 +553,46 @@  discard block
 block discarded – undo
553 553
 		    } else if ($globalDebug && $timediff > 30) {
554 554
 			$this->tmd = $this->tmd + 1;
555 555
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
556
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
557
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
556
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -";
557
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
558 558
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
559 559
 		    }
560 560
 		}
561 561
 		if (isset($line['last_update']) && $line['last_update'] != '') {
562 562
 		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
563
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
563
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update']));
564 564
 		}
565 565
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
566
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
566
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate']));
567 567
 		    //$dataFound = true;
568 568
 		}
569 569
 		if (isset($line['format_source']) && $line['format_source'] != '') {
570
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
570
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source']));
571 571
 		}
572 572
 		if (isset($line['source_name']) && $line['source_name'] != '') {
573
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
573
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name']));
574 574
 		}
575 575
 		if (isset($line['emergency']) && $line['emergency'] != '') {
576
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
576
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency']));
577 577
 		    //$dataFound = true;
578 578
 		}
579 579
 		if (isset($line['ground']) && $line['ground'] != '') {
580 580
 		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
581 581
 			// Here we force archive of flight because after ground it's a new one (or should be)
582
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
583
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
584
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
585
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
586
-			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']));
582
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
583
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
584
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
585
+		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
586
+			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']));
587 587
 		    }
588 588
 		    if ($line['ground'] != 1) $line['ground'] = 0;
589
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
589
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground']));
590 590
 		    //$dataFound = true;
591 591
 		}
592 592
 		if (isset($line['squawk']) && $line['squawk'] != '') {
593 593
 		    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'])) {
594 594
 			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
595
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
595
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
596 596
 			    $highlight = '';
597 597
 			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
598 598
 			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
@@ -601,59 +601,59 @@  discard block
 block discarded – undo
601 601
 				$timeelapsed = microtime(true);
602 602
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
603 603
 				    $Spotter = new Spotter($this->db);
604
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
604
+				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight);
605 605
 				    $Spotter->db = null;
606
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
606
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
607 607
 				}
608 608
 				//$putinarchive = true;
609 609
 				//$highlight = '';
610 610
 			    }
611 611
 			    
612
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
612
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
613 613
 		    //$dataFound = true;
614 614
 		}
615 615
 
616 616
 		if (isset($line['altitude']) && $line['altitude'] != '') {
617 617
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
618
-			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;
619
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
620
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
618
+			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;
619
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100)));
620
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude']));
621 621
 			//$dataFound = true;
622 622
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
623 623
 		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
624 624
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 2300) {
625 625
 				if ($globalDebug) echo '--- Reset because of altitude'."\n";
626
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
627
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
628
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
629
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
630
-				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']));
626
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
627
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
628
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
629
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
630
+				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']));
631 631
 			}
632 632
 		    }
633
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
633
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude']));
634 634
 		}
635 635
 
636 636
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
637
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
637
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true));
638 638
 		}
639 639
 		
640 640
 		if (isset($line['heading']) && $line['heading'] != '') {
641
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
642
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
643
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
641
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
642
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading'])));
643
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true));
644 644
 		    //$dataFound = true;
645 645
   		} 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']) {
646
-  		    $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']);
647
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
648
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
646
+  		    $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']);
647
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading)));
648
+		    if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
649 649
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
650 650
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
651 651
   		    // If not enough messages and ACARS set heading to 0
652
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
652
+  		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0));
653 653
   		}
654
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
655
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
656
-		elseif ($globalDaemon === TRUE && isset($globalMinupdate) && $globalMinupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false;
654
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
655
+		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
656
+		elseif ($globalDaemon === TRUE && isset($globalMinupdate) && $globalMinupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false;
657 657
 
658 658
 //		print_r($this->all_flights[$id]);
659 659
 		//gets the callsign from the last hour
@@ -663,7 +663,7 @@  discard block
 block discarded – undo
663 663
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
664 664
 		    $this->all_flights[$id]['lastupdate'] = time();
665 665
 		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
666
-		        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'])) {
666
+		        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'])) {
667 667
 			    //print_r($this->all_flights);
668 668
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
669 669
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
@@ -674,61 +674,61 @@  discard block
 block discarded – undo
674 674
 				    $SpotterLive = new SpotterLive($this->db);
675 675
 				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
676 676
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
677
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
677
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
678 678
 				    } elseif (isset($line['id'])) {
679 679
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
680
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
680
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
681 681
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
682 682
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
683
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
683
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
684 684
 				    } else $recent_ident = '';
685
-				    $SpotterLive->db=null;
685
+				    $SpotterLive->db = null;
686 686
 				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
687 687
 				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
688 688
 				} else $recent_ident = '';
689 689
 			    } else {
690 690
 				$recent_ident = '';
691
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
691
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0));
692 692
 			    }
693 693
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
694
-			    if($recent_ident == "")
694
+			    if ($recent_ident == "")
695 695
 			    {
696 696
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
697 697
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
698 698
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
699 699
 				//adds the spotter data for the archive
700 700
 				$ignoreImport = false;
701
-				foreach($globalAirportIgnore as $airportIgnore) {
701
+				foreach ($globalAirportIgnore as $airportIgnore) {
702 702
 				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
703 703
 					$ignoreImport = true;
704 704
 				    }
705 705
 				}
706 706
 				if (count($globalAirportAccept) > 0) {
707 707
 				    $ignoreImport = true;
708
-				    foreach($globalAirportIgnore as $airportIgnore) {
708
+				    foreach ($globalAirportIgnore as $airportIgnore) {
709 709
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
710 710
 					    $ignoreImport = false;
711 711
 					}
712 712
 				    }
713 713
 				}
714 714
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
715
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
716
-					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)) {
715
+				    foreach ($globalAirlineIgnore as $airlineIgnore) {
716
+					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)) {
717 717
 					    $ignoreImport = true;
718 718
 					}
719 719
 				    }
720 720
 				}
721 721
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
722 722
 				    $ignoreImport = true;
723
-				    foreach($globalAirlineAccept as $airlineAccept) {
724
-					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)) {
723
+				    foreach ($globalAirlineAccept as $airlineAccept) {
724
+					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)) {
725 725
 					    $ignoreImport = false;
726 726
 					}
727 727
 				    }
728 728
 				}
729 729
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
730 730
 				    $ignoreImport = true;
731
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
731
+				    foreach ($globalPilotIdAccept as $pilotIdAccept) {
732 732
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
733 733
 					    $ignoreImport = false;
734 734
 					}
@@ -740,32 +740,32 @@  discard block
 block discarded – undo
740 740
 				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
741 741
 				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
742 742
 				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
743
-				    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')));
743
+				    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')));
744 744
 				    $timeelapsed = microtime(true);
745 745
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
746 746
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
747 747
 					    $Spotter = new Spotter($this->db);
748
-					    $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']);
748
+					    $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']);
749 749
 					    $Spotter->db = null;
750 750
 					    if ($globalDebug && isset($result)) echo $result."\n";
751 751
 					}
752 752
 				    }
753
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
753
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
754 754
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
755 755
 
756 756
 				    // Add source stat in DB
757 757
 				    $Stats = new Stats($this->db);
758 758
 				    if (!empty($this->stats)) {
759 759
 					if ($globalDebug) echo 'Add source stats : ';
760
-				        foreach($this->stats as $date => $data) {
761
-					    foreach($data as $source => $sourced) {
760
+				        foreach ($this->stats as $date => $data) {
761
+					    foreach ($data as $source => $sourced) {
762 762
 					        //print_r($sourced);
763
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
764
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
763
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date);
764
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date);
765 765
 				    		if (isset($sourced['msg'])) {
766 766
 				    		    if (time() - $sourced['msg']['date'] > 10) {
767 767
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
768
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
768
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg', $date);
769 769
 			    			        unset($this->stats[$date][$source]['msg']);
770 770
 			    			    }
771 771
 			    			}
@@ -803,14 +803,14 @@  discard block
 block discarded – undo
803 803
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
804 804
 					    $SpotterLive = new SpotterLive($this->db);
805 805
 					    $SpotterLive->deleteLiveSpotterData();
806
-					    $SpotterLive->db=null;
806
+					    $SpotterLive->db = null;
807 807
 					}
808 808
 				    }
809 809
 				    if ($globalDebug) echo " Done\n";
810 810
 				    $this->last_delete = time();
811 811
 				}
812 812
 			    } else {
813
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) {
813
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) {
814 814
 				    $this->all_flights[$id]['id'] = $recent_ident;
815 815
 				    $this->all_flights[$id]['addedSpotter'] = 1;
816 816
 				}
@@ -818,7 +818,7 @@  discard block
 block discarded – undo
818 818
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
819 819
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
820 820
 					    $Spotter = new Spotter($this->db);
821
-					    $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']);
821
+					    $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']);
822 822
 					    $Spotter->db = null;
823 823
 					}
824 824
 				    }
@@ -844,37 +844,37 @@  discard block
 block discarded – undo
844 844
 		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
845 845
 		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
846 846
 
847
-		    foreach($globalAirportIgnore as $airportIgnore) {
847
+		    foreach ($globalAirportIgnore as $airportIgnore) {
848 848
 		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
849 849
 			    $ignoreImport = true;
850 850
 			}
851 851
 		    }
852 852
 		    if (count($globalAirportAccept) > 0) {
853 853
 		        $ignoreImport = true;
854
-		        foreach($globalAirportIgnore as $airportIgnore) {
854
+		        foreach ($globalAirportIgnore as $airportIgnore) {
855 855
 			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
856 856
 				$ignoreImport = false;
857 857
 			    }
858 858
 			}
859 859
 		    }
860 860
 		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
861
-			foreach($globalAirlineIgnore as $airlineIgnore) {
862
-			    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)) {
861
+			foreach ($globalAirlineIgnore as $airlineIgnore) {
862
+			    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)) {
863 863
 				$ignoreImport = true;
864 864
 			    }
865 865
 			}
866 866
 		    }
867 867
 		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
868 868
 			$ignoreImport = true;
869
-			foreach($globalAirlineAccept as $airlineAccept) {
870
-			    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)) {
869
+			foreach ($globalAirlineAccept as $airlineAccept) {
870
+			    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)) {
871 871
 				$ignoreImport = false;
872 872
 			    }
873 873
 			}
874 874
 		    }
875 875
 		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
876 876
 			$ignoreImport = true;
877
-			foreach($globalPilotIdAccept as $pilotIdAccept) {
877
+			foreach ($globalPilotIdAccept as $pilotIdAccept) {
878 878
 			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
879 879
 			        $ignoreImport = false;
880 880
 			    }
@@ -882,23 +882,23 @@  discard block
 block discarded – undo
882 882
 		    }
883 883
 
884 884
 		    if (!$ignoreImport) {
885
-			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'])) {
886
-				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')));
885
+			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'])) {
886
+				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')));
887 887
 				$timeelapsed = microtime(true);
888 888
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
889 889
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
890 890
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
891 891
 					$SpotterLive = new SpotterLive($this->db);
892
-					$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']);
892
+					$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']);
893 893
 					$SpotterLive->db = null;
894 894
 					if ($globalDebug) echo $result."\n";
895 895
 				    }
896 896
 				}
897 897
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
898
-					$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']);
898
+					$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']);
899 899
 				}
900 900
 				$this->all_flights[$id]['putinarchive'] = false;
901
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
901
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
902 902
 
903 903
 				// Put statistics in $this->stats variable
904 904
 				//if ($line['format_source'] != 'aprs') {
@@ -917,19 +917,19 @@  discard block
 block discarded – undo
917 917
 							$latitude = $globalCenterLatitude;
918 918
 							$longitude = $globalCenterLongitude;
919 919
 						}
920
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
920
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
921 921
 					} else {
922 922
 						$latitude = $this->source_location[$source]['latitude'];
923 923
 						$longitude = $this->source_location[$source]['longitude'];
924 924
 					}
925
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
925
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
926 926
 					//$stats_heading = $stats_heading%22.5;
927 927
 					$stats_heading = round($stats_heading/22.5);
928
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
928
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
929 929
 					$current_date = date('Y-m-d');
930 930
 					if ($stats_heading == 16) $stats_heading = 0;
931 931
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
932
-						for ($i=0;$i<=15;$i++) {
932
+						for ($i = 0; $i <= 15; $i++) {
933 933
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
934 934
 						}
935 935
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -944,9 +944,9 @@  discard block
 block discarded – undo
944 944
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
945 945
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
946 946
 						    end($this->stats[$current_date][$source]['hist']);
947
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
947
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
948 948
 						} else $mini = 0;
949
-						for ($i=$mini;$i<=$distance;$i+=10) {
949
+						for ($i = $mini; $i <= $distance; $i += 10) {
950 950
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
951 951
 						}
952 952
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -959,7 +959,7 @@  discard block
 block discarded – undo
959 959
 				$this->all_flights[$id]['lastupdate'] = time();
960 960
 				if ($this->all_flights[$id]['putinarchive']) $send = true;
961 961
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
962
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
962
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
963 963
 			//$this->del();
964 964
 			
965 965
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
Please login to merge, or discard this patch.
Braces   +390 added lines, -139 removed lines patch added patch discarded remove patch
@@ -63,7 +63,9 @@  discard block
 block discarded – undo
63 63
 	$dbc = $this->db;
64 64
 	$this->all_flights[$id]['schedule_check'] = true;
65 65
 	if ($globalSchedulesFetch) {
66
-	if ($globalDebug) echo 'Getting schedule info...'."\n";
66
+	if ($globalDebug) {
67
+		echo 'Getting schedule info...'."\n";
68
+	}
67 69
 	$Spotter = new Spotter($dbc);
68 70
 	$Schedule = new Schedule($dbc);
69 71
 	$Translation = new Translation($dbc);
@@ -74,7 +76,9 @@  discard block
 block discarded – undo
74 76
 	    if ($Schedule->checkSchedule($operator) == 0) {
75 77
 		$schedule = $Schedule->fetchSchedule($operator);
76 78
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
77
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
79
+		    if ($globalDebug) {
80
+		    	echo "-> Schedule info for ".$operator." (".$ident.")\n";
81
+		    }
78 82
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79 83
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80 84
 		    // Should also check if route schedule = route from DB
@@ -83,7 +87,9 @@  discard block
 block discarded – undo
83 87
 			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84 88
 			    if (trim($airport_icao) != '') {
85 89
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
86
-				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
90
+				if ($globalDebug) {
91
+					echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
92
+				}
87 93
 			    }
88 94
 			}
89 95
 		    }
@@ -92,17 +98,25 @@  discard block
 block discarded – undo
92 98
 			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93 99
 			    if (trim($airport_icao) != '') {
94 100
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
95
-				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
101
+				if ($globalDebug) {
102
+					echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
103
+				}
96 104
 			    }
97 105
 			}
98 106
 		    }
99 107
 		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
100 108
 		}
101
-	    } else $scheduleexist = true;
102
-	} else $scheduleexist = true;
109
+	    } else {
110
+	    	$scheduleexist = true;
111
+	    }
112
+	} else {
113
+		$scheduleexist = true;
114
+	}
103 115
 	// close connection, at least one way will work ?
104 116
        if ($scheduleexist) {
105
-		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
117
+		if ($globalDebug) {
118
+			echo "-> get arrival/departure airport info for ".$ident."\n";
119
+		}
106 120
     		$sch = $Schedule->getSchedule($operator);
107 121
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
108 122
        }
@@ -124,14 +138,18 @@  discard block
 block discarded – undo
124 138
 
125 139
     public function checkAll() {
126 140
 	global $globalDebug, $globalNoImport;
127
-	if ($globalDebug) echo "Update last seen flights data...\n";
141
+	if ($globalDebug) {
142
+		echo "Update last seen flights data...\n";
143
+	}
128 144
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
129 145
 	    foreach ($this->all_flights as $key => $flight) {
130 146
 		if (isset($this->all_flights[$key]['id'])) {
131 147
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132 148
     		    $Spotter = new Spotter($this->db);
133 149
         	    $real_arrival = $this->arrival($key);
134
-        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
150
+        	    if (isset($this->all_flights[$key]['altitude'])) {
151
+        	    	$Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
152
+        	    }
135 153
         	}
136 154
 	    }
137 155
 	}
@@ -139,24 +157,32 @@  discard block
 block discarded – undo
139 157
 
140 158
     public function arrival($key) {
141 159
 	global $globalClosestMinDist, $globalDebug;
142
-	if ($globalDebug) echo 'Update arrival...'."\n";
160
+	if ($globalDebug) {
161
+		echo 'Update arrival...'."\n";
162
+	}
143 163
 	$Spotter = new Spotter($this->db);
144 164
         $airport_icao = '';
145 165
         $airport_time = '';
146
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
166
+        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') {
167
+        	$globalClosestMinDist = 50;
168
+        }
147 169
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
148 170
 	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149 171
     	    if (isset($closestAirports[0])) {
150 172
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151 173
         	    $airport_icao = $closestAirports[0]['icao'];
152 174
         	    $airport_time = $this->all_flights[$key]['datetime'];
153
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
175
+        	    if ($globalDebug) {
176
+        	    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
177
+        	    }
154 178
         	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155 179
         	    foreach ($closestAirports as $airport) {
156 180
         		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157 181
         		    $airport_icao = $airport['icao'];
158 182
         		    $airport_time = $this->all_flights[$key]['datetime'];
159
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
183
+        		    if ($globalDebug) {
184
+        		    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
185
+        		    }
160 186
         		    break;
161 187
         		}
162 188
         	    }
@@ -164,14 +190,20 @@  discard block
 block discarded – undo
164 190
         		$airport_icao = $closestAirports[0]['icao'];
165 191
         		$airport_time = $this->all_flights[$key]['datetime'];
166 192
         	} else {
167
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
193
+        		if ($globalDebug) {
194
+        			echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
195
+        		}
168 196
         	}
169 197
     	    } else {
170
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
198
+    		    if ($globalDebug) {
199
+    		    	echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
200
+    		    }
171 201
     	    }
172 202
 
173 203
         } else {
174
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
204
+        	if ($globalDebug) {
205
+        		echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
206
+        	}
175 207
         }
176 208
         return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177 209
     }
@@ -181,7 +213,9 @@  discard block
 block discarded – undo
181 213
     public function del() {
182 214
 	global $globalDebug, $globalNoImport, $globalNoDB;
183 215
 	// Delete old infos
184
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
216
+	if ($globalDebug) {
217
+		echo 'Delete old values and update latest data...'."\n";
218
+	}
185 219
 	foreach ($this->all_flights as $key => $flight) {
186 220
 	    if (isset($flight['lastupdate'])) {
187 221
 		if ($flight['lastupdate'] < (time()-5900)) {
@@ -195,13 +229,17 @@  discard block
 block discarded – undo
195 229
 	global $globalDebug, $globalNoImport, $globalNoDB;
196 230
 	// Delete old infos
197 231
 	if (isset($this->all_flights[$key]['id'])) {
198
-		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
232
+		if ($globalDebug) {
233
+			echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
234
+		}
199 235
 		if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
200 236
 			$real_arrival = $this->arrival($key);
201 237
 			$Spotter = new Spotter($this->db);
202 238
 			if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
203 239
 				$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']);
204
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
240
+				if ($globalDebug && $result != 'success') {
241
+					echo '!!! ERROR : '.$result."\n";
242
+				}
205 243
 			}
206 244
 		}
207 245
 	}
@@ -211,9 +249,13 @@  discard block
 block discarded – undo
211 249
     public function add($line) {
212 250
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate;
213 251
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
214
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
215
-	if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') $globalAircraftMaxUpdate = 2300;
216
-/*
252
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
253
+		$globalCoordMinChange = '0.02';
254
+	}
255
+	if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') {
256
+		$globalAircraftMaxUpdate = 2300;
257
+	}
258
+	/*
217 259
 	$Spotter = new Spotter();
218 260
 	$dbc = $Spotter->db;
219 261
 	$SpotterLive = new SpotterLive($dbc);
@@ -240,13 +282,20 @@  discard block
 block discarded – undo
240 282
 		// Increment message number
241 283
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
242 284
 		    $current_date = date('Y-m-d');
243
-		    if (isset($line['source_name'])) $source = $line['source_name'];
244
-		    else $source = '';
245
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
285
+		    if (isset($line['source_name'])) {
286
+		    	$source = $line['source_name'];
287
+		    } else {
288
+		    	$source = '';
289
+		    }
290
+		    if ($source == '' || $line['format_source'] == 'aprs') {
291
+		    	$source = $line['format_source'];
292
+		    }
246 293
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
247 294
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
248 295
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
249
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
296
+		    } else {
297
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
298
+		    }
250 299
 		}
251 300
 		
252 301
 		/*
@@ -262,22 +311,35 @@  discard block
 block discarded – undo
262 311
 		//$this->db = $dbc;
263 312
 
264 313
 		//$hex = trim($line['hex']);
265
-	        if (!isset($line['id'])) $id = trim($line['hex']);
266
-	        else $id = trim($line['id']);
314
+	        if (!isset($line['id'])) {
315
+	        	$id = trim($line['hex']);
316
+	        } else {
317
+	        	$id = trim($line['id']);
318
+	        }
267 319
 		
268 320
 		if (!isset($this->all_flights[$id])) {
269 321
 		    $this->all_flights[$id] = array();
270 322
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
271 323
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
272
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
324
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) {
325
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
326
+		    }
273 327
 		    if (!isset($line['id'])) {
274
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
275
-//			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')));
328
+			if (!isset($globalDaemon)) {
329
+				$globalDaemon = TRUE;
330
+			}
331
+			//			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')));
276 332
 //			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')));
277
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
333
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
334
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
335
+			}
278 336
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
279
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
280
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
337
+		     } else {
338
+		     	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
339
+		     }
340
+		    if ($globalAllFlights !== FALSE) {
341
+		    	$dataFound = true;
342
+		    }
281 343
 		}
282 344
 		if (isset($line['source_type']) && $line['source_type'] != '') {
283 345
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
@@ -299,17 +361,27 @@  discard block
 block discarded – undo
299 361
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
300 362
 			    }
301 363
 			    $Spotter->db = null;
302
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
303
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
364
+			    if ($globalDebugTimeElapsed) {
365
+			    	echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
366
+			    }
367
+			    if ($aircraft_icao != '') {
368
+			    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
369
+			    }
304 370
 			}
305 371
 		    }
306
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
307
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
372
+		    if ($globalAllFlights !== FALSE) {
373
+		    	$dataFound = true;
374
+		    }
375
+		    if ($globalDebug) {
376
+		    	echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
377
+		    }
308 378
 		}
309 379
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
310 380
 			$icao = $line['aircraft_icao'];
311 381
 			$Spotter = new Spotter($this->db);
312
-			if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
382
+			if (isset($Spotter->aircraft_correct_icaotype[$icao])) {
383
+				$icao = $Spotter->aircraft_correct_icaotype[$icao];
384
+			}
313 385
 			$Spotter->db = null;
314 386
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
315 387
 		}
@@ -319,15 +391,24 @@  discard block
 block discarded – undo
319 391
 				$Spotter = new Spotter($this->db);
320 392
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
321 393
 				$Spotter->db = null;
322
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
394
+				if ($aircraft_icao != '') {
395
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
396
+				}
323 397
 			}
324 398
 		}
325 399
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
326
-			if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
327
-			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
328
-			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
329
-			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
330
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
400
+			if ($line['aircraft_type'] == 'PARA_GLIDER') {
401
+				$aircraft_icao = 'GLID';
402
+			} elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
403
+				$aircraft_icao = 'UHEL';
404
+			} elseif ($line['aircraft_type'] == 'TOW_PLANE') {
405
+				$aircraft_icao = 'TOWPLANE';
406
+			} elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
407
+				$aircraft_icao = 'POWAIRC';
408
+			}
409
+			if (isset($aircraft_icao)) {
410
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
411
+			}
331 412
 		}
332 413
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
333 414
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
@@ -337,8 +418,11 @@  discard block
 block discarded – undo
337 418
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
338 419
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
339 420
 		    } else {
340
-				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";
341
-				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";
421
+				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
422
+					echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
423
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
424
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
425
+				}
342 426
 				/*
343 427
 				echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']);
344 428
 				print_r($this->all_flights[$id]);
@@ -347,16 +431,22 @@  discard block
 block discarded – undo
347 431
 				return '';
348 432
 		    }
349 433
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
350
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
434
+			if ($globalDebug) {
435
+				echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
436
+			}
351 437
 			return '';
352 438
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
353
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
439
+			if ($globalDebug) {
440
+				echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
441
+			}
354 442
 			return '';
355 443
 		} elseif (!isset($line['datetime'])) {
356 444
 			date_default_timezone_set('UTC');
357 445
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
358 446
 		} else {
359
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
447
+			if ($globalDebug) {
448
+				echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
449
+			}
360 450
 			return '';
361 451
 		}
362 452
 
@@ -377,30 +467,48 @@  discard block
 block discarded – undo
377 467
 
378 468
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
379 469
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 2300) {
380
-				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
470
+				if ($globalDebug) {
471
+					echo '---!!!! New ident, reset aircraft data...'."\n";
472
+				}
381 473
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
382 474
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
383
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
384
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
385
-				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']));
475
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
476
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
477
+				} elseif (isset($line['id'])) {
478
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
479
+				} elseif (isset($this->all_flights[$id]['ident'])) {
480
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
481
+				}
386 482
 			} else {
387 483
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
388 484
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
389 485
 				$timeelapsed = microtime(true);
390 486
             			$Spotter = new Spotter($this->db);
391 487
             			$fromsource = NULL;
392
-            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
393
-            			elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
394
-				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
395
-				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
396
-				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
488
+            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
489
+            				$fromsource = $globalAirlinesSource;
490
+            			} elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') {
491
+            				$fromsource = 'vatsim';
492
+            			} elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') {
493
+					$fromsource = 'ivao';
494
+				} elseif (isset($globalVATSIM) && $globalVATSIM) {
495
+					$fromsource = 'vatsim';
496
+				} elseif (isset($globalIVAO) && $globalIVAO) {
497
+					$fromsource = 'ivao';
498
+				}
397 499
             			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
398
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
500
+				if ($globalDebug && $result != 'success') {
501
+					echo '!!! ERROR : '.$result."\n";
502
+				}
399 503
 				$Spotter->db = null;
400
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
504
+				if ($globalDebugTimeElapsed) {
505
+					echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
506
+				}
401 507
 			    }
402 508
 			}
403
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
509
+		    } else {
510
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
511
+		    }
404 512
 		    
405 513
 /*
406 514
 		    if (!isset($line['id'])) {
@@ -410,7 +518,9 @@  discard block
 block discarded – undo
410 518
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
411 519
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
412 520
   */
413
-		    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']));
521
+		    if (!isset($this->all_flights[$id]['id'])) {
522
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
523
+		    }
414 524
 
415 525
 		    //$putinarchive = true;
416 526
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
@@ -428,7 +538,9 @@  discard block
 block discarded – undo
428 538
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
429 539
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
430 540
 		    		$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' => ''));
431
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
541
+				if ($globalDebugTimeElapsed) {
542
+					echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
543
+				}
432 544
                         }
433 545
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
434 546
 			$timeelapsed = microtime(true);
@@ -442,7 +554,9 @@  discard block
 block discarded – undo
442 554
 				$Translation->db = null;
443 555
 			    }
444 556
 			    $Spotter->db = null;
445
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
557
+			    if ($globalDebugTimeElapsed) {
558
+			    	echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
559
+			    }
446 560
                     	}
447 561
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
448 562
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
@@ -451,9 +565,13 @@  discard block
 block discarded – undo
451 565
 		    		$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']));
452 566
 		    	    }
453 567
 			}
454
-			if (!isset($globalFork)) $globalFork = TRUE;
568
+			if (!isset($globalFork)) {
569
+				$globalFork = TRUE;
570
+			}
455 571
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
456
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
572
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) {
573
+					$this->get_Schedule($id,trim($line['ident']));
574
+				}
457 575
 			}
458 576
 		    }
459 577
 		}
@@ -469,16 +587,23 @@  discard block
 block discarded – undo
469 587
 		    // use datetime
470 588
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
471 589
 			$speed = $speed*3.6;
472
-			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
473
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
590
+			if ($speed < 1000) {
591
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
592
+			}
593
+  			if ($globalDebug) {
594
+  				echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
595
+  			}
474 596
 		    }
475 597
 		}
476 598
 
477 599
 
478 600
 
479 601
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
480
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
481
-	    	    else unset($timediff);
602
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) {
603
+	    	    	$timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
604
+	    	    } else {
605
+	    	    	unset($timediff);
606
+	    	    }
482 607
 	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
483 608
 			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'])) {
484 609
 			    if ($timediff > $globalAircraftMaxUpdate || !$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'])) {
@@ -487,16 +612,25 @@  discard block
 block discarded – undo
487 612
 				$this->all_flights[$id]['putinarchive'] = true;
488 613
 				$this->tmd = 0;
489 614
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
490
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
615
+				    if ($globalDebug) {
616
+				    	echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
617
+				    }
491 618
 				    $timeelapsed = microtime(true);
492 619
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
493 620
 					$Spotter = new Spotter($this->db);
494 621
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
495
-					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
496
-					else $this->all_flights[$id]['over_country'] = '';
622
+					if (!empty($all_country)) {
623
+						$this->all_flights[$id]['over_country'] = $all_country['iso2'];
624
+					} else {
625
+						$this->all_flights[$id]['over_country'] = '';
626
+					}
497 627
 					$Spotter->db = null;
498
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
499
-					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
628
+					if ($globalDebugTimeElapsed) {
629
+						echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
630
+					}
631
+					if ($globalDebug) {
632
+						echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
633
+					}
500 634
 				    }
501 635
 				}
502 636
 			    }
@@ -504,7 +638,9 @@  discard block
 block discarded – undo
504 638
 
505 639
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
506 640
 			    //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) {
507
-				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
641
+				if (!isset($this->all_flights[$id]['archive_latitude'])) {
642
+					$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
643
+				}
508 644
 				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') {
509 645
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
510 646
 				    $dataFound = true;
@@ -526,9 +662,13 @@  discard block
 block discarded – undo
526 662
 			    */
527 663
 			}
528 664
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
529
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
665
+			    if ($line['longitude'] > 180) {
666
+			    	$line['longitude'] = $line['longitude'] - 360;
667
+			    }
530 668
 			    //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) {
531
-				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
669
+				if (!isset($this->all_flights[$id]['archive_longitude'])) {
670
+					$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
671
+				}
532 672
 				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') {
533 673
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
534 674
 				    $dataFound = true;
@@ -559,7 +699,9 @@  discard block
 block discarded – undo
559 699
 		    }
560 700
 		}
561 701
 		if (isset($line['last_update']) && $line['last_update'] != '') {
562
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
702
+		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) {
703
+		    	$dataFound = true;
704
+		    }
563 705
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
564 706
 		}
565 707
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
@@ -581,53 +723,79 @@  discard block
 block discarded – undo
581 723
 			// Here we force archive of flight because after ground it's a new one (or should be)
582 724
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
583 725
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
584
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
585
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
586
-			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']));
726
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
727
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
728
+			} elseif (isset($line['id'])) {
729
+		        	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
730
+		        } elseif (isset($this->all_flights[$id]['ident'])) {
731
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
732
+			}
733
+		    }
734
+		    if ($line['ground'] != 1) {
735
+		    	$line['ground'] = 0;
587 736
 		    }
588
-		    if ($line['ground'] != 1) $line['ground'] = 0;
589 737
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
590 738
 		    //$dataFound = true;
591 739
 		}
592 740
 		if (isset($line['squawk']) && $line['squawk'] != '') {
593 741
 		    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'])) {
594
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
742
+			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) {
743
+			    	$this->all_flights[$id]['putinarchive'] = true;
744
+			    }
595 745
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
596 746
 			    $highlight = '';
597
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
598
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
599
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
747
+			    if ($this->all_flights[$id]['squawk'] == '7500') {
748
+			    	$highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
749
+			    }
750
+			    if ($this->all_flights[$id]['squawk'] == '7600') {
751
+			    	$highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
752
+			    }
753
+			    if ($this->all_flights[$id]['squawk'] == '7700') {
754
+			    	$highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
755
+			    }
600 756
 			    if ($highlight != '') {
601 757
 				$timeelapsed = microtime(true);
602 758
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
603 759
 				    $Spotter = new Spotter($this->db);
604 760
 				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
605 761
 				    $Spotter->db = null;
606
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
762
+				    if ($globalDebugTimeElapsed) {
763
+				    	echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
764
+				    }
607 765
 				}
608 766
 				//$putinarchive = true;
609 767
 				//$highlight = '';
610 768
 			    }
611 769
 			    
612
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
770
+		    } else {
771
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
772
+		    }
613 773
 		    //$dataFound = true;
614 774
 		}
615 775
 
616 776
 		if (isset($line['altitude']) && $line['altitude'] != '') {
617 777
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
618
-			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;
778
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) {
779
+				$this->all_flights[$id]['putinarchive'] = true;
780
+			}
619 781
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
620 782
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
621 783
 			//$dataFound = true;
622 784
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
623 785
 		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
624 786
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 2300) {
625
-				if ($globalDebug) echo '--- Reset because of altitude'."\n";
787
+				if ($globalDebug) {
788
+					echo '--- Reset because of altitude'."\n";
789
+				}
626 790
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
627 791
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
628
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
629
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
630
-				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']));
792
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
793
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
794
+				} elseif (isset($line['id'])) {
795
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
796
+				} elseif (isset($this->all_flights[$id]['ident'])) {
797
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
798
+				}
631 799
 			}
632 800
 		    }
633 801
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
@@ -638,22 +806,32 @@  discard block
 block discarded – undo
638 806
 		}
639 807
 		
640 808
 		if (isset($line['heading']) && $line['heading'] != '') {
641
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
809
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) {
810
+		    	$this->all_flights[$id]['putinarchive'] = true;
811
+		    }
642 812
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
643 813
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
644 814
 		    //$dataFound = true;
645 815
   		} 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']) {
646 816
   		    $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']);
647 817
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
648
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
649
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
818
+		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) {
819
+		    	$this->all_flights[$id]['putinarchive'] = true;
820
+		    }
821
+  		    if ($globalDebug) {
822
+  		    	echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
823
+  		    }
650 824
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
651 825
   		    // If not enough messages and ACARS set heading to 0
652 826
   		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
653 827
   		}
654
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
655
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
656
-		elseif ($globalDaemon === TRUE && isset($globalMinupdate) && $globalMinupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false;
828
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) {
829
+			$dataFound = false;
830
+		} elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) {
831
+			$dataFound = false;
832
+		} elseif ($globalDaemon === TRUE && isset($globalMinupdate) && $globalMinupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) {
833
+			$dataFound = false;
834
+		}
657 835
 
658 836
 //		print_r($this->all_flights[$id]);
659 837
 		//gets the callsign from the last hour
@@ -669,23 +847,38 @@  discard block
 block discarded – undo
669 847
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
670 848
 			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
671 849
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
672
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
850
+				    if ($globalDebug) {
851
+				    	echo "Check if aircraft is already in DB...";
852
+				    }
673 853
 				    $timeelapsed = microtime(true);
674 854
 				    $SpotterLive = new SpotterLive($this->db);
675 855
 				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
676 856
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
677
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
857
+					if ($globalDebugTimeElapsed) {
858
+						echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
859
+					}
678 860
 				    } elseif (isset($line['id'])) {
679 861
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
680
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
862
+					if ($globalDebugTimeElapsed) {
863
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
864
+					}
681 865
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
682 866
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
683
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
684
-				    } else $recent_ident = '';
867
+					if ($globalDebugTimeElapsed) {
868
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
869
+					}
870
+				    } else {
871
+				    	$recent_ident = '';
872
+				    }
685 873
 				    $SpotterLive->db=null;
686
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
687
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
688
-				} else $recent_ident = '';
874
+				    if ($globalDebug && $recent_ident == '') {
875
+				    	echo " Not in DB.\n";
876
+				    } elseif ($globalDebug && $recent_ident != '') {
877
+				    	echo " Already in DB.\n";
878
+				    }
879
+				} else {
880
+					$recent_ident = '';
881
+				}
689 882
 			    } else {
690 883
 				$recent_ident = '';
691 884
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
@@ -693,7 +886,9 @@  discard block
 block discarded – undo
693 886
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
694 887
 			    if($recent_ident == "")
695 888
 			    {
696
-				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
889
+				if ($globalDebug) {
890
+					echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
891
+				}
697 892
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
698 893
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
699 894
 				//adds the spotter data for the archive
@@ -737,31 +932,49 @@  discard block
 block discarded – undo
737 932
 				
738 933
 				if (!$ignoreImport) {
739 934
 				    $highlight = '';
740
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
741
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
742
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
743
-				    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')));
935
+				    if ($this->all_flights[$id]['squawk'] == '7500') {
936
+				    	$highlight = 'Squawk 7500 : Hijack';
937
+				    }
938
+				    if ($this->all_flights[$id]['squawk'] == '7600') {
939
+				    	$highlight = 'Squawk 7600 : Lost Comm (radio failure)';
940
+				    }
941
+				    if ($this->all_flights[$id]['squawk'] == '7700') {
942
+				    	$highlight = 'Squawk 7700 : Emergency';
943
+				    }
944
+				    if (!isset($this->all_flights[$id]['id'])) {
945
+				    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
946
+				    }
744 947
 				    $timeelapsed = microtime(true);
745 948
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
746 949
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
747 950
 					    $Spotter = new Spotter($this->db);
748 951
 					    $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']);
749 952
 					    $Spotter->db = null;
750
-					    if ($globalDebug && isset($result)) echo $result."\n";
953
+					    if ($globalDebug && isset($result)) {
954
+					    	echo $result."\n";
955
+					    }
751 956
 					}
752 957
 				    }
753
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
958
+				    if ($globalDebugTimeElapsed) {
959
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
960
+				    }
754 961
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
755 962
 
756 963
 				    // Add source stat in DB
757 964
 				    $Stats = new Stats($this->db);
758 965
 				    if (!empty($this->stats)) {
759
-					if ($globalDebug) echo 'Add source stats : ';
966
+					if ($globalDebug) {
967
+						echo 'Add source stats : ';
968
+					}
760 969
 				        foreach($this->stats as $date => $data) {
761 970
 					    foreach($data as $source => $sourced) {
762 971
 					        //print_r($sourced);
763
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
764
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
972
+				    	        if (isset($sourced['polar'])) {
973
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
974
+				    	        }
975
+				    	        if (isset($sourced['hist'])) {
976
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
977
+				    	        }
765 978
 				    		if (isset($sourced['msg'])) {
766 979
 				    		    if (time() - $sourced['msg']['date'] > 10) {
767 980
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -774,13 +987,17 @@  discard block
 block discarded – undo
774 987
 			    			unset($this->stats[$date]);
775 988
 			    		    }
776 989
 				    	}
777
-				    	if ($globalDebug) echo 'Done'."\n";
990
+				    	if ($globalDebug) {
991
+				    		echo 'Done'."\n";
992
+				    	}
778 993
 
779 994
 				    }
780 995
 				    $Stats->db = null;
781 996
 				    }
782 997
 				    $this->del();
783
-				} elseif ($globalDebug) echo 'Ignore data'."\n";
998
+				} elseif ($globalDebug) {
999
+					echo 'Ignore data'."\n";
1000
+				}
784 1001
 				//$ignoreImport = false;
785 1002
 				$this->all_flights[$id]['addedSpotter'] = 1;
786 1003
 				//print_r($this->all_flights[$id]);
@@ -797,7 +1014,9 @@  discard block
 block discarded – undo
797 1014
 			*/
798 1015
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
799 1016
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
800
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
1017
+				    if ($globalDebug) {
1018
+				    	echo "---- Deleting Live Spotter data older than 9 hours...";
1019
+				    }
801 1020
 				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
802 1021
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
803 1022
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -806,7 +1025,9 @@  discard block
 block discarded – undo
806 1025
 					    $SpotterLive->db=null;
807 1026
 					}
808 1027
 				    }
809
-				    if ($globalDebug) echo " Done\n";
1028
+				    if ($globalDebug) {
1029
+				    	echo " Done\n";
1030
+				    }
810 1031
 				    $this->last_delete = time();
811 1032
 				}
812 1033
 			    } else {
@@ -833,11 +1054,17 @@  discard block
 block discarded – undo
833 1054
 		    //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";
834 1055
 		    if ($globalDebug) {
835 1056
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
836
-				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";
837
-				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";
1057
+				if (isset($this->all_flights[$id]['source_name'])) {
1058
+					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";
1059
+				} else {
1060
+					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";
1061
+				}
838 1062
 			} else {
839
-				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";
840
-				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";
1063
+				if (isset($this->all_flights[$id]['source_name'])) {
1064
+					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";
1065
+				} else {
1066
+					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";
1067
+				}
841 1068
 			}
842 1069
 		    }
843 1070
 		    $ignoreImport = false;
@@ -883,22 +1110,30 @@  discard block
 block discarded – undo
883 1110
 
884 1111
 		    if (!$ignoreImport) {
885 1112
 			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'])) {
886
-				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')));
1113
+				if (!isset($this->all_flights[$id]['id'])) {
1114
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
1115
+				}
887 1116
 				$timeelapsed = microtime(true);
888 1117
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
889 1118
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
890
-					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
1119
+					if ($globalDebug) {
1120
+						echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
1121
+					}
891 1122
 					$SpotterLive = new SpotterLive($this->db);
892 1123
 					$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']);
893 1124
 					$SpotterLive->db = null;
894
-					if ($globalDebug) echo $result."\n";
1125
+					if ($globalDebug) {
1126
+						echo $result."\n";
1127
+					}
895 1128
 				    }
896 1129
 				}
897 1130
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
898 1131
 					$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']);
899 1132
 				}
900 1133
 				$this->all_flights[$id]['putinarchive'] = false;
901
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1134
+				if ($globalDebugTimeElapsed) {
1135
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1136
+				}
902 1137
 
903 1138
 				// Put statistics in $this->stats variable
904 1139
 				//if ($line['format_source'] != 'aprs') {
@@ -906,7 +1141,9 @@  discard block
 block discarded – undo
906 1141
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
907 1142
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
908 1143
 					$source = $this->all_flights[$id]['source_name'];
909
-					if ($source == '') $source = $this->all_flights[$id]['format_source'];
1144
+					if ($source == '') {
1145
+						$source = $this->all_flights[$id]['format_source'];
1146
+					}
910 1147
 					if (!isset($this->source_location[$source])) {
911 1148
 						$Location = new Source();
912 1149
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -927,7 +1164,9 @@  discard block
 block discarded – undo
927 1164
 					$stats_heading = round($stats_heading/22.5);
928 1165
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
929 1166
 					$current_date = date('Y-m-d');
930
-					if ($stats_heading == 16) $stats_heading = 0;
1167
+					if ($stats_heading == 16) {
1168
+						$stats_heading = 0;
1169
+					}
931 1170
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
932 1171
 						for ($i=0;$i<=15;$i++) {
933 1172
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -945,7 +1184,9 @@  discard block
 block discarded – undo
945 1184
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
946 1185
 						    end($this->stats[$current_date][$source]['hist']);
947 1186
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
948
-						} else $mini = 0;
1187
+						} else {
1188
+							$mini = 0;
1189
+						}
949 1190
 						for ($i=$mini;$i<=$distance;$i+=10) {
950 1191
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
951 1192
 						}
@@ -957,19 +1198,27 @@  discard block
 block discarded – undo
957 1198
 				}
958 1199
 
959 1200
 				$this->all_flights[$id]['lastupdate'] = time();
960
-				if ($this->all_flights[$id]['putinarchive']) $send = true;
1201
+				if ($this->all_flights[$id]['putinarchive']) {
1202
+					$send = true;
1203
+				}
961 1204
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
962
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1205
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
1206
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1207
+			}
963 1208
 			//$this->del();
964 1209
 			
965 1210
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
966 1211
 			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
967
-				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1212
+				if ($globalDebug) {
1213
+					echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1214
+				}
968 1215
 				$SpotterLive = new SpotterLive($this->db);
969 1216
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
970 1217
 				$SpotterLive->db = null;
971 1218
 				//SpotterLive->deleteLiveSpotterData();
972
-				if ($globalDebug) echo " Done\n";
1219
+				if ($globalDebug) {
1220
+					echo " Done\n";
1221
+				}
973 1222
 				$this->last_delete_hourly = time();
974 1223
 			    } else {
975 1224
 				$this->del();
@@ -981,7 +1230,9 @@  discard block
 block discarded – undo
981 1230
 		    //$ignoreImport = false;
982 1231
 		}
983 1232
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
984
-		if ($send) return $this->all_flights[$id];
1233
+		if ($send) {
1234
+			return $this->all_flights[$id];
1235
+		}
985 1236
 	    }
986 1237
 	}
987 1238
     }
Please login to merge, or discard this patch.
scripts/daemon-spotter.php 3 patches
Indentation   +861 added lines, -861 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,36 +110,36 @@  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
-    	    /*
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
+			/*
143 143
     	    // Disabled for now, site change source format
144 144
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
145 145
         	//$formats[$id] = 'radarvirtueljson';
@@ -151,115 +151,115 @@  discard block
 block discarded – undo
151 151
         	    exit(0);
152 152
         	}
153 153
     	    */
154
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
155
-        	//$formats[$id] = 'planeupdatefaa';
156
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
157
-        	//$last_exec['planeupdatefaa'] = 0;
158
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
159
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
160
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
161
-        	    exit(0);
162
-        	}
163
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
164
-        	//$formats[$id] = 'phpvmacars';
165
-        	$globalSources[$id]['format'] = 'phpvmacars';
166
-        	//$last_exec['phpvmacars'] = 0;
167
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
168
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
169
-        	//$formats[$id] = 'phpvmacars';
170
-        	$globalSources[$id]['format'] = 'vam';
171
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
172
-            } else if (preg_match('/whazzup/i',$host)) {
173
-        	//$formats[$id] = 'whazzup';
174
-        	$globalSources[$id]['format'] = 'whazzup';
175
-        	//$last_exec['whazzup'] = 0;
176
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
177
-            } else if (preg_match('/recentpireps/i',$host)) {
178
-        	//$formats[$id] = 'pirepsjson';
179
-        	$globalSources[$id]['format'] = 'pirepsjson';
180
-        	//$last_exec['pirepsjson'] = 0;
181
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
182
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
183
-        	//$formats[$id] = 'fr24json';
184
-        	$globalSources[$id]['format'] = 'fr24json';
185
-        	//$last_exec['fr24json'] = 0;
186
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
187
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
188
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
189
-        	    exit(0);
190
-        	}
191
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
192
-        	//$formats[$id] = 'fr24json';
193
-        	$globalSources[$id]['format'] = 'myshiptracking';
194
-        	//$last_exec['fr24json'] = 0;
195
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
196
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
197
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
198
-        	    exit(0);
199
-        	}
200
-            //} else if (preg_match('/10001/',$host)) {
201
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
202
-        	//$formats[$id] = 'tsv';
203
-        	$globalSources[$id]['format'] = 'tsv';
204
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
205
-            }
206
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
207
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
208
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
209
-    		    if ($idf !== false) {
210
-    			$httpfeeds[$id] = $idf;
211
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
212
-    		    }
213
-    		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
214
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
215
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
216
-	    $hostport = explode(':',$host);
217
-	    if (isset($hostport[1])) {
154
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
155
+			//$formats[$id] = 'planeupdatefaa';
156
+			$globalSources[$id]['format'] = 'planeupdatefaa';
157
+			//$last_exec['planeupdatefaa'] = 0;
158
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
159
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
160
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
161
+				exit(0);
162
+			}
163
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
164
+			//$formats[$id] = 'phpvmacars';
165
+			$globalSources[$id]['format'] = 'phpvmacars';
166
+			//$last_exec['phpvmacars'] = 0;
167
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
168
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
169
+			//$formats[$id] = 'phpvmacars';
170
+			$globalSources[$id]['format'] = 'vam';
171
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
172
+			} else if (preg_match('/whazzup/i',$host)) {
173
+			//$formats[$id] = 'whazzup';
174
+			$globalSources[$id]['format'] = 'whazzup';
175
+			//$last_exec['whazzup'] = 0;
176
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
177
+			} else if (preg_match('/recentpireps/i',$host)) {
178
+			//$formats[$id] = 'pirepsjson';
179
+			$globalSources[$id]['format'] = 'pirepsjson';
180
+			//$last_exec['pirepsjson'] = 0;
181
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
182
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
183
+			//$formats[$id] = 'fr24json';
184
+			$globalSources[$id]['format'] = 'fr24json';
185
+			//$last_exec['fr24json'] = 0;
186
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
187
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
188
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
189
+				exit(0);
190
+			}
191
+			} else if (preg_match(':myshiptracking.com/:i',$host)) {
192
+			//$formats[$id] = 'fr24json';
193
+			$globalSources[$id]['format'] = 'myshiptracking';
194
+			//$last_exec['fr24json'] = 0;
195
+			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
196
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
197
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
198
+				exit(0);
199
+			}
200
+			//} else if (preg_match('/10001/',$host)) {
201
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
202
+			//$formats[$id] = 'tsv';
203
+			$globalSources[$id]['format'] = 'tsv';
204
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
205
+			}
206
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
207
+			if ($globalSources[$id]['format'] == 'aisnmeahttp') {
208
+				$idf = fopen($globalSources[$id]['host'],'r',false,$context);
209
+				if ($idf !== false) {
210
+				$httpfeeds[$id] = $idf;
211
+				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
212
+				}
213
+				elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
214
+			} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
215
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
216
+		$hostport = explode(':',$host);
217
+		if (isset($hostport[1])) {
218 218
 		$port = $hostport[1];
219 219
 		$hostn = $hostport[0];
220
-	    } else {
220
+		} else {
221 221
 		$port = $globalSources[$id]['port'];
222 222
 		$hostn = $globalSources[$id]['host'];
223
-	    }
224
-	    $Common = new Common();
225
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
226
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
227
-    	    } else {
228
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
229
-	    }
230
-	    if ($s) {
231
-    	        $sockets[$id] = $s;
232
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
233
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
223
+		}
224
+		$Common = new Common();
225
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
226
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
227
+			} else {
228
+			$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
229
+		}
230
+		if ($s) {
231
+				$sockets[$id] = $s;
232
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
233
+			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
234 234
 			//$formats[$id] = 'aprs';
235 235
 			$globalSources[$id]['format'] = 'aprs';
236 236
 			//$aprs_connect = 0;
237 237
 			//$use_aprs = true;
238
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
238
+			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
239 239
 			$globalSources[$id]['format'] = 'vrstcp';
240
-    		    } elseif ($port == '10001') {
241
-        		//$formats[$id] = 'tsv';
242
-        		$globalSources[$id]['format'] = 'tsv';
243
-		    } elseif ($port == '30002') {
244
-        		//$formats[$id] = 'raw';
245
-        		$globalSources[$id]['format'] = 'raw';
246
-		    } elseif ($port == '5001') {
247
-        		//$formats[$id] = 'raw';
248
-        		$globalSources[$id]['format'] = 'flightgearmp';
249
-		    } elseif ($port == '30005') {
240
+				} elseif ($port == '10001') {
241
+				//$formats[$id] = 'tsv';
242
+				$globalSources[$id]['format'] = 'tsv';
243
+			} elseif ($port == '30002') {
244
+				//$formats[$id] = 'raw';
245
+				$globalSources[$id]['format'] = 'raw';
246
+			} elseif ($port == '5001') {
247
+				//$formats[$id] = 'raw';
248
+				$globalSources[$id]['format'] = 'flightgearmp';
249
+			} elseif ($port == '30005') {
250 250
 			// Not yet supported
251
-        		//$formats[$id] = 'beast';
252
-        		$globalSources[$id]['format'] = 'beast';
253
-		    //} else $formats[$id] = 'sbs';
254
-		    } else $globalSources[$id]['format'] = 'sbs';
255
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
251
+				//$formats[$id] = 'beast';
252
+				$globalSources[$id]['format'] = 'beast';
253
+			//} else $formats[$id] = 'sbs';
254
+			} else $globalSources[$id]['format'] = 'sbs';
255
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
256 256
 		}
257 257
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
258
-            } else {
258
+			} else {
259 259
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
260
-    	    }
261
-        }
262
-    }
260
+			}
261
+		}
262
+	}
263 263
 }
264 264
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
265 265
 
@@ -282,9 +282,9 @@  discard block
 block discarded – undo
282 282
 //connect_all($globalSources);
283 283
 
284 284
 if (isset($globalProxy) && $globalProxy) {
285
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
285
+	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
286 286
 } else {
287
-    $context = stream_context_create(array('http' => array('timeout' => $timeout)));
287
+	$context = stream_context_create(array('http' => array('timeout' => $timeout)));
288 288
 }
289 289
 
290 290
 // APRS Configuration
@@ -293,18 +293,18 @@  discard block
 block discarded – undo
293 293
 	die;
294 294
 }
295 295
 foreach ($globalSources as $key => $source) {
296
-    if (!isset($source['format'])) {
297
-        $globalSources[$key]['format'] = 'auto';
298
-    }
296
+	if (!isset($source['format'])) {
297
+		$globalSources[$key]['format'] = 'auto';
298
+	}
299 299
 }
300 300
 connect_all($globalSources);
301 301
 foreach ($globalSources as $key => $source) {
302
-    if (isset($source['format']) && $source['format'] == 'aprs') {
302
+	if (isset($source['format']) && $source['format'] == 'aprs') {
303 303
 	$aprs_connect = 0;
304 304
 	$use_aprs = true;
305 305
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
306 306
 	break;
307
-    }
307
+	}
308 308
 }
309 309
 
310 310
 if ($use_aprs) {
@@ -345,116 +345,116 @@  discard block
 block discarded – undo
345 345
 
346 346
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
347 347
 while ($i > 0) {
348
-    if (!$globalDaemon) $i = $endtime-time();
349
-    // Delete old ATC
350
-    if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
348
+	if (!$globalDaemon) $i = $endtime-time();
349
+	// Delete old ATC
350
+	if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
351 351
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
352
-        $ATC->deleteOldATC();
353
-    }
352
+		$ATC->deleteOldATC();
353
+	}
354 354
     
355
-    //if (count($last_exec) > 0) {
356
-    if (count($last_exec) == count($globalSources)) {
355
+	//if (count($last_exec) > 0) {
356
+	if (count($last_exec) == count($globalSources)) {
357 357
 	$max = $globalMinFetch;
358 358
 	foreach ($last_exec as $last) {
359
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
359
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
360 360
 	}
361 361
 	if ($max != $globalMinFetch) {
362
-	    if ($globalDebug) echo 'Sleeping...'."\n";
363
-	    sleep($globalMinFetch-$max+2);
362
+		if ($globalDebug) echo 'Sleeping...'."\n";
363
+		sleep($globalMinFetch-$max+2);
364
+	}
364 365
 	}
365
-    }
366 366
 
367 367
     
368
-    //foreach ($formats as $id => $value) {
369
-    foreach ($globalSources as $id => $value) {
368
+	//foreach ($formats as $id => $value) {
369
+	foreach ($globalSources as $id => $value) {
370 370
 	date_default_timezone_set('UTC');
371 371
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
372 372
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
373
-	    //$buffer = $Common->getData($hosts[$id]);
374
-	    $buffer = $Common->getData($value['host']);
375
-	    if ($buffer != '') $reset = 0;
376
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
377
-	    $buffer = explode('\n',$buffer);
378
-	    foreach ($buffer as $line) {
379
-    		if ($line != '' && count($line) > 7) {
380
-    		    $line = explode(',', $line);
381
-	            $data = array();
382
-	            $data['hex'] = $line[1]; // hex
383
-	            $data['ident'] = $line[2]; // ident
384
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
385
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
386
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
387
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
388
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
389
-	            $data['verticalrate'] = ''; // vertical rate
390
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
391
-	            $data['emergency'] = ''; // emergency
392
-		    $data['datetime'] = date('Y-m-d H:i:s');
393
-		    $data['format_source'] = 'deltadbtxt';
394
-    		    $data['id_source'] = $id_source;
395
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
396
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
397
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
398
-    		    $SI->add($data);
399
-		    unset($data);
400
-    		}
401
-    	    }
402
-    	    $last_exec[$id]['last'] = time();
373
+		//$buffer = $Common->getData($hosts[$id]);
374
+		$buffer = $Common->getData($value['host']);
375
+		if ($buffer != '') $reset = 0;
376
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
377
+		$buffer = explode('\n',$buffer);
378
+		foreach ($buffer as $line) {
379
+			if ($line != '' && count($line) > 7) {
380
+				$line = explode(',', $line);
381
+				$data = array();
382
+				$data['hex'] = $line[1]; // hex
383
+				$data['ident'] = $line[2]; // ident
384
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
385
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
386
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
387
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
388
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
389
+				$data['verticalrate'] = ''; // vertical rate
390
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
391
+				$data['emergency'] = ''; // emergency
392
+			$data['datetime'] = date('Y-m-d H:i:s');
393
+			$data['format_source'] = 'deltadbtxt';
394
+				$data['id_source'] = $id_source;
395
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
396
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
397
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
398
+				$SI->add($data);
399
+			unset($data);
400
+			}
401
+			}
402
+			$last_exec[$id]['last'] = time();
403 403
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
404
-	    date_default_timezone_set('CET');
405
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
406
-	    date_default_timezone_set('UTC');
407
-	    if ($buffer != '') $reset = 0;
408
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
409
-	    $buffer = explode('\n',$buffer);
410
-	    foreach ($buffer as $line) {
404
+		date_default_timezone_set('CET');
405
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
406
+		date_default_timezone_set('UTC');
407
+		if ($buffer != '') $reset = 0;
408
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
409
+		$buffer = explode('\n',$buffer);
410
+		foreach ($buffer as $line) {
411 411
 		if ($line != '') {
412
-		    echo "'".$line."'\n";
413
-		    $add = false;
414
-		    $ais_data = $AIS->parse_line(trim($line));
415
-		    $data = array();
416
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
417
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
418
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
419
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
420
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
421
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
422
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
423
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
424
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
425
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
426
-		    if (isset($ais_data['timestamp'])) {
412
+			echo "'".$line."'\n";
413
+			$add = false;
414
+			$ais_data = $AIS->parse_line(trim($line));
415
+			$data = array();
416
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
417
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
418
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
419
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
420
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
421
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
422
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
423
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
424
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
425
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
426
+			if (isset($ais_data['timestamp'])) {
427 427
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
428 428
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
429
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
430
-			    $add = true;
429
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
430
+				$add = true;
431 431
 			}
432
-		    } else {
432
+			} else {
433 433
 			$data['datetime'] = date('Y-m-d H:i:s');
434 434
 			$add = true;
435
-		    }
436
-		    $data['format_source'] = 'aisnmeatxt';
437
-    		    $data['id_source'] = $id_source;
438
-		    //print_r($data);
439
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
440
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
441
-		    unset($data);
435
+			}
436
+			$data['format_source'] = 'aisnmeatxt';
437
+				$data['id_source'] = $id_source;
438
+			//print_r($data);
439
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
440
+			if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
441
+			unset($data);
442 442
 		}
443
-    	    }
444
-    	    $last_exec[$id]['last'] = time();
443
+			}
444
+			$last_exec[$id]['last'] = time();
445 445
 	} elseif ($value['format'] == 'aisnmeahttp') {
446
-	    $arr = $httpfeeds;
447
-	    $w = $e = null;
446
+		$arr = $httpfeeds;
447
+		$w = $e = null;
448 448
 	    
449
-	    if (isset($arr[$id])) {
449
+		if (isset($arr[$id])) {
450 450
 		$nn = stream_select($arr,$w,$e,$timeout);
451 451
 		if ($nn > 0) {
452
-		    foreach ($httpfeeds as $feed) {
452
+			foreach ($httpfeeds as $feed) {
453 453
 			$buffer = stream_get_line($feed,2000,"\n");
454 454
 			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
455 455
 			$buffer = explode('\n',$buffer);
456 456
 			foreach ($buffer as $line) {
457
-			    if ($line != '') {
457
+				if ($line != '') {
458 458
 				$ais_data = $AIS->parse_line(trim($line));
459 459
 				$data = array();
460 460
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
@@ -472,40 +472,40 @@  discard block
 block discarded – undo
472 472
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
473 473
 				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
474 474
 				if (isset($ais_data['timestamp'])) {
475
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
475
+					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
476 476
 				} else {
477
-				    $data['datetime'] = date('Y-m-d H:i:s');
477
+					$data['datetime'] = date('Y-m-d H:i:s');
478 478
 				}
479 479
 				$data['format_source'] = 'aisnmeahttp';
480 480
 				$data['id_source'] = $id_source;
481 481
 				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
482 482
 				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
483 483
 				unset($data);
484
-			    }
484
+				}
485
+			}
485 486
 			}
486
-		    }
487 487
 		} else {
488
-		    $format = $value['format'];
489
-		    if (isset($tt[$format])) $tt[$format]++;
490
-		    else $tt[$format] = 0;
491
-		    if ($tt[$format] > 30) {
488
+			$format = $value['format'];
489
+			if (isset($tt[$format])) $tt[$format]++;
490
+			else $tt[$format] = 0;
491
+			if ($tt[$format] > 30) {
492 492
 			if ($globalDebug) echo 'Reconnect...'."\n";
493 493
 			sleep(2);
494 494
 			$sourceeen[] = $value;
495 495
 			connect_all($sourceeen);
496 496
 			$sourceeen = array();
497
-		    }
497
+			}
498
+		}
498 499
 		}
499
-	    }
500 500
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
501
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
502
-	    if ($buffer != '') {
501
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
502
+		if ($buffer != '') {
503 503
 		//echo $buffer;
504 504
 		$all_data = json_decode($buffer,true);
505 505
 		//print_r($all_data);
506 506
 		if (isset($all_data[0]['DATA'])) {
507 507
 		foreach ($all_data[0]['DATA'] as $line) {
508
-		    if ($line != '') {
508
+			if ($line != '') {
509 509
 			$data = array();
510 510
 			$data['ident'] = $line['NAME'];
511 511
 			$data['mmsi'] = $line['MMSI'];
@@ -522,89 +522,89 @@  discard block
 block discarded – undo
522 522
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
523 523
 			$MI->add($data);
524 524
 			unset($data);
525
-		    }
525
+			}
526 526
 		}
527 527
 		}
528 528
 		
529
-	    }
530
-    	    $last_exec[$id]['last'] = time();
529
+		}
530
+			$last_exec[$id]['last'] = time();
531 531
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
532
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
533
-	    if ($buffer != '') {
532
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
533
+		if ($buffer != '') {
534 534
 		$all_data = json_decode($buffer,true);
535 535
 		if (isset($all_data[0]['mmsi'])) {
536
-		    foreach ($all_data as $line) {
536
+			foreach ($all_data as $line) {
537 537
 			if ($line != '') {
538
-			    $data = array();
539
-			    $data['ident'] = $line['shipname'];
540
-			    $data['callsign'] = $line['callsign'];
541
-			    $data['mmsi'] = $line['mmsi'];
542
-			    $data['speed'] = $line['sog'];
543
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
544
-			    $data['latitude'] = $line['latitude'];
545
-			    $data['longitude'] = $line['longitude'];
546
-			    $data['type_id'] = $line['shiptype'];
547
-			    $data['arrival_code'] = $line['destination'];
548
-			    $data['datetime'] = $line['time'];
549
-			    $data['format_source'] = 'boatbeaconapp';
550
-			    $data['id_source'] = $id_source;
551
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
552
-			    $MI->add($data);
553
-			    unset($data);
538
+				$data = array();
539
+				$data['ident'] = $line['shipname'];
540
+				$data['callsign'] = $line['callsign'];
541
+				$data['mmsi'] = $line['mmsi'];
542
+				$data['speed'] = $line['sog'];
543
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
544
+				$data['latitude'] = $line['latitude'];
545
+				$data['longitude'] = $line['longitude'];
546
+				$data['type_id'] = $line['shiptype'];
547
+				$data['arrival_code'] = $line['destination'];
548
+				$data['datetime'] = $line['time'];
549
+				$data['format_source'] = 'boatbeaconapp';
550
+				$data['id_source'] = $id_source;
551
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
552
+				$MI->add($data);
553
+				unset($data);
554
+			}
554 555
 			}
555
-		    }
556 556
 		}
557 557
 		
558
-	    }
559
-    	    $last_exec[$id]['last'] = time();
558
+		}
559
+			$last_exec[$id]['last'] = time();
560 560
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
561
-	    echo 'download...';
562
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
563
-	    echo 'done !'."\n";
564
-	    if ($buffer != '') $reset = 0;
565
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
566
-	    $buffer = explode('\n',$buffer);
567
-	    foreach ($buffer as $line) {
561
+		echo 'download...';
562
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
563
+		echo 'done !'."\n";
564
+		if ($buffer != '') $reset = 0;
565
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
566
+		$buffer = explode('\n',$buffer);
567
+		foreach ($buffer as $line) {
568 568
 		if ($line != '') {
569
-		    $data = array();
570
-		    $data['mmsi'] = (int)substr($line,0,9);
571
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
572
-		    //$data['status'] = substr($line,21,2);
573
-		    //$data['type'] = substr($line,24,3);
574
-		    $data['latitude'] = substr($line,29,9);
575
-		    $data['longitude'] = substr($line,41,9);
576
-		    $data['speed'] = round(substr($line,51,5));
577
-		    //$data['course'] = substr($line,57,5);
578
-		    $data['heading'] = round(substr($line,63,3));
579
-		    //$data['draft'] = substr($line,67,4);
580
-		    //$data['length'] = substr($line,72,3);
581
-		    //$data['beam'] = substr($line,76,2);
582
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
583
-		    //$data['callsign'] = trim(substr($line,100,7);
584
-		    //$data['dest'] = substr($line,108,20);
585
-		    //$data['etaDate'] = substr($line,129,5);
586
-		    //$data['etaTime'] = substr($line,135,5);
587
-		    $data['format_source'] = 'shipplotter';
588
-    		    $data['id_source'] = $id_source;
589
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
590
-		    //print_r($data);
591
-		    echo 'Add...'."\n";
592
-		    $MI->add($data);
593
-		    unset($data);
569
+			$data = array();
570
+			$data['mmsi'] = (int)substr($line,0,9);
571
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
572
+			//$data['status'] = substr($line,21,2);
573
+			//$data['type'] = substr($line,24,3);
574
+			$data['latitude'] = substr($line,29,9);
575
+			$data['longitude'] = substr($line,41,9);
576
+			$data['speed'] = round(substr($line,51,5));
577
+			//$data['course'] = substr($line,57,5);
578
+			$data['heading'] = round(substr($line,63,3));
579
+			//$data['draft'] = substr($line,67,4);
580
+			//$data['length'] = substr($line,72,3);
581
+			//$data['beam'] = substr($line,76,2);
582
+			$data['ident'] = trim(utf8_encode(substr($line,79,20)));
583
+			//$data['callsign'] = trim(substr($line,100,7);
584
+			//$data['dest'] = substr($line,108,20);
585
+			//$data['etaDate'] = substr($line,129,5);
586
+			//$data['etaTime'] = substr($line,135,5);
587
+			$data['format_source'] = 'shipplotter';
588
+				$data['id_source'] = $id_source;
589
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
590
+			//print_r($data);
591
+			echo 'Add...'."\n";
592
+			$MI->add($data);
593
+			unset($data);
594 594
 		}
595
-    	    }
596
-    	    $last_exec[$id]['last'] = time();
595
+			}
596
+			$last_exec[$id]['last'] = time();
597 597
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
598 598
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
599
-	    //$buffer = $Common->getData($hosts[$id]);
600
-	    $buffer = $Common->getData($value['host']);
601
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
602
-	    $buffer = explode('\n',$buffer);
603
-	    $reset = 0;
604
-	    foreach ($buffer as $line) {
605
-    		if ($line != '') {
606
-    		    $line = explode(':', $line);
607
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
599
+		//$buffer = $Common->getData($hosts[$id]);
600
+		$buffer = $Common->getData($value['host']);
601
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
602
+		$buffer = explode('\n',$buffer);
603
+		$reset = 0;
604
+		foreach ($buffer as $line) {
605
+			if ($line != '') {
606
+				$line = explode(':', $line);
607
+				if (count($line) > 30 && $line[0] != 'callsign') {
608 608
 			$data = array();
609 609
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
610 610
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -617,37 +617,37 @@  discard block
 block discarded – undo
617 617
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
618 618
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
619 619
 			$data['latitude'] = $line[5]; // lat
620
-	        	$data['longitude'] = $line[6]; // long
621
-	        	$data['verticalrate'] = ''; // vertical rate
622
-	        	$data['squawk'] = ''; // squawk
623
-	        	$data['emergency'] = ''; // emergency
624
-	        	$data['waypoints'] = $line[30];
620
+				$data['longitude'] = $line[6]; // long
621
+				$data['verticalrate'] = ''; // vertical rate
622
+				$data['squawk'] = ''; // squawk
623
+				$data['emergency'] = ''; // emergency
624
+				$data['waypoints'] = $line[30];
625 625
 			$data['datetime'] = date('Y-m-d H:i:s');
626 626
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
627 627
 			//if (isset($line[37])) $data['last_update'] = $line[37];
628
-		        $data['departure_airport_icao'] = $line[11];
629
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
630
-		        $data['arrival_airport_icao'] = $line[13];
628
+				$data['departure_airport_icao'] = $line[11];
629
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
630
+				$data['arrival_airport_icao'] = $line[13];
631 631
 			$data['frequency'] = $line[4];
632 632
 			$data['type'] = $line[18];
633 633
 			$data['range'] = $line[19];
634 634
 			if (isset($line[35])) $data['info'] = $line[35];
635
-    			$data['id_source'] = $id_source;
636
-	    		//$data['arrival_airport_time'] = ;
637
-	    		if ($line[9] != '') {
638
-	    		    $aircraft_data = explode('/',$line[9]);
639
-	    		    if (isset($aircraft_data[1])) {
640
-	    			$data['aircraft_icao'] = $aircraft_data[1];
641
-	    		    }
642
-        		}
643
-	    		/*
635
+				$data['id_source'] = $id_source;
636
+				//$data['arrival_airport_time'] = ;
637
+				if ($line[9] != '') {
638
+					$aircraft_data = explode('/',$line[9]);
639
+					if (isset($aircraft_data[1])) {
640
+					$data['aircraft_icao'] = $aircraft_data[1];
641
+					}
642
+				}
643
+				/*
644 644
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
645 645
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
646 646
 	    		*/
647
-	    		$data['format_source'] = $value['format'];
647
+				$data['format_source'] = $value['format'];
648 648
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
649 649
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
650
-    			if ($line[3] == 'PILOT') $SI->add($data);
650
+				if ($line[3] == 'PILOT') $SI->add($data);
651 651
 			elseif ($line[3] == 'ATC') {
652 652
 				//print_r($data);
653 653
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -665,255 +665,255 @@  discard block
 block discarded – undo
665 665
 				if (!isset($data['source_name'])) $data['source_name'] = '';
666 666
 				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']);
667 667
 			}
668
-    			unset($data);
669
-    		    }
670
-    		}
671
-    	    }
672
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
673
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
674
-    	    $last_exec[$id]['last'] = time();
675
-    	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
676
-    	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
677
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
678
-	    if ($buffer != '') {
679
-	    $all_data = json_decode($buffer,true);
680
-	    if (isset($all_data['acList'])) {
668
+				unset($data);
669
+				}
670
+			}
671
+			}
672
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
673
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
674
+			$last_exec[$id]['last'] = time();
675
+		//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
676
+		} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
677
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
678
+		if ($buffer != '') {
679
+		$all_data = json_decode($buffer,true);
680
+		if (isset($all_data['acList'])) {
681 681
 		$reset = 0;
682 682
 		foreach ($all_data['acList'] as $line) {
683
-		    $data = array();
684
-		    $data['hex'] = $line['Icao']; // hex
685
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
686
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
687
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
688
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
689
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
690
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
691
-		    //$data['verticalrate'] = $line['']; // verticale rate
692
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
693
-		    $data['emergency'] = ''; // emergency
694
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
683
+			$data = array();
684
+			$data['hex'] = $line['Icao']; // hex
685
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
686
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
687
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
688
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
689
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
690
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
691
+			//$data['verticalrate'] = $line['']; // verticale rate
692
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
693
+			$data['emergency'] = ''; // emergency
694
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
695 695
 		    
696
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
697
-		    else $data['datetime'] = date('Y-m-d H:i:s');
696
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
697
+			else $data['datetime'] = date('Y-m-d H:i:s');
698 698
 		    
699
-		    //$data['datetime'] = date('Y-m-d H:i:s');
700
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
701
-	    	    $data['format_source'] = 'aircraftlistjson';
702
-		    $data['id_source'] = $id_source;
703
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
704
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
705
-		    if (isset($data['latitude'])) $SI->add($data);
706
-		    unset($data);
699
+			//$data['datetime'] = date('Y-m-d H:i:s');
700
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
701
+				$data['format_source'] = 'aircraftlistjson';
702
+			$data['id_source'] = $id_source;
703
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
704
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
705
+			if (isset($data['latitude'])) $SI->add($data);
706
+			unset($data);
707 707
 		}
708
-	    } elseif (is_array($all_data)) {
708
+		} elseif (is_array($all_data)) {
709 709
 		$reset = 0;
710 710
 		foreach ($all_data as $line) {
711
-		    $data = array();
712
-		    $data['hex'] = $line['hex']; // hex
713
-		    $data['ident'] = $line['flight']; // ident
714
-		    $data['altitude'] = $line['altitude']; // altitude
715
-		    $data['speed'] = $line['speed']; // speed
716
-		    $data['heading'] = $line['track']; // heading
717
-		    $data['latitude'] = $line['lat']; // lat
718
-		    $data['longitude'] = $line['lon']; // long
719
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
720
-		    $data['squawk'] = $line['squawk']; // squawk
721
-		    $data['emergency'] = ''; // emergency
722
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
723
-		    else $data['datetime'] = date('Y-m-d H:i:s');
724
-	    	    $data['format_source'] = 'aircraftlistjson';
725
-    		    $data['id_source'] = $id_source;
726
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
727
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
728
-		    $SI->add($data);
729
-		    unset($data);
711
+			$data = array();
712
+			$data['hex'] = $line['hex']; // hex
713
+			$data['ident'] = $line['flight']; // ident
714
+			$data['altitude'] = $line['altitude']; // altitude
715
+			$data['speed'] = $line['speed']; // speed
716
+			$data['heading'] = $line['track']; // heading
717
+			$data['latitude'] = $line['lat']; // lat
718
+			$data['longitude'] = $line['lon']; // long
719
+			$data['verticalrate'] = $line['vrt']; // verticale rate
720
+			$data['squawk'] = $line['squawk']; // squawk
721
+			$data['emergency'] = ''; // emergency
722
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
723
+			else $data['datetime'] = date('Y-m-d H:i:s');
724
+				$data['format_source'] = 'aircraftlistjson';
725
+				$data['id_source'] = $id_source;
726
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
727
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
728
+			$SI->add($data);
729
+			unset($data);
730
+		}
730 731
 		}
731
-	    }
732
-	    }
733
-    	    //$last_exec['aircraftlistjson'] = time();
734
-    	    $last_exec[$id]['last'] = time();
735
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
736
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
737
-	    $buffer = $Common->getData($value['host']);
738
-	    $all_data = json_decode($buffer,true);
739
-	    if (isset($all_data['planes'])) {
732
+		}
733
+			//$last_exec['aircraftlistjson'] = time();
734
+			$last_exec[$id]['last'] = time();
735
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
736
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
737
+		$buffer = $Common->getData($value['host']);
738
+		$all_data = json_decode($buffer,true);
739
+		if (isset($all_data['planes'])) {
740 740
 		$reset = 0;
741 741
 		foreach ($all_data['planes'] as $key => $line) {
742
-		    $data = array();
743
-		    $data['hex'] = $key; // hex
744
-		    $data['ident'] = $line[3]; // ident
745
-		    $data['altitude'] = $line[6]; // altitude
746
-		    $data['speed'] = $line[8]; // speed
747
-		    $data['heading'] = $line[7]; // heading
748
-		    $data['latitude'] = $line[4]; // lat
749
-		    $data['longitude'] = $line[5]; // long
750
-		    //$data['verticalrate'] = $line[]; // verticale rate
751
-		    $data['squawk'] = $line[10]; // squawk
752
-		    $data['emergency'] = ''; // emergency
753
-		    $data['registration'] = $line[2];
754
-		    $data['aircraft_icao'] = $line[0];
755
-		    $deparr = explode('-',$line[1]);
756
-		    if (count($deparr) == 2) {
742
+			$data = array();
743
+			$data['hex'] = $key; // hex
744
+			$data['ident'] = $line[3]; // ident
745
+			$data['altitude'] = $line[6]; // altitude
746
+			$data['speed'] = $line[8]; // speed
747
+			$data['heading'] = $line[7]; // heading
748
+			$data['latitude'] = $line[4]; // lat
749
+			$data['longitude'] = $line[5]; // long
750
+			//$data['verticalrate'] = $line[]; // verticale rate
751
+			$data['squawk'] = $line[10]; // squawk
752
+			$data['emergency'] = ''; // emergency
753
+			$data['registration'] = $line[2];
754
+			$data['aircraft_icao'] = $line[0];
755
+			$deparr = explode('-',$line[1]);
756
+			if (count($deparr) == 2) {
757 757
 			$data['departure_airport_icao'] = $deparr[0];
758 758
 			$data['arrival_airport_icao'] = $deparr[1];
759
-		    }
760
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
761
-	    	    $data['format_source'] = 'planeupdatefaa';
762
-    		    $data['id_source'] = $id_source;
763
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
764
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
765
-		    $SI->add($data);
766
-		    unset($data);
759
+			}
760
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
761
+				$data['format_source'] = 'planeupdatefaa';
762
+				$data['id_source'] = $id_source;
763
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
764
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
765
+			$SI->add($data);
766
+			unset($data);
767 767
 		}
768
-	    }
769
-    	    //$last_exec['planeupdatefaa'] = time();
770
-    	    $last_exec[$id]['last'] = time();
771
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
772
-	    $buffer = $Common->getData($value['host']);
773
-	    $all_data = json_decode($buffer,true);
774
-	    if (isset($all_data['states'])) {
768
+		}
769
+			//$last_exec['planeupdatefaa'] = time();
770
+			$last_exec[$id]['last'] = time();
771
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
772
+		$buffer = $Common->getData($value['host']);
773
+		$all_data = json_decode($buffer,true);
774
+		if (isset($all_data['states'])) {
775 775
 		$reset = 0;
776 776
 		foreach ($all_data['states'] as $key => $line) {
777
-		    $data = array();
778
-		    $data['hex'] = $line[0]; // hex
779
-		    $data['ident'] = trim($line[1]); // ident
780
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
781
-		    $data['speed'] = round($line[9]*1.94384); // speed
782
-		    $data['heading'] = round($line[10]); // heading
783
-		    $data['latitude'] = $line[6]; // lat
784
-		    $data['longitude'] = $line[5]; // long
785
-		    $data['verticalrate'] = $line[11]; // verticale rate
786
-		    //$data['squawk'] = $line[10]; // squawk
787
-		    //$data['emergency'] = ''; // emergency
788
-		    //$data['registration'] = $line[2];
789
-		    //$data['aircraft_icao'] = $line[0];
790
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
791
-	    	    $data['format_source'] = 'opensky';
792
-    		    $data['id_source'] = $id_source;
793
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
794
-		    $SI->add($data);
795
-		    unset($data);
777
+			$data = array();
778
+			$data['hex'] = $line[0]; // hex
779
+			$data['ident'] = trim($line[1]); // ident
780
+			$data['altitude'] = round($line[7]*3.28084); // altitude
781
+			$data['speed'] = round($line[9]*1.94384); // speed
782
+			$data['heading'] = round($line[10]); // heading
783
+			$data['latitude'] = $line[6]; // lat
784
+			$data['longitude'] = $line[5]; // long
785
+			$data['verticalrate'] = $line[11]; // verticale rate
786
+			//$data['squawk'] = $line[10]; // squawk
787
+			//$data['emergency'] = ''; // emergency
788
+			//$data['registration'] = $line[2];
789
+			//$data['aircraft_icao'] = $line[0];
790
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
791
+				$data['format_source'] = 'opensky';
792
+				$data['id_source'] = $id_source;
793
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
794
+			$SI->add($data);
795
+			unset($data);
796
+		}
796 797
 		}
797
-	    }
798
-    	    //$last_exec['planeupdatefaa'] = time();
799
-    	    $last_exec[$id]['last'] = time();
800
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
801
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
802
-	    //$buffer = $Common->getData($hosts[$id]);
803
-	    $buffer = $Common->getData($value['host']);
804
-	    $all_data = json_decode($buffer,true);
805
-	    if (!empty($all_data)) $reset = 0;
806
-	    foreach ($all_data as $key => $line) {
798
+			//$last_exec['planeupdatefaa'] = time();
799
+			$last_exec[$id]['last'] = time();
800
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
801
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
802
+		//$buffer = $Common->getData($hosts[$id]);
803
+		$buffer = $Common->getData($value['host']);
804
+		$all_data = json_decode($buffer,true);
805
+		if (!empty($all_data)) $reset = 0;
806
+		foreach ($all_data as $key => $line) {
807 807
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
808
-		    $data = array();
809
-		    $data['hex'] = $line[0];
810
-		    $data['ident'] = $line[16]; //$line[13]
811
-	    	    $data['altitude'] = $line[4]; // altitude
812
-	    	    $data['speed'] = $line[5]; // speed
813
-	    	    $data['heading'] = $line[3]; // heading
814
-	    	    $data['latitude'] = $line[1]; // lat
815
-	    	    $data['longitude'] = $line[2]; // long
816
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
817
-	    	    $data['squawk'] = $line[6]; // squawk
818
-	    	    $data['aircraft_icao'] = $line[8];
819
-	    	    $data['registration'] = $line[9];
820
-		    $data['departure_airport_iata'] = $line[11];
821
-		    $data['arrival_airport_iata'] = $line[12];
822
-	    	    $data['emergency'] = ''; // emergency
823
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
824
-	    	    $data['format_source'] = 'fr24json';
825
-    		    $data['id_source'] = $id_source;
826
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
827
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
828
-		    $SI->add($data);
829
-		    unset($data);
808
+			$data = array();
809
+			$data['hex'] = $line[0];
810
+			$data['ident'] = $line[16]; //$line[13]
811
+				$data['altitude'] = $line[4]; // altitude
812
+				$data['speed'] = $line[5]; // speed
813
+				$data['heading'] = $line[3]; // heading
814
+				$data['latitude'] = $line[1]; // lat
815
+				$data['longitude'] = $line[2]; // long
816
+				$data['verticalrate'] = $line[15]; // verticale rate
817
+				$data['squawk'] = $line[6]; // squawk
818
+				$data['aircraft_icao'] = $line[8];
819
+				$data['registration'] = $line[9];
820
+			$data['departure_airport_iata'] = $line[11];
821
+			$data['arrival_airport_iata'] = $line[12];
822
+				$data['emergency'] = ''; // emergency
823
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
824
+				$data['format_source'] = 'fr24json';
825
+				$data['id_source'] = $id_source;
826
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
827
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
828
+			$SI->add($data);
829
+			unset($data);
830
+		}
830 831
 		}
831
-	    }
832
-    	    //$last_exec['fr24json'] = time();
833
-    	    $last_exec[$id]['last'] = time();
834
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
835
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
836
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
837
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
838
-	    //echo $buffer;
839
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
840
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
841
-	    $all_data = json_decode($buffer,true);
842
-	    if (json_last_error() != JSON_ERROR_NONE) {
832
+			//$last_exec['fr24json'] = time();
833
+			$last_exec[$id]['last'] = time();
834
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
835
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
836
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
837
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
838
+		//echo $buffer;
839
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
840
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
841
+		$all_data = json_decode($buffer,true);
842
+		if (json_last_error() != JSON_ERROR_NONE) {
843 843
 		die(json_last_error_msg());
844
-	    }
845
-	    if (isset($all_data['mrkrs'])) {
844
+		}
845
+		if (isset($all_data['mrkrs'])) {
846 846
 		$reset = 0;
847 847
 		foreach ($all_data['mrkrs'] as $key => $line) {
848
-		    if (isset($line['inf'])) {
848
+			if (isset($line['inf'])) {
849 849
 			$data = array();
850 850
 			$data['hex'] = $line['inf']['ia'];
851 851
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
852
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
853
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
854
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
855
-	    		$data['latitude'] = $line['pt'][0]; // lat
856
-	    		$data['longitude'] = $line['pt'][1]; // long
857
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
858
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
859
-	    		//$data['aircraft_icao'] = $line[8];
860
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
852
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
853
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
854
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
855
+				$data['latitude'] = $line['pt'][0]; // lat
856
+				$data['longitude'] = $line['pt'][1]; // long
857
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
858
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
859
+				//$data['aircraft_icao'] = $line[8];
860
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
861 861
 			//$data['departure_airport_iata'] = $line[11];
862 862
 			//$data['arrival_airport_iata'] = $line[12];
863
-	    		//$data['emergency'] = ''; // emergency
863
+				//$data['emergency'] = ''; // emergency
864 864
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
865
-	    		$data['format_source'] = 'radarvirtueljson';
866
-    			$data['id_source'] = $id_source;
865
+				$data['format_source'] = 'radarvirtueljson';
866
+				$data['id_source'] = $id_source;
867 867
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
868 868
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
869 869
 			$SI->add($data);
870 870
 			unset($data);
871
-		    }
871
+			}
872
+		}
872 873
 		}
873
-	    }
874
-    	    //$last_exec['radarvirtueljson'] = time();
875
-    	    $last_exec[$id]['last'] = time();
876
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
877
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
878
-	    //$buffer = $Common->getData($hosts[$id]);
879
-	    $buffer = $Common->getData($value['host'].'?'.time());
880
-	    $all_data = json_decode(utf8_encode($buffer),true);
874
+			//$last_exec['radarvirtueljson'] = time();
875
+			$last_exec[$id]['last'] = time();
876
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
877
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
878
+		//$buffer = $Common->getData($hosts[$id]);
879
+		$buffer = $Common->getData($value['host'].'?'.time());
880
+		$all_data = json_decode(utf8_encode($buffer),true);
881 881
 	    
882
-	    if (isset($all_data['pireps'])) {
882
+		if (isset($all_data['pireps'])) {
883 883
 		$reset = 0;
884
-	        foreach ($all_data['pireps'] as $line) {
885
-		    $data = array();
886
-		    $data['id'] = $line['id'];
887
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
888
-		    $data['ident'] = $line['callsign']; // ident
889
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
890
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
891
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
892
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
893
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
894
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
895
-		    $data['latitude'] = $line['lat']; // lat
896
-		    $data['longitude'] = $line['lon']; // long
897
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
898
-		    //$data['squawk'] = $line['squawk']; // squawk
899
-		    //$data['emergency'] = ''; // emergency
900
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
901
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
902
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
903
-		    //$data['arrival_airport_time'] = $line['arrtime'];
904
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
905
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
906
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
907
-		    else $data['info'] = '';
908
-		    $data['format_source'] = 'pireps';
909
-    		    $data['id_source'] = $id_source;
910
-		    $data['datetime'] = date('Y-m-d H:i:s');
911
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
912
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
913
-		    if ($line['icon'] == 'plane') {
884
+			foreach ($all_data['pireps'] as $line) {
885
+			$data = array();
886
+			$data['id'] = $line['id'];
887
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
888
+			$data['ident'] = $line['callsign']; // ident
889
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
890
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
891
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
892
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
893
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
894
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
895
+			$data['latitude'] = $line['lat']; // lat
896
+			$data['longitude'] = $line['lon']; // long
897
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
898
+			//$data['squawk'] = $line['squawk']; // squawk
899
+			//$data['emergency'] = ''; // emergency
900
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
901
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
902
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
903
+			//$data['arrival_airport_time'] = $line['arrtime'];
904
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
905
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
906
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
907
+			else $data['info'] = '';
908
+			$data['format_source'] = 'pireps';
909
+				$data['id_source'] = $id_source;
910
+			$data['datetime'] = date('Y-m-d H:i:s');
911
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
912
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
913
+			if ($line['icon'] == 'plane') {
914 914
 			$SI->add($data);
915
-		    //    print_r($data);
916
-    		    } elseif ($line['icon'] == 'ct') {
915
+			//    print_r($data);
916
+				} elseif ($line['icon'] == 'ct') {
917 917
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
918 918
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
919 919
 			$typec = substr($data['ident'],-3);
@@ -928,199 +928,199 @@  discard block
 block discarded – undo
928 928
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
929 929
 			else $data['type'] = 'Observer';
930 930
 			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']);
931
-		    }
932
-		    unset($data);
931
+			}
932
+			unset($data);
933
+		}
933 934
 		}
934
-	    }
935
-    	    //$last_exec['pirepsjson'] = time();
936
-    	    $last_exec[$id]['last'] = time();
937
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
938
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
939
-	    //$buffer = $Common->getData($hosts[$id]);
940
-	    if ($globalDebug) echo 'Get Data...'."\n";
941
-	    $buffer = $Common->getData($value['host']);
942
-	    $all_data = json_decode($buffer,true);
943
-	    if ($buffer != '' && is_array($all_data)) {
935
+			//$last_exec['pirepsjson'] = time();
936
+			$last_exec[$id]['last'] = time();
937
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
938
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
939
+		//$buffer = $Common->getData($hosts[$id]);
940
+		if ($globalDebug) echo 'Get Data...'."\n";
941
+		$buffer = $Common->getData($value['host']);
942
+		$all_data = json_decode($buffer,true);
943
+		if ($buffer != '' && is_array($all_data)) {
944 944
 		$reset = 0;
945 945
 		foreach ($all_data as $line) {
946
-	    	    $data = array();
947
-	    	    //$data['id'] = $line['id']; // id not usable
948
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
949
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
950
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
951
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
952
-	    	    $data['ident'] = $line['flightnum']; // ident
953
-	    	    $data['altitude'] = $line['alt']; // altitude
954
-	    	    $data['speed'] = $line['gs']; // speed
955
-	    	    $data['heading'] = $line['heading']; // heading
956
-	    	    $data['latitude'] = $line['lat']; // lat
957
-	    	    $data['longitude'] = $line['lng']; // long
958
-	    	    $data['verticalrate'] = ''; // verticale rate
959
-	    	    $data['squawk'] = ''; // squawk
960
-	    	    $data['emergency'] = ''; // emergency
961
-	    	    //$data['datetime'] = $line['lastupdate'];
962
-	    	    $data['last_update'] = $line['lastupdate'];
963
-		    $data['datetime'] = date('Y-m-d H:i:s');
964
-	    	    $data['departure_airport_icao'] = $line['depicao'];
965
-	    	    $data['departure_airport_time'] = $line['deptime'];
966
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
967
-    		    $data['arrival_airport_time'] = $line['arrtime'];
968
-    		    $data['registration'] = $line['aircraft'];
969
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
970
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
971
-		    if (isset($line['aircraftname'])) {
946
+				$data = array();
947
+				//$data['id'] = $line['id']; // id not usable
948
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
949
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
950
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
951
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
952
+				$data['ident'] = $line['flightnum']; // ident
953
+				$data['altitude'] = $line['alt']; // altitude
954
+				$data['speed'] = $line['gs']; // speed
955
+				$data['heading'] = $line['heading']; // heading
956
+				$data['latitude'] = $line['lat']; // lat
957
+				$data['longitude'] = $line['lng']; // long
958
+				$data['verticalrate'] = ''; // verticale rate
959
+				$data['squawk'] = ''; // squawk
960
+				$data['emergency'] = ''; // emergency
961
+				//$data['datetime'] = $line['lastupdate'];
962
+				$data['last_update'] = $line['lastupdate'];
963
+			$data['datetime'] = date('Y-m-d H:i:s');
964
+				$data['departure_airport_icao'] = $line['depicao'];
965
+				$data['departure_airport_time'] = $line['deptime'];
966
+				$data['arrival_airport_icao'] = $line['arricao'];
967
+				$data['arrival_airport_time'] = $line['arrtime'];
968
+				$data['registration'] = $line['aircraft'];
969
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
970
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
971
+			if (isset($line['aircraftname'])) {
972 972
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
973 973
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
974
-	    		$aircraft_data = explode('-',$line['aircraftname']);
975
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
976
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
977
-	    		else {
978
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
979
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
980
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
981
-	    		}
982
-	    	    }
983
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
984
-    		    $data['id_source'] = $id_source;
985
-	    	    $data['format_source'] = 'phpvmacars';
986
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
987
-		    $SI->add($data);
988
-		    unset($data);
974
+				$aircraft_data = explode('-',$line['aircraftname']);
975
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
976
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
977
+				else {
978
+					$aircraft_data = explode(' ',$line['aircraftname']);
979
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
980
+					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
981
+				}
982
+				}
983
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
984
+				$data['id_source'] = $id_source;
985
+				$data['format_source'] = 'phpvmacars';
986
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
987
+			$SI->add($data);
988
+			unset($data);
989 989
 		}
990 990
 		if ($globalDebug) echo 'No more data...'."\n";
991 991
 		unset($buffer);
992 992
 		unset($all_data);
993
-	    }
994
-    	    //$last_exec['phpvmacars'] = time();
995
-    	    $last_exec[$id]['last'] = time();
996
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
997
-	    //$buffer = $Common->getData($hosts[$id]);
998
-	    if ($globalDebug) echo 'Get Data...'."\n";
999
-	    $buffer = $Common->getData($value['host']);
1000
-	    $all_data = json_decode($buffer,true);
1001
-	    if ($buffer != '' && is_array($all_data)) {
993
+		}
994
+			//$last_exec['phpvmacars'] = time();
995
+			$last_exec[$id]['last'] = time();
996
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
997
+		//$buffer = $Common->getData($hosts[$id]);
998
+		if ($globalDebug) echo 'Get Data...'."\n";
999
+		$buffer = $Common->getData($value['host']);
1000
+		$all_data = json_decode($buffer,true);
1001
+		if ($buffer != '' && is_array($all_data)) {
1002 1002
 		$reset = 0;
1003 1003
 		foreach ($all_data as $line) {
1004
-	    	    $data = array();
1005
-	    	    //$data['id'] = $line['id']; // id not usable
1006
-	    	    $data['id'] = trim($line['flight_id']);
1007
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1008
-	    	    $data['pilot_name'] = $line['pilot_name'];
1009
-	    	    $data['pilot_id'] = $line['pilot_id'];
1010
-	    	    $data['ident'] = trim($line['callsign']); // ident
1011
-	    	    $data['altitude'] = $line['altitude']; // altitude
1012
-	    	    $data['speed'] = $line['gs']; // speed
1013
-	    	    $data['heading'] = $line['heading']; // heading
1014
-	    	    $data['latitude'] = $line['latitude']; // lat
1015
-	    	    $data['longitude'] = $line['longitude']; // long
1016
-	    	    $data['verticalrate'] = ''; // verticale rate
1017
-	    	    $data['squawk'] = ''; // squawk
1018
-	    	    $data['emergency'] = ''; // emergency
1019
-	    	    //$data['datetime'] = $line['lastupdate'];
1020
-	    	    $data['last_update'] = $line['last_update'];
1021
-		    $data['datetime'] = date('Y-m-d H:i:s');
1022
-	    	    $data['departure_airport_icao'] = $line['departure'];
1023
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
1024
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
1025
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
1026
-    		    //$data['registration'] = $line['aircraft'];
1027
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1028
-	    	    $data['aircraft_icao'] = $line['plane_type'];
1029
-    		    $data['id_source'] = $id_source;
1030
-	    	    $data['format_source'] = 'vam';
1031
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1032
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1033
-		    $SI->add($data);
1034
-		    unset($data);
1004
+				$data = array();
1005
+				//$data['id'] = $line['id']; // id not usable
1006
+				$data['id'] = trim($line['flight_id']);
1007
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1008
+				$data['pilot_name'] = $line['pilot_name'];
1009
+				$data['pilot_id'] = $line['pilot_id'];
1010
+				$data['ident'] = trim($line['callsign']); // ident
1011
+				$data['altitude'] = $line['altitude']; // altitude
1012
+				$data['speed'] = $line['gs']; // speed
1013
+				$data['heading'] = $line['heading']; // heading
1014
+				$data['latitude'] = $line['latitude']; // lat
1015
+				$data['longitude'] = $line['longitude']; // long
1016
+				$data['verticalrate'] = ''; // verticale rate
1017
+				$data['squawk'] = ''; // squawk
1018
+				$data['emergency'] = ''; // emergency
1019
+				//$data['datetime'] = $line['lastupdate'];
1020
+				$data['last_update'] = $line['last_update'];
1021
+			$data['datetime'] = date('Y-m-d H:i:s');
1022
+				$data['departure_airport_icao'] = $line['departure'];
1023
+				//$data['departure_airport_time'] = $line['departure_time'];
1024
+				$data['arrival_airport_icao'] = $line['arrival'];
1025
+				//$data['arrival_airport_time'] = $line['arrival_time'];
1026
+				//$data['registration'] = $line['aircraft'];
1027
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1028
+				$data['aircraft_icao'] = $line['plane_type'];
1029
+				$data['id_source'] = $id_source;
1030
+				$data['format_source'] = 'vam';
1031
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1032
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1033
+			$SI->add($data);
1034
+			unset($data);
1035 1035
 		}
1036 1036
 		if ($globalDebug) echo 'No more data...'."\n";
1037 1037
 		unset($buffer);
1038 1038
 		unset($all_data);
1039
-	    }
1040
-    	    //$last_exec['phpvmacars'] = time();
1041
-    	    $last_exec[$id]['last'] = time();
1039
+		}
1040
+			//$last_exec['phpvmacars'] = time();
1041
+			$last_exec[$id]['last'] = time();
1042 1042
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
1043 1043
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') {
1044
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1045
-    	    //$last_exec[$id]['last'] = time();
1044
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1045
+			//$last_exec[$id]['last'] = time();
1046 1046
 
1047
-	    //$read = array( $sockets[$id] );
1048
-	    $read = $sockets;
1049
-	    $write = NULL;
1050
-	    $e = NULL;
1051
-	    $n = socket_select($read, $write, $e, $timeout);
1052
-	    if ($e != NULL) var_dump($e);
1053
-	    if ($n > 0) {
1047
+		//$read = array( $sockets[$id] );
1048
+		$read = $sockets;
1049
+		$write = NULL;
1050
+		$e = NULL;
1051
+		$n = socket_select($read, $write, $e, $timeout);
1052
+		if ($e != NULL) var_dump($e);
1053
+		if ($n > 0) {
1054 1054
 		$reset = 0;
1055 1055
 		foreach ($read as $nb => $r) {
1056
-		    //$value = $formats[$nb];
1057
-		    $format = $globalSources[$nb]['format'];
1058
-		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1056
+			//$value = $formats[$nb];
1057
+			$format = $globalSources[$nb]['format'];
1058
+			if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1059 1059
 			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1060
-		    } elseif ($format == 'vrstcp') {
1060
+			} elseif ($format == 'vrstcp') {
1061 1061
 			$buffer = @socket_read($r, 6000);
1062
-		    } else {
1062
+			} else {
1063 1063
 			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1064
-		    }
1065
-		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1066
-		    //echo $buffer."\n";
1067
-		    // lets play nice and handle signals such as ctrl-c/kill properly
1068
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1069
-		    $error = false;
1070
-		    //$SI::del();
1071
-		    if ($format == 'vrstcp') {
1064
+			}
1065
+			//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1066
+			//echo $buffer."\n";
1067
+			// lets play nice and handle signals such as ctrl-c/kill properly
1068
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1069
+			$error = false;
1070
+			//$SI::del();
1071
+			if ($format == 'vrstcp') {
1072 1072
 			$buffer = explode('},{',$buffer);
1073
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1074
-		    // SBS format is CSV format
1075
-		    if ($buffer !== FALSE && $buffer != '') {
1073
+			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1074
+			// SBS format is CSV format
1075
+			if ($buffer !== FALSE && $buffer != '') {
1076 1076
 			$tt[$format] = 0;
1077 1077
 			if ($format == 'acarssbs3') {
1078
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1079
-			    $ACARS->add(trim($buffer));
1080
-			    $ACARS->deleteLiveAcarsData();
1078
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1079
+				$ACARS->add(trim($buffer));
1080
+				$ACARS->deleteLiveAcarsData();
1081 1081
 			} elseif ($format == 'raw') {
1082
-			    // AVR format
1083
-			    $data = $SBS->parse($buffer);
1084
-			    if (is_array($data)) {
1082
+				// AVR format
1083
+				$data = $SBS->parse($buffer);
1084
+				if (is_array($data)) {
1085 1085
 				$data['datetime'] = date('Y-m-d H:i:s');
1086 1086
 				$data['format_source'] = 'raw';
1087 1087
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1088 1088
 				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1089 1089
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1090 1090
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1091
-			    }
1091
+				}
1092 1092
 			} elseif ($format == 'ais') {
1093
-			    $ais_data = $AIS->parse_line(trim($buffer));
1094
-			    $data = array();
1095
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1096
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1097
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1098
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1099
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1100
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1101
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1102
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1103
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1104
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1105
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1106
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1107
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1108
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1109
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1110
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1093
+				$ais_data = $AIS->parse_line(trim($buffer));
1094
+				$data = array();
1095
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1096
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1097
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1098
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1099
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1100
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1101
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1102
+				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1103
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1104
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1105
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1106
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1107
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1108
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1109
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1110
+				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1111 1111
 
1112
-			    if (isset($ais_data['timestamp'])) {
1112
+				if (isset($ais_data['timestamp'])) {
1113 1113
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1114
-			    } else {
1114
+				} else {
1115 1115
 				$data['datetime'] = date('Y-m-d H:i:s');
1116
-			    }
1117
-			    $data['format_source'] = 'aisnmea';
1118
-    			    $data['id_source'] = $id_source;
1119
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1120
-			    unset($data);
1121
-                        } elseif ($format == 'flightgearsp') {
1122
-                    	    //echo $buffer."\n";
1123
-                    	    if (strlen($buffer) > 5) {
1116
+				}
1117
+				$data['format_source'] = 'aisnmea';
1118
+					$data['id_source'] = $id_source;
1119
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1120
+				unset($data);
1121
+						} elseif ($format == 'flightgearsp') {
1122
+							//echo $buffer."\n";
1123
+							if (strlen($buffer) > 5) {
1124 1124
 				$line = explode(',',$buffer);
1125 1125
 				$data = array();
1126 1126
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1137,38 +1137,38 @@  discard block
 block discarded – undo
1137 1137
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1138 1138
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1139 1139
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1140
-			    }
1141
-                        } elseif ($format == 'acars') {
1142
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1143
-			    $ACARS->add(trim($buffer));
1144
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1145
-			    $ACARS->deleteLiveAcarsData();
1140
+				}
1141
+						} elseif ($format == 'acars') {
1142
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1143
+				$ACARS->add(trim($buffer));
1144
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1145
+				$ACARS->deleteLiveAcarsData();
1146 1146
 			} elseif ($format == 'flightgearmp') {
1147
-			    if (substr($buffer,0,1) != '#') {
1147
+				if (substr($buffer,0,1) != '#') {
1148 1148
 				$data = array();
1149 1149
 				//echo $buffer."\n";
1150 1150
 				$line = explode(' ',$buffer);
1151 1151
 				if (count($line) == 11) {
1152
-				    $userserver = explode('@',$line[0]);
1153
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1154
-				    $data['ident'] = $userserver[0];
1155
-				    $data['registration'] = $userserver[0];
1156
-				    $data['latitude'] = $line[4];
1157
-				    $data['longitude'] = $line[5];
1158
-				    $data['altitude'] = $line[6];
1159
-				    $data['datetime'] = date('Y-m-d H:i:s');
1160
-				    $aircraft_type = $line[10];
1161
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1162
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1163
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1164
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1152
+					$userserver = explode('@',$line[0]);
1153
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1154
+					$data['ident'] = $userserver[0];
1155
+					$data['registration'] = $userserver[0];
1156
+					$data['latitude'] = $line[4];
1157
+					$data['longitude'] = $line[5];
1158
+					$data['altitude'] = $line[6];
1159
+					$data['datetime'] = date('Y-m-d H:i:s');
1160
+					$aircraft_type = $line[10];
1161
+					$aircraft_type = preg_split(':/:',$aircraft_type);
1162
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1163
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1164
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1165
+				}
1165 1166
 				}
1166
-			    }
1167 1167
 			} elseif ($format == 'beast') {
1168
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1169
-			    die;
1168
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1169
+				die;
1170 1170
 			} elseif ($format == 'vrstcp') {
1171
-			    foreach($buffer as $all_data) {
1171
+				foreach($buffer as $all_data) {
1172 1172
 				$line = json_decode('{'.$all_data.'}',true);
1173 1173
 				$data = array();
1174 1174
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1188,113 +1188,113 @@  discard block
 block discarded – undo
1188 1188
 				*/
1189 1189
 				$data['datetime'] = date('Y-m-d H:i:s');
1190 1190
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1191
-		    		$data['format_source'] = 'vrstcp';
1191
+					$data['format_source'] = 'vrstcp';
1192 1192
 				$data['id_source'] = $id_source;
1193 1193
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1194 1194
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1195 1195
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1196 1196
 				unset($data);
1197
-			    }
1197
+				}
1198 1198
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1199
-			    $line = explode("\t", $buffer);
1200
-			    for($k = 0; $k < count($line); $k=$k+2) {
1199
+				$line = explode("\t", $buffer);
1200
+				for($k = 0; $k < count($line); $k=$k+2) {
1201 1201
 				$key = $line[$k];
1202
-			        $lined[$key] = $line[$k+1];
1203
-			    }
1204
-    			    if (count($lined) > 3) {
1205
-    				$data['hex'] = $lined['hexid'];
1206
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1207
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1208
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1209
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1210
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1211
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1212
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1213
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1214
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1215
-    				$data['id_source'] = $id_source;
1216
-    				$data['format_source'] = 'tsv';
1217
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1218
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1202
+					$lined[$key] = $line[$k+1];
1203
+				}
1204
+					if (count($lined) > 3) {
1205
+					$data['hex'] = $lined['hexid'];
1206
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1207
+					$data['datetime'] = date('Y-m-d H:i:s');;
1208
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1209
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1210
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1211
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1212
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1213
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1214
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1215
+					$data['id_source'] = $id_source;
1216
+					$data['format_source'] = 'tsv';
1217
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1218
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1219 1219
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1220
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1221
-    				unset($lined);
1222
-    				unset($data);
1223
-    			    } else $error = true;
1220
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1221
+					unset($lined);
1222
+					unset($data);
1223
+					} else $error = true;
1224 1224
 			} elseif ($format == 'aprs' && $use_aprs) {
1225
-			    if ($aprs_connect == 0) {
1225
+				if ($aprs_connect == 0) {
1226 1226
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1227 1227
 				$aprs_connect = 1;
1228
-			    }
1228
+				}
1229 1229
 			    
1230
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1230
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1231 1231
 				$aprs_last_tx = time();
1232 1232
 				$data_aprs = "# Keep alive";
1233 1233
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1234
-			    }
1234
+				}
1235 1235
 			    
1236
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1237
-			    //echo 'APRS data : '.$buffer."\n";
1238
-			    $buffer = str_replace('APRS <- ','',$buffer);
1239
-			    $buffer = str_replace('APRS -> ','',$buffer);
1240
-			    //echo $buffer."\n";
1241
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1236
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1237
+				//echo 'APRS data : '.$buffer."\n";
1238
+				$buffer = str_replace('APRS <- ','',$buffer);
1239
+				$buffer = str_replace('APRS -> ','',$buffer);
1240
+				//echo $buffer."\n";
1241
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1242 1242
 				$line = $APRS->parse($buffer);
1243 1243
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1244 1244
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
1245
-				    $aprs_last_tx = time();
1246
-				    $data = array();
1247
-				    //print_r($line);
1248
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1249
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1250
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1251
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1252
-				    if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1253
-				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1254
-				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1255
-				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1256
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1257
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1258
-				    //$data['datetime'] = date('Y-m-d H:i:s');
1259
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1260
-				    $data['latitude'] = $line['latitude'];
1261
-				    $data['longitude'] = $line['longitude'];
1262
-				    //$data['verticalrate'] = $line[16];
1263
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1264
-				    else $data['speed'] = 0;
1265
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1266
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1267
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1268
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
1269
-				    //else $data['heading'] = 0;
1270
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1271
-				    if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1272
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1273
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1274
-    				    $data['id_source'] = $id_source;
1275
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1276
-				    else $data['format_source'] = 'aprs';
1277
-				    $data['source_name'] = $line['source'];
1278
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1279
-				    else $data['source_type'] = 'flarm';
1280
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1281
-				    $currentdate = date('Y-m-d H:i:s');
1282
-				    $aprsdate = strtotime($data['datetime']);
1283
-				    // Accept data if time <= system time + 20s
1284
-				    //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'])))) {
1285
-				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1245
+					$aprs_last_tx = time();
1246
+					$data = array();
1247
+					//print_r($line);
1248
+					if (isset($line['address'])) $data['hex'] = $line['address'];
1249
+					if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1250
+					if (isset($line['imo'])) $data['imo'] = $line['imo'];
1251
+					if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1252
+					if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1253
+					if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1254
+					if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1255
+					if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1256
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1257
+					else $data['datetime'] = date('Y-m-d H:i:s');
1258
+					//$data['datetime'] = date('Y-m-d H:i:s');
1259
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
1260
+					$data['latitude'] = $line['latitude'];
1261
+					$data['longitude'] = $line['longitude'];
1262
+					//$data['verticalrate'] = $line[16];
1263
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
1264
+					else $data['speed'] = 0;
1265
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1266
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
1267
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1268
+					if (isset($line['heading'])) $data['heading'] = $line['heading'];
1269
+					//else $data['heading'] = 0;
1270
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1271
+					if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1272
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1273
+					elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1274
+						$data['id_source'] = $id_source;
1275
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1276
+					else $data['format_source'] = 'aprs';
1277
+					$data['source_name'] = $line['source'];
1278
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1279
+					else $data['source_type'] = 'flarm';
1280
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1281
+					$currentdate = date('Y-m-d H:i:s');
1282
+					$aprsdate = strtotime($data['datetime']);
1283
+					// Accept data if time <= system time + 20s
1284
+					//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'])))) {
1285
+					if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1286 1286
 					$send = $SI->add($data);
1287
-				    } elseif ($data['source_type'] == 'ais') {
1287
+					} elseif ($data['source_type'] == 'ais') {
1288 1288
 					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
1289
-				    } elseif (isset($line['stealth'])) {
1289
+					} elseif (isset($line['stealth'])) {
1290 1290
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1291 1291
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1292
-				    //} 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')) {
1293
-				    } 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') {
1292
+					//} 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')) {
1293
+					} 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') {
1294 1294
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1295 1295
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1296
-				    }
1297
-				    unset($data);
1296
+					}
1297
+					unset($data);
1298 1298
 				} 
1299 1299
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1300 1300
 					echo '!! Weather Station not yet supported'."\n";
@@ -1304,12 +1304,12 @@  discard block
 block discarded – undo
1304 1304
 				}
1305 1305
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1306 1306
 				//elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1307
-			    }
1307
+				}
1308 1308
 			} else {
1309
-			    $line = explode(',', $buffer);
1310
-    			    if (count($line) > 20) {
1311
-    			    	$data['hex'] = $line[4];
1312
-    				/*
1309
+				$line = explode(',', $buffer);
1310
+					if (count($line) > 20) {
1311
+						$data['hex'] = $line[4];
1312
+					/*
1313 1313
     				$data['datetime'] = $line[6].' '.$line[7];
1314 1314
     					date_default_timezone_set($globalTimezone);
1315 1315
     					$datetime = new DateTime($data['datetime']);
@@ -1317,30 +1317,30 @@  discard block
 block discarded – undo
1317 1317
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1318 1318
     					date_default_timezone_set('UTC');
1319 1319
     				*/
1320
-    				// Force datetime to current UTC datetime
1321
-    				date_default_timezone_set('UTC');
1322
-    				$data['datetime'] = date('Y-m-d H:i:s');
1323
-    				$data['ident'] = trim($line[10]);
1324
-    				$data['latitude'] = $line[14];
1325
-    				$data['longitude'] = $line[15];
1326
-    				$data['verticalrate'] = $line[16];
1327
-    				$data['emergency'] = $line[20];
1328
-    				$data['speed'] = $line[12];
1329
-    				$data['squawk'] = $line[17];
1330
-    				$data['altitude'] = $line[11];
1331
-    				$data['heading'] = $line[13];
1332
-    				$data['ground'] = $line[21];
1333
-    				$data['emergency'] = $line[19];
1334
-    				$data['format_source'] = 'sbs';
1320
+					// Force datetime to current UTC datetime
1321
+					date_default_timezone_set('UTC');
1322
+					$data['datetime'] = date('Y-m-d H:i:s');
1323
+					$data['ident'] = trim($line[10]);
1324
+					$data['latitude'] = $line[14];
1325
+					$data['longitude'] = $line[15];
1326
+					$data['verticalrate'] = $line[16];
1327
+					$data['emergency'] = $line[20];
1328
+					$data['speed'] = $line[12];
1329
+					$data['squawk'] = $line[17];
1330
+					$data['altitude'] = $line[11];
1331
+					$data['heading'] = $line[13];
1332
+					$data['ground'] = $line[21];
1333
+					$data['emergency'] = $line[19];
1334
+					$data['format_source'] = 'sbs';
1335 1335
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1336
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1336
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1337 1337
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1338
-    				$data['id_source'] = $id_source;
1339
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1340
-    				else $error = true;
1341
-    				unset($data);
1342
-    			    } else $error = true;
1343
-			    if ($error) {
1338
+					$data['id_source'] = $id_source;
1339
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1340
+					else $error = true;
1341
+					unset($data);
1342
+					} else $error = true;
1343
+				if ($error) {
1344 1344
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
1345 1345
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
1346 1346
 				} else {
@@ -1356,13 +1356,13 @@  discard block
 block discarded – undo
1356 1356
 					connect_all($sourceer);
1357 1357
 					$sourceer = array();
1358 1358
 				}
1359
-			    }
1359
+				}
1360 1360
 			}
1361 1361
 			// Sleep for xxx microseconds
1362 1362
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1363
-		    } else {
1363
+			} else {
1364 1364
 			if ($format == 'flightgearmp') {
1365
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1365
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
1366 1366
 				//@socket_close($r);
1367 1367
 				sleep($globalMinFetch);
1368 1368
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1371,9 +1371,9 @@  discard block
 block discarded – undo
1371 1371
 				break;
1372 1372
 				
1373 1373
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1374
-			    if (isset($tt[$format])) $tt[$format]++;
1375
-			    else $tt[$format] = 0;
1376
-			    if ($tt[$format] > 30) {
1374
+				if (isset($tt[$format])) $tt[$format]++;
1375
+				else $tt[$format] = 0;
1376
+				if ($tt[$format] > 30) {
1377 1377
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1378 1378
 				//@socket_close($r);
1379 1379
 				sleep(2);
@@ -1384,23 +1384,23 @@  discard block
 block discarded – undo
1384 1384
 				//connect_all($globalSources);
1385 1385
 				$tt[$format]=0;
1386 1386
 				break;
1387
-			    }
1387
+				}
1388
+			}
1388 1389
 			}
1389
-		    }
1390 1390
 		}
1391
-	    } else {
1391
+		} else {
1392 1392
 		$error = socket_strerror(socket_last_error());
1393 1393
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1394 1394
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1395 1395
 			if (isset($globalDebug)) echo "Restarting...\n";
1396 1396
 			// Restart the script if possible
1397 1397
 			if (is_array($sockets)) {
1398
-			    if ($globalDebug) echo "Shutdown all sockets...";
1398
+				if ($globalDebug) echo "Shutdown all sockets...";
1399 1399
 			    
1400
-			    foreach ($sockets as $sock) {
1400
+				foreach ($sockets as $sock) {
1401 1401
 				@socket_shutdown($sock,2);
1402 1402
 				@socket_close($sock);
1403
-			    }
1403
+				}
1404 1404
 			    
1405 1405
 			}
1406 1406
 			if ($globalDebug) echo "Waiting...";
@@ -1415,13 +1415,13 @@  discard block
 block discarded – undo
1415 1415
 			if ($globalDebug) echo "Restart all connections...";
1416 1416
 			connect_all($globalSources);
1417 1417
 		}
1418
-	    }
1418
+		}
1419 1419
 	}
1420 1420
 	if ($globalDaemon === false) {
1421
-	    if ($globalDebug) echo 'Check all...'."\n";
1422
-	    $SI->checkAll();
1421
+		if ($globalDebug) echo 'Check all...'."\n";
1422
+		$SI->checkAll();
1423
+	}
1423 1424
 	}
1424
-    }
1425 1425
 }
1426 1426
 
1427 1427
 ?>
Please login to merge, or discard this patch.
Spacing   +140 added lines, -140 removed lines patch added patch discarded remove patch
@@ -45,20 +45,20 @@  discard block
 block discarded – undo
45 45
 	    die;
46 46
 	}
47 47
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
48
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
48
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
49 49
     }
50 50
 }
51 51
 
52
-$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver'));
52
+$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver'));
53 53
 //if (isset($options['s'])) $hosts = array($options['s']);
54 54
 //elseif (isset($options['source'])) $hosts = array($options['source']);
55 55
 if (isset($options['s'])) {
56 56
     $globalSources = array();
57
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
57
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']);
58 58
     else $globalSources[] = array('host' => $options['s']);
59 59
 } elseif (isset($options['source'])) {
60 60
     $globalSources = array();
61
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
61
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']);
62 62
     else $globalSources[] = array('host' => $options['source']);
63 63
 }
64 64
 if (isset($options['aprsserverhost'])) {
@@ -75,27 +75,27 @@  discard block
 block discarded – undo
75 75
 else $id_source = 1;
76 76
 if (isset($globalServer) && $globalServer) {
77 77
     if ($globalDebug) echo "Using Server Mode\n";
78
-    $SI=new SpotterServer();
78
+    $SI = new SpotterServer();
79 79
 /*
80 80
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
81 81
     $SI = new adsb2aprs();
82 82
     $SI->connect();
83 83
 */
84
-} else $SI=new SpotterImport($Connection->db);
84
+} else $SI = new SpotterImport($Connection->db);
85 85
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
86 86
 if (isset($globalMarine) && $globalMarine) {
87 87
     $AIS = new AIS();
88 88
     $MI = new MarineImport($Connection->db);
89 89
 }
90 90
 //$APRS=new APRS($Connection->db);
91
-$SBS=new SBS();
92
-$ACARS=new ACARS($Connection->db);
93
-$Common=new Common();
91
+$SBS = new SBS();
92
+$ACARS = new ACARS($Connection->db);
93
+$Common = new Common();
94 94
 date_default_timezone_set('UTC');
95 95
 //$servertz = system('date +%Z');
96 96
 // signal handler - playing nice with sockets and dump1090
97 97
 if (function_exists('pcntl_fork')) {
98
-    pcntl_signal(SIGINT,  function() {
98
+    pcntl_signal(SIGINT, function() {
99 99
         global $sockets;
100 100
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
101 101
         die("Bye!\n");
@@ -111,30 +111,30 @@  discard block
 block discarded – undo
111 111
 
112 112
 function connect_all($hosts) {
113 113
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
114
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
114
+    global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context;
115 115
     $reset++;
116 116
     if ($globalDebug) echo 'Connect to all...'."\n";
117 117
     foreach ($hosts as $id => $value) {
118 118
 	$host = $value['host'];
119 119
 	$globalSources[$id]['last_exec'] = 0;
120 120
 	// Here we check type of source(s)
121
-	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
122
-            if (preg_match('/deltadb.txt$/i',$host)) {
121
+	if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
122
+            if (preg_match('/deltadb.txt$/i', $host)) {
123 123
         	//$formats[$id] = 'deltadbtxt';
124 124
         	$globalSources[$id]['format'] = 'deltadbtxt';
125 125
         	//$last_exec['deltadbtxt'] = 0;
126 126
         	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
127
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
127
+            } else if (preg_match('/vatsim-data.txt$/i', $host)) {
128 128
         	//$formats[$id] = 'vatsimtxt';
129 129
         	$globalSources[$id]['format'] = 'vatsimtxt';
130 130
         	//$last_exec['vatsimtxt'] = 0;
131 131
         	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
132
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
132
+    	    } else if (preg_match('/aircraftlist.json$/i', $host)) {
133 133
         	//$formats[$id] = 'aircraftlistjson';
134 134
         	$globalSources[$id]['format'] = 'aircraftlistjson';
135 135
         	//$last_exec['aircraftlistjson'] = 0;
136 136
         	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
137
-    	    } else if (preg_match('/opensky/i',$host)) {
137
+    	    } else if (preg_match('/opensky/i', $host)) {
138 138
         	//$formats[$id] = 'aircraftlistjson';
139 139
         	$globalSources[$id]['format'] = 'opensky';
140 140
         	//$last_exec['aircraftlistjson'] = 0;
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
         	    exit(0);
152 152
         	}
153 153
     	    */
154
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
154
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
155 155
         	//$formats[$id] = 'planeupdatefaa';
156 156
         	$globalSources[$id]['format'] = 'planeupdatefaa';
157 157
         	//$last_exec['planeupdatefaa'] = 0;
@@ -160,26 +160,26 @@  discard block
 block discarded – undo
160 160
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
161 161
         	    exit(0);
162 162
         	}
163
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
163
+            } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) {
164 164
         	//$formats[$id] = 'phpvmacars';
165 165
         	$globalSources[$id]['format'] = 'phpvmacars';
166 166
         	//$last_exec['phpvmacars'] = 0;
167 167
         	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
168
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
168
+            } else if (preg_match('/VAM-json.php$/i', $host)) {
169 169
         	//$formats[$id] = 'phpvmacars';
170 170
         	$globalSources[$id]['format'] = 'vam';
171 171
         	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
172
-            } else if (preg_match('/whazzup/i',$host)) {
172
+            } else if (preg_match('/whazzup/i', $host)) {
173 173
         	//$formats[$id] = 'whazzup';
174 174
         	$globalSources[$id]['format'] = 'whazzup';
175 175
         	//$last_exec['whazzup'] = 0;
176 176
         	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
177
-            } else if (preg_match('/recentpireps/i',$host)) {
177
+            } else if (preg_match('/recentpireps/i', $host)) {
178 178
         	//$formats[$id] = 'pirepsjson';
179 179
         	$globalSources[$id]['format'] = 'pirepsjson';
180 180
         	//$last_exec['pirepsjson'] = 0;
181 181
         	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
182
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
182
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
183 183
         	//$formats[$id] = 'fr24json';
184 184
         	$globalSources[$id]['format'] = 'fr24json';
185 185
         	//$last_exec['fr24json'] = 0;
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
189 189
         	    exit(0);
190 190
         	}
191
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
191
+            } else if (preg_match(':myshiptracking.com/:i', $host)) {
192 192
         	//$formats[$id] = 'fr24json';
193 193
         	$globalSources[$id]['format'] = 'myshiptracking';
194 194
         	//$last_exec['fr24json'] = 0;
@@ -198,22 +198,22 @@  discard block
 block discarded – undo
198 198
         	    exit(0);
199 199
         	}
200 200
             //} else if (preg_match('/10001/',$host)) {
201
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
201
+            } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
202 202
         	//$formats[$id] = 'tsv';
203 203
         	$globalSources[$id]['format'] = 'tsv';
204 204
         	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
205 205
             }
206
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
206
+        } elseif (filter_var($host, FILTER_VALIDATE_URL)) {
207 207
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
208
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
208
+    		    $idf = fopen($globalSources[$id]['host'], 'r', false, $context);
209 209
     		    if ($idf !== false) {
210 210
     			$httpfeeds[$id] = $idf;
211 211
         		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
212 212
     		    }
213 213
     		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
214 214
     		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
215
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
216
-	    $hostport = explode(':',$host);
215
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
216
+	    $hostport = explode(':', $host);
217 217
 	    if (isset($hostport[1])) {
218 218
 		$port = $hostport[1];
219 219
 		$hostn = $hostport[0];
@@ -223,19 +223,19 @@  discard block
 block discarded – undo
223 223
 	    }
224 224
 	    $Common = new Common();
225 225
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
226
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
226
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
227 227
     	    } else {
228
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
228
+        	$s = $Common->create_socket_udp($hostn, $port, $errno, $errstr);
229 229
 	    }
230 230
 	    if ($s) {
231 231
     	        $sockets[$id] = $s;
232 232
     	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
233
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
233
+		    if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') {
234 234
 			//$formats[$id] = 'aprs';
235 235
 			$globalSources[$id]['format'] = 'aprs';
236 236
 			//$aprs_connect = 0;
237 237
 			//$use_aprs = true;
238
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
238
+		    } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
239 239
 			$globalSources[$id]['format'] = 'vrstcp';
240 240
     		    } elseif ($port == '10001') {
241 241
         		//$formats[$id] = 'tsv';
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
275 275
 else $timeout = 20;
276 276
 $errno = '';
277
-$errstr='';
277
+$errstr = '';
278 278
 
279 279
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
280 280
 /* Initiate connections to all the hosts simultaneously */
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 //connect_all($globalSources);
283 283
 
284 284
 if (isset($globalProxy) && $globalProxy) {
285
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
285
+    $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true)));
286 286
 } else {
287 287
     $context = stream_context_create(array('http' => array('timeout' => $timeout)));
288 288
 }
@@ -309,16 +309,16 @@  discard block
 block discarded – undo
309 309
 
310 310
 if ($use_aprs) {
311 311
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
312
-	$APRS=new APRS();
312
+	$APRS = new APRS();
313 313
 	$aprs_connect = 0;
314 314
 	$aprs_keep = 120;
315 315
 	$aprs_last_tx = time();
316 316
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
317
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
317
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
318 318
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
319
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
319
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
320 320
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
321
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
321
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
322 322
 	if ($aprs_full) $aprs_filter = '';
323 323
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
324 324
 	else $aprs_pass = '-1';
@@ -332,12 +332,12 @@  discard block
 block discarded – undo
332 332
 sleep(1);
333 333
 if ($globalDebug) echo "SCAN MODE \n\n";
334 334
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
335
-$endtime = time()+$globalCronEnd;
335
+$endtime = time() + $globalCronEnd;
336 336
 $i = 1;
337 337
 $tt = array();
338 338
 // Delete all ATC
339 339
 if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
340
-	$ATC=new ATC($Connection->db);
340
+	$ATC = new ATC($Connection->db);
341 341
 }
342 342
 if (!$globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
343 343
 	$ATC->deleteAll();
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 
346 346
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
347 347
 while ($i > 0) {
348
-    if (!$globalDaemon) $i = $endtime-time();
348
+    if (!$globalDaemon) $i = $endtime - time();
349 349
     // Delete old ATC
350 350
     if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
351 351
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 	}
361 361
 	if ($max != $globalMinFetch) {
362 362
 	    if ($globalDebug) echo 'Sleeping...'."\n";
363
-	    sleep($globalMinFetch-$max+2);
363
+	    sleep($globalMinFetch - $max + 2);
364 364
 	}
365 365
     }
366 366
 
@@ -373,8 +373,8 @@  discard block
 block discarded – undo
373 373
 	    //$buffer = $Common->getData($hosts[$id]);
374 374
 	    $buffer = $Common->getData($value['host']);
375 375
 	    if ($buffer != '') $reset = 0;
376
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
377
-	    $buffer = explode('\n',$buffer);
376
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
377
+	    $buffer = explode('\n', $buffer);
378 378
 	    foreach ($buffer as $line) {
379 379
     		if ($line != '' && count($line) > 7) {
380 380
     		    $line = explode(',', $line);
@@ -402,11 +402,11 @@  discard block
 block discarded – undo
402 402
     	    $last_exec[$id]['last'] = time();
403 403
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
404 404
 	    date_default_timezone_set('CET');
405
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
405
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
406 406
 	    date_default_timezone_set('UTC');
407 407
 	    if ($buffer != '') $reset = 0;
408
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
409
-	    $buffer = explode('\n',$buffer);
408
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
409
+	    $buffer = explode('\n', $buffer);
410 410
 	    foreach ($buffer as $line) {
411 411
 		if ($line != '') {
412 412
 		    echo "'".$line."'\n";
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
425 425
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
426 426
 		    if (isset($ais_data['timestamp'])) {
427
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
427
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
428 428
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
429 429
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
430 430
 			    $add = true;
@@ -447,12 +447,12 @@  discard block
 block discarded – undo
447 447
 	    $w = $e = null;
448 448
 	    
449 449
 	    if (isset($arr[$id])) {
450
-		$nn = stream_select($arr,$w,$e,$timeout);
450
+		$nn = stream_select($arr, $w, $e, $timeout);
451 451
 		if ($nn > 0) {
452 452
 		    foreach ($httpfeeds as $feed) {
453
-			$buffer = stream_get_line($feed,2000,"\n");
454
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
455
-			$buffer = explode('\n',$buffer);
453
+			$buffer = stream_get_line($feed, 2000, "\n");
454
+			$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
455
+			$buffer = explode('\n', $buffer);
456 456
 			foreach ($buffer as $line) {
457 457
 			    if ($line != '') {
458 458
 				$ais_data = $AIS->parse_line(trim($line));
@@ -470,9 +470,9 @@  discard block
 block discarded – undo
470 470
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
471 471
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
472 472
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
473
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
473
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
474 474
 				if (isset($ais_data['timestamp'])) {
475
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
475
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
476 476
 				} else {
477 477
 				    $data['datetime'] = date('Y-m-d H:i:s');
478 478
 				}
@@ -498,10 +498,10 @@  discard block
 block discarded – undo
498 498
 		}
499 499
 	    }
500 500
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
501
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
501
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
502 502
 	    if ($buffer != '') {
503 503
 		//echo $buffer;
504
-		$all_data = json_decode($buffer,true);
504
+		$all_data = json_decode($buffer, true);
505 505
 		//print_r($all_data);
506 506
 		if (isset($all_data[0]['DATA'])) {
507 507
 		foreach ($all_data[0]['DATA'] as $line) {
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 			//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
517 517
 			$data['imo'] = $line['IMO'];
518 518
 			//$data['arrival_code'] = $ais_data['destination'];
519
-			$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
519
+			$data['datetime'] = date('Y-m-d H:i:s', $line['T']);
520 520
 			$data['format_source'] = 'myshiptracking';
521 521
 			$data['id_source'] = $id_source;
522 522
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -529,9 +529,9 @@  discard block
 block discarded – undo
529 529
 	    }
530 530
     	    $last_exec[$id]['last'] = time();
531 531
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
532
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
532
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
533 533
 	    if ($buffer != '') {
534
-		$all_data = json_decode($buffer,true);
534
+		$all_data = json_decode($buffer, true);
535 535
 		if (isset($all_data[0]['mmsi'])) {
536 536
 		    foreach ($all_data as $line) {
537 537
 			if ($line != '') {
@@ -559,27 +559,27 @@  discard block
 block discarded – undo
559 559
     	    $last_exec[$id]['last'] = time();
560 560
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
561 561
 	    echo 'download...';
562
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
562
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
563 563
 	    echo 'done !'."\n";
564 564
 	    if ($buffer != '') $reset = 0;
565
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
566
-	    $buffer = explode('\n',$buffer);
565
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
566
+	    $buffer = explode('\n', $buffer);
567 567
 	    foreach ($buffer as $line) {
568 568
 		if ($line != '') {
569 569
 		    $data = array();
570
-		    $data['mmsi'] = (int)substr($line,0,9);
571
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
570
+		    $data['mmsi'] = (int) substr($line, 0, 9);
571
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
572 572
 		    //$data['status'] = substr($line,21,2);
573 573
 		    //$data['type'] = substr($line,24,3);
574
-		    $data['latitude'] = substr($line,29,9);
575
-		    $data['longitude'] = substr($line,41,9);
576
-		    $data['speed'] = round(substr($line,51,5));
574
+		    $data['latitude'] = substr($line, 29, 9);
575
+		    $data['longitude'] = substr($line, 41, 9);
576
+		    $data['speed'] = round(substr($line, 51, 5));
577 577
 		    //$data['course'] = substr($line,57,5);
578
-		    $data['heading'] = round(substr($line,63,3));
578
+		    $data['heading'] = round(substr($line, 63, 3));
579 579
 		    //$data['draft'] = substr($line,67,4);
580 580
 		    //$data['length'] = substr($line,72,3);
581 581
 		    //$data['beam'] = substr($line,76,2);
582
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
582
+		    $data['ident'] = trim(utf8_encode(substr($line, 79, 20)));
583 583
 		    //$data['callsign'] = trim(substr($line,100,7);
584 584
 		    //$data['dest'] = substr($line,108,20);
585 585
 		    //$data['etaDate'] = substr($line,129,5);
@@ -598,8 +598,8 @@  discard block
 block discarded – undo
598 598
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
599 599
 	    //$buffer = $Common->getData($hosts[$id]);
600 600
 	    $buffer = $Common->getData($value['host']);
601
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
602
-	    $buffer = explode('\n',$buffer);
601
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
602
+	    $buffer = explode('\n', $buffer);
603 603
 	    $reset = 0;
604 604
 	    foreach ($buffer as $line) {
605 605
     		if ($line != '') {
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
611 611
 			$data['pilot_id'] = $line[1];
612 612
 			$data['pilot_name'] = $line[2];
613
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
613
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
614 614
 			$data['ident'] = $line[0]; // ident
615 615
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
616 616
 			$data['speed'] = $line[8]; // speed
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
626 626
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
627 627
 			//if (isset($line[37])) $data['last_update'] = $line[37];
628 628
 		        $data['departure_airport_icao'] = $line[11];
629
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
629
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
630 630
 		        $data['arrival_airport_icao'] = $line[13];
631 631
 			$data['frequency'] = $line[4];
632 632
 			$data['type'] = $line[18];
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
     			$data['id_source'] = $id_source;
636 636
 	    		//$data['arrival_airport_time'] = ;
637 637
 	    		if ($line[9] != '') {
638
-	    		    $aircraft_data = explode('/',$line[9]);
638
+	    		    $aircraft_data = explode('/', $line[9]);
639 639
 	    		    if (isset($aircraft_data[1])) {
640 640
 	    			$data['aircraft_icao'] = $aircraft_data[1];
641 641
 	    		    }
@@ -650,9 +650,9 @@  discard block
 block discarded – undo
650 650
     			if ($line[3] == 'PILOT') $SI->add($data);
651 651
 			elseif ($line[3] == 'ATC') {
652 652
 				//print_r($data);
653
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
654
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
655
-				$typec = substr($data['ident'],-3);
653
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
654
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
655
+				$typec = substr($data['ident'], -3);
656 656
 				if ($typec == 'APP') $data['type'] = 'Approach';
657 657
 				elseif ($typec == 'TWR') $data['type'] = 'Tower';
658 658
 				elseif ($typec == 'OBS') $data['type'] = 'Observer';
@@ -663,7 +663,7 @@  discard block
 block discarded – undo
663 663
 				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
664 664
 				elseif ($data['type'] == '') $data['type'] = 'Observer';
665 665
 				if (!isset($data['source_name'])) $data['source_name'] = '';
666
-				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']);
666
+				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']);
667 667
 			}
668 668
     			unset($data);
669 669
     		    }
@@ -674,9 +674,9 @@  discard block
 block discarded – undo
674 674
     	    $last_exec[$id]['last'] = time();
675 675
     	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
676 676
     	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
677
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
677
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
678 678
 	    if ($buffer != '') {
679
-	    $all_data = json_decode($buffer,true);
679
+	    $all_data = json_decode($buffer, true);
680 680
 	    if (isset($all_data['acList'])) {
681 681
 		$reset = 0;
682 682
 		foreach ($all_data['acList'] as $line) {
@@ -693,7 +693,7 @@  discard block
 block discarded – undo
693 693
 		    $data['emergency'] = ''; // emergency
694 694
 		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
695 695
 		    
696
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
696
+		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
697 697
 		    else $data['datetime'] = date('Y-m-d H:i:s');
698 698
 		    
699 699
 		    //$data['datetime'] = date('Y-m-d H:i:s');
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 		    $data['verticalrate'] = $line['vrt']; // verticale rate
720 720
 		    $data['squawk'] = $line['squawk']; // squawk
721 721
 		    $data['emergency'] = ''; // emergency
722
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
722
+		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
723 723
 		    else $data['datetime'] = date('Y-m-d H:i:s');
724 724
 	    	    $data['format_source'] = 'aircraftlistjson';
725 725
     		    $data['id_source'] = $id_source;
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
     	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
736 736
     	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
737 737
 	    $buffer = $Common->getData($value['host']);
738
-	    $all_data = json_decode($buffer,true);
738
+	    $all_data = json_decode($buffer, true);
739 739
 	    if (isset($all_data['planes'])) {
740 740
 		$reset = 0;
741 741
 		foreach ($all_data['planes'] as $key => $line) {
@@ -752,12 +752,12 @@  discard block
 block discarded – undo
752 752
 		    $data['emergency'] = ''; // emergency
753 753
 		    $data['registration'] = $line[2];
754 754
 		    $data['aircraft_icao'] = $line[0];
755
-		    $deparr = explode('-',$line[1]);
755
+		    $deparr = explode('-', $line[1]);
756 756
 		    if (count($deparr) == 2) {
757 757
 			$data['departure_airport_icao'] = $deparr[0];
758 758
 			$data['arrival_airport_icao'] = $deparr[1];
759 759
 		    }
760
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
760
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
761 761
 	    	    $data['format_source'] = 'planeupdatefaa';
762 762
     		    $data['id_source'] = $id_source;
763 763
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
     	    $last_exec[$id]['last'] = time();
771 771
     	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
772 772
 	    $buffer = $Common->getData($value['host']);
773
-	    $all_data = json_decode($buffer,true);
773
+	    $all_data = json_decode($buffer, true);
774 774
 	    if (isset($all_data['states'])) {
775 775
 		$reset = 0;
776 776
 		foreach ($all_data['states'] as $key => $line) {
@@ -787,7 +787,7 @@  discard block
 block discarded – undo
787 787
 		    //$data['emergency'] = ''; // emergency
788 788
 		    //$data['registration'] = $line[2];
789 789
 		    //$data['aircraft_icao'] = $line[0];
790
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
790
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
791 791
 	    	    $data['format_source'] = 'opensky';
792 792
     		    $data['id_source'] = $id_source;
793 793
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -801,7 +801,7 @@  discard block
 block discarded – undo
801 801
     	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
802 802
 	    //$buffer = $Common->getData($hosts[$id]);
803 803
 	    $buffer = $Common->getData($value['host']);
804
-	    $all_data = json_decode($buffer,true);
804
+	    $all_data = json_decode($buffer, true);
805 805
 	    if (!empty($all_data)) $reset = 0;
806 806
 	    foreach ($all_data as $key => $line) {
807 807
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -834,11 +834,11 @@  discard block
 block discarded – undo
834 834
     	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
835 835
     	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
836 836
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
837
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
837
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
838 838
 	    //echo $buffer;
839
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
840
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
841
-	    $all_data = json_decode($buffer,true);
839
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
840
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
841
+	    $all_data = json_decode($buffer, true);
842 842
 	    if (json_last_error() != JSON_ERROR_NONE) {
843 843
 		die(json_last_error_msg());
844 844
 	    }
@@ -861,7 +861,7 @@  discard block
 block discarded – undo
861 861
 			//$data['departure_airport_iata'] = $line[11];
862 862
 			//$data['arrival_airport_iata'] = $line[12];
863 863
 	    		//$data['emergency'] = ''; // emergency
864
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
864
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
865 865
 	    		$data['format_source'] = 'radarvirtueljson';
866 866
     			$data['id_source'] = $id_source;
867 867
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -877,14 +877,14 @@  discard block
 block discarded – undo
877 877
     	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
878 878
 	    //$buffer = $Common->getData($hosts[$id]);
879 879
 	    $buffer = $Common->getData($value['host'].'?'.time());
880
-	    $all_data = json_decode(utf8_encode($buffer),true);
880
+	    $all_data = json_decode(utf8_encode($buffer), true);
881 881
 	    
882 882
 	    if (isset($all_data['pireps'])) {
883 883
 		$reset = 0;
884 884
 	        foreach ($all_data['pireps'] as $line) {
885 885
 		    $data = array();
886 886
 		    $data['id'] = $line['id'];
887
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
887
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
888 888
 		    $data['ident'] = $line['callsign']; // ident
889 889
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
890 890
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -914,9 +914,9 @@  discard block
 block discarded – undo
914 914
 			$SI->add($data);
915 915
 		    //    print_r($data);
916 916
     		    } elseif ($line['icon'] == 'ct') {
917
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
918
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
919
-			$typec = substr($data['ident'],-3);
917
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
918
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
919
+			$typec = substr($data['ident'], -3);
920 920
 			$data['type'] = '';
921 921
 			if ($typec == 'APP') $data['type'] = 'Approach';
922 922
 			elseif ($typec == 'TWR') $data['type'] = 'Tower';
@@ -927,7 +927,7 @@  discard block
 block discarded – undo
927 927
 			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
928 928
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
929 929
 			else $data['type'] = 'Observer';
930
-			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']);
930
+			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']);
931 931
 		    }
932 932
 		    unset($data);
933 933
 		}
@@ -939,14 +939,14 @@  discard block
 block discarded – undo
939 939
 	    //$buffer = $Common->getData($hosts[$id]);
940 940
 	    if ($globalDebug) echo 'Get Data...'."\n";
941 941
 	    $buffer = $Common->getData($value['host']);
942
-	    $all_data = json_decode($buffer,true);
942
+	    $all_data = json_decode($buffer, true);
943 943
 	    if ($buffer != '' && is_array($all_data)) {
944 944
 		$reset = 0;
945 945
 		foreach ($all_data as $line) {
946 946
 	    	    $data = array();
947 947
 	    	    //$data['id'] = $line['id']; // id not usable
948 948
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
949
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
949
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
950 950
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
951 951
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
952 952
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -970,14 +970,14 @@  discard block
 block discarded – undo
970 970
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
971 971
 		    if (isset($line['aircraftname'])) {
972 972
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
973
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
974
-	    		$aircraft_data = explode('-',$line['aircraftname']);
973
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
974
+	    		$aircraft_data = explode('-', $line['aircraftname']);
975 975
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
976 976
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
977 977
 	    		else {
978
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
979
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
980
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
978
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
979
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
980
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
981 981
 	    		}
982 982
 	    	    }
983 983
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -997,14 +997,14 @@  discard block
 block discarded – undo
997 997
 	    //$buffer = $Common->getData($hosts[$id]);
998 998
 	    if ($globalDebug) echo 'Get Data...'."\n";
999 999
 	    $buffer = $Common->getData($value['host']);
1000
-	    $all_data = json_decode($buffer,true);
1000
+	    $all_data = json_decode($buffer, true);
1001 1001
 	    if ($buffer != '' && is_array($all_data)) {
1002 1002
 		$reset = 0;
1003 1003
 		foreach ($all_data as $line) {
1004 1004
 	    	    $data = array();
1005 1005
 	    	    //$data['id'] = $line['id']; // id not usable
1006 1006
 	    	    $data['id'] = trim($line['flight_id']);
1007
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1007
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
1008 1008
 	    	    $data['pilot_name'] = $line['pilot_name'];
1009 1009
 	    	    $data['pilot_id'] = $line['pilot_id'];
1010 1010
 	    	    $data['ident'] = trim($line['callsign']); // ident
@@ -1056,11 +1056,11 @@  discard block
 block discarded – undo
1056 1056
 		    //$value = $formats[$nb];
1057 1057
 		    $format = $globalSources[$nb]['format'];
1058 1058
 		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1059
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1059
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
1060 1060
 		    } elseif ($format == 'vrstcp') {
1061 1061
 			$buffer = @socket_read($r, 6000);
1062 1062
 		    } else {
1063
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1063
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
1064 1064
 		    }
1065 1065
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1066 1066
 		    //echo $buffer."\n";
@@ -1069,8 +1069,8 @@  discard block
 block discarded – undo
1069 1069
 		    $error = false;
1070 1070
 		    //$SI::del();
1071 1071
 		    if ($format == 'vrstcp') {
1072
-			$buffer = explode('},{',$buffer);
1073
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1072
+			$buffer = explode('},{', $buffer);
1073
+		    } else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
1074 1074
 		    // SBS format is CSV format
1075 1075
 		    if ($buffer !== FALSE && $buffer != '') {
1076 1076
 			$tt[$format] = 0;
@@ -1104,13 +1104,13 @@  discard block
 block discarded – undo
1104 1104
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1105 1105
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1106 1106
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1107
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1107
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
1108 1108
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1109 1109
 			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1110 1110
 			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1111 1111
 
1112 1112
 			    if (isset($ais_data['timestamp'])) {
1113
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1113
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
1114 1114
 			    } else {
1115 1115
 				$data['datetime'] = date('Y-m-d H:i:s');
1116 1116
 			    }
@@ -1121,10 +1121,10 @@  discard block
 block discarded – undo
1121 1121
                         } elseif ($format == 'flightgearsp') {
1122 1122
                     	    //echo $buffer."\n";
1123 1123
                     	    if (strlen($buffer) > 5) {
1124
-				$line = explode(',',$buffer);
1124
+				$line = explode(',', $buffer);
1125 1125
 				$data = array();
1126 1126
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
1127
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
1127
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
1128 1128
 				$data['ident'] = $line[6];
1129 1129
 				$data['aircraft_name'] = $line[7];
1130 1130
 				$data['longitude'] = $line[1];
@@ -1136,21 +1136,21 @@  discard block
 block discarded – undo
1136 1136
 				$data['format_source'] = 'flightgearsp';
1137 1137
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1138 1138
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1139
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1139
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1140 1140
 			    }
1141 1141
                         } elseif ($format == 'acars') {
1142 1142
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1143 1143
 			    $ACARS->add(trim($buffer));
1144
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1144
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
1145 1145
 			    $ACARS->deleteLiveAcarsData();
1146 1146
 			} elseif ($format == 'flightgearmp') {
1147
-			    if (substr($buffer,0,1) != '#') {
1147
+			    if (substr($buffer, 0, 1) != '#') {
1148 1148
 				$data = array();
1149 1149
 				//echo $buffer."\n";
1150
-				$line = explode(' ',$buffer);
1150
+				$line = explode(' ', $buffer);
1151 1151
 				if (count($line) == 11) {
1152
-				    $userserver = explode('@',$line[0]);
1153
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1152
+				    $userserver = explode('@', $line[0]);
1153
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
1154 1154
 				    $data['ident'] = $userserver[0];
1155 1155
 				    $data['registration'] = $userserver[0];
1156 1156
 				    $data['latitude'] = $line[4];
@@ -1158,8 +1158,8 @@  discard block
 block discarded – undo
1158 1158
 				    $data['altitude'] = $line[6];
1159 1159
 				    $data['datetime'] = date('Y-m-d H:i:s');
1160 1160
 				    $aircraft_type = $line[10];
1161
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1162
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1161
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
1162
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
1163 1163
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1164 1164
 				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1165 1165
 				}
@@ -1168,8 +1168,8 @@  discard block
 block discarded – undo
1168 1168
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1169 1169
 			    die;
1170 1170
 			} elseif ($format == 'vrstcp') {
1171
-			    foreach($buffer as $all_data) {
1172
-				$line = json_decode('{'.$all_data.'}',true);
1171
+			    foreach ($buffer as $all_data) {
1172
+				$line = json_decode('{'.$all_data.'}', true);
1173 1173
 				$data = array();
1174 1174
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1175 1175
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1195,16 +1195,16 @@  discard block
 block discarded – undo
1195 1195
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1196 1196
 				unset($data);
1197 1197
 			    }
1198
-			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1198
+			} elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') {
1199 1199
 			    $line = explode("\t", $buffer);
1200
-			    for($k = 0; $k < count($line); $k=$k+2) {
1200
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
1201 1201
 				$key = $line[$k];
1202
-			        $lined[$key] = $line[$k+1];
1202
+			        $lined[$key] = $line[$k + 1];
1203 1203
 			    }
1204 1204
     			    if (count($lined) > 3) {
1205 1205
     				$data['hex'] = $lined['hexid'];
1206 1206
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1207
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1207
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
1208 1208
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1209 1209
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1210 1210
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -1223,22 +1223,22 @@  discard block
 block discarded – undo
1223 1223
     			    } else $error = true;
1224 1224
 			} elseif ($format == 'aprs' && $use_aprs) {
1225 1225
 			    if ($aprs_connect == 0) {
1226
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1226
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
1227 1227
 				$aprs_connect = 1;
1228 1228
 			    }
1229 1229
 			    
1230
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1230
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
1231 1231
 				$aprs_last_tx = time();
1232 1232
 				$data_aprs = "# Keep alive";
1233
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1233
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1234 1234
 			    }
1235 1235
 			    
1236 1236
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1237 1237
 			    //echo 'APRS data : '.$buffer."\n";
1238
-			    $buffer = str_replace('APRS <- ','',$buffer);
1239
-			    $buffer = str_replace('APRS -> ','',$buffer);
1238
+			    $buffer = str_replace('APRS <- ', '', $buffer);
1239
+			    $buffer = str_replace('APRS -> ', '', $buffer);
1240 1240
 			    //echo $buffer."\n";
1241
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1241
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
1242 1242
 				$line = $APRS->parse($buffer);
1243 1243
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1244 1244
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1253,7 +1253,7 @@  discard block
 block discarded – undo
1253 1253
 				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1254 1254
 				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1255 1255
 				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1256
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1256
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
1257 1257
 				    else $data['datetime'] = date('Y-m-d H:i:s');
1258 1258
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1259 1259
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1382,7 +1382,7 @@  discard block
 block discarded – undo
1382 1382
 				connect_all($sourceee);
1383 1383
 				$sourceee = array();
1384 1384
 				//connect_all($globalSources);
1385
-				$tt[$format]=0;
1385
+				$tt[$format] = 0;
1386 1386
 				break;
1387 1387
 			    }
1388 1388
 			}
@@ -1391,14 +1391,14 @@  discard block
 block discarded – undo
1391 1391
 	    } else {
1392 1392
 		$error = socket_strerror(socket_last_error());
1393 1393
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1394
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1394
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
1395 1395
 			if (isset($globalDebug)) echo "Restarting...\n";
1396 1396
 			// Restart the script if possible
1397 1397
 			if (is_array($sockets)) {
1398 1398
 			    if ($globalDebug) echo "Shutdown all sockets...";
1399 1399
 			    
1400 1400
 			    foreach ($sockets as $sock) {
1401
-				@socket_shutdown($sock,2);
1401
+				@socket_shutdown($sock, 2);
1402 1402
 				@socket_close($sock);
1403 1403
 			    }
1404 1404
 			    
Please login to merge, or discard this patch.
Braces   +934 added lines, -321 removed lines patch added patch discarded remove patch
@@ -13,13 +13,17 @@  discard block
 block discarded – undo
13 13
 require_once(dirname(__FILE__).'/../require/class.SBS.php');
14 14
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
15 15
 require_once(dirname(__FILE__).'/../require/class.Common.php');
16
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
16
+if (isset($globalTracker) && $globalTracker) {
17
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
18
+}
17 19
 if (isset($globalMarine) && $globalMarine) {
18 20
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
19 21
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
20 22
 }
21 23
 
22
-if (!isset($globalDebug)) $globalDebug = FALSE;
24
+if (!isset($globalDebug)) {
25
+	$globalDebug = FALSE;
26
+}
23 27
 
24 28
 // Check if schema is at latest version
25 29
 $Connection = new Connection();
@@ -54,35 +58,62 @@  discard block
 block discarded – undo
54 58
 //elseif (isset($options['source'])) $hosts = array($options['source']);
55 59
 if (isset($options['s'])) {
56 60
     $globalSources = array();
57
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
58
-    else $globalSources[] = array('host' => $options['s']);
59
-} elseif (isset($options['source'])) {
61
+    if (isset($options['format'])) {
62
+    	$globalSources[] = array('host' => $options['s'],'format' => $options['format']);
63
+    } else {
64
+    	$globalSources[] = array('host' => $options['s']);
65
+    }
66
+    } elseif (isset($options['source'])) {
60 67
     $globalSources = array();
61
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
62
-    else $globalSources[] = array('host' => $options['source']);
63
-}
68
+    if (isset($options['format'])) {
69
+    	$globalSources[] = array('host' => $options['source'],'format' => $options['format']);
70
+    } else {
71
+    	$globalSources[] = array('host' => $options['source']);
72
+    }
73
+    }
64 74
 if (isset($options['aprsserverhost'])) {
65 75
 	$globalServerAPRS = TRUE;
66 76
 	$globalServerAPRShost = $options['aprsserverhost'];
67 77
 }
68
-if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport'];
69
-if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid'];
70
-if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass'];
71
-if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE; 
72
-if (isset($options['nodaemon'])) $globalDaemon = FALSE;
73
-if (isset($options['server'])) $globalServer = TRUE;
74
-if (isset($options['idsource'])) $id_source = $options['idsource'];
75
-else $id_source = 1;
78
+if (isset($options['aprsserverport'])) {
79
+	$globalServerAPRSport = $options['aprsserverport'];
80
+}
81
+if (isset($options['aprsserverssid'])) {
82
+	$globalServerAPRSssid = $options['aprsserverssid'];
83
+}
84
+if (isset($options['aprsserverpass'])) {
85
+	$globalServerAPRSpass = $options['aprsserverpass'];
86
+}
87
+if (isset($options['noaprsserver'])) {
88
+	$globalServerAPRS = FALSE;
89
+}
90
+if (isset($options['nodaemon'])) {
91
+	$globalDaemon = FALSE;
92
+}
93
+if (isset($options['server'])) {
94
+	$globalServer = TRUE;
95
+}
96
+if (isset($options['idsource'])) {
97
+	$id_source = $options['idsource'];
98
+} else {
99
+	$id_source = 1;
100
+}
76 101
 if (isset($globalServer) && $globalServer) {
77
-    if ($globalDebug) echo "Using Server Mode\n";
102
+    if ($globalDebug) {
103
+    	echo "Using Server Mode\n";
104
+    }
78 105
     $SI=new SpotterServer();
79 106
 /*
80 107
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
81 108
     $SI = new adsb2aprs();
82 109
     $SI->connect();
83 110
 */
84
-} else $SI=new SpotterImport($Connection->db);
85
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
111
+} else {
112
+	$SI=new SpotterImport($Connection->db);
113
+}
114
+if (isset($globalTracker) && $globalTracker) {
115
+	$TI = new TrackerImport($Connection->db);
116
+}
86 117
 if (isset($globalMarine) && $globalMarine) {
87 118
     $AIS = new AIS();
88 119
     $MI = new MarineImport($Connection->db);
@@ -104,7 +135,9 @@  discard block
 block discarded – undo
104 135
 }
105 136
 
106 137
 // let's try and connect
107
-if ($globalDebug) echo "Connecting...\n";
138
+if ($globalDebug) {
139
+	echo "Connecting...\n";
140
+}
108 141
 $use_aprs = false;
109 142
 $aprs_full = false;
110 143
 $reset = 0;
@@ -113,7 +146,9 @@  discard block
 block discarded – undo
113 146
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
114 147
     global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
115 148
     $reset++;
116
-    if ($globalDebug) echo 'Connect to all...'."\n";
149
+    if ($globalDebug) {
150
+    	echo 'Connect to all...'."\n";
151
+    }
117 152
     foreach ($hosts as $id => $value) {
118 153
 	$host = $value['host'];
119 154
 	$globalSources[$id]['last_exec'] = 0;
@@ -123,22 +158,30 @@  discard block
 block discarded – undo
123 158
         	//$formats[$id] = 'deltadbtxt';
124 159
         	$globalSources[$id]['format'] = 'deltadbtxt';
125 160
         	//$last_exec['deltadbtxt'] = 0;
126
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
161
+        	if ($globalDebug) {
162
+        		echo "Connect to deltadb source (".$host.")...\n";
163
+        	}
127 164
             } else if (preg_match('/vatsim-data.txt$/i',$host)) {
128 165
         	//$formats[$id] = 'vatsimtxt';
129 166
         	$globalSources[$id]['format'] = 'vatsimtxt';
130 167
         	//$last_exec['vatsimtxt'] = 0;
131
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
168
+        	if ($globalDebug) {
169
+        		echo "Connect to vatsim source (".$host.")...\n";
170
+        	}
132 171
     	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
133 172
         	//$formats[$id] = 'aircraftlistjson';
134 173
         	$globalSources[$id]['format'] = 'aircraftlistjson';
135 174
         	//$last_exec['aircraftlistjson'] = 0;
136
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
175
+        	if ($globalDebug) {
176
+        		echo "Connect to aircraftlist.json source (".$host.")...\n";
177
+        	}
137 178
     	    } else if (preg_match('/opensky/i',$host)) {
138 179
         	//$formats[$id] = 'aircraftlistjson';
139 180
         	$globalSources[$id]['format'] = 'opensky';
140 181
         	//$last_exec['aircraftlistjson'] = 0;
141
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
182
+        	if ($globalDebug) {
183
+        		echo "Connect to opensky source (".$host.")...\n";
184
+        	}
142 185
     	    /*
143 186
     	    // Disabled for now, site change source format
144 187
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
@@ -155,7 +198,9 @@  discard block
 block discarded – undo
155 198
         	//$formats[$id] = 'planeupdatefaa';
156 199
         	$globalSources[$id]['format'] = 'planeupdatefaa';
157 200
         	//$last_exec['planeupdatefaa'] = 0;
158
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
201
+        	if ($globalDebug) {
202
+        		echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
203
+        	}
159 204
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
160 205
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
161 206
         	    exit(0);
@@ -164,26 +209,36 @@  discard block
 block discarded – undo
164 209
         	//$formats[$id] = 'phpvmacars';
165 210
         	$globalSources[$id]['format'] = 'phpvmacars';
166 211
         	//$last_exec['phpvmacars'] = 0;
167
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
212
+        	if ($globalDebug) {
213
+        		echo "Connect to phpvmacars source (".$host.")...\n";
214
+        	}
168 215
             } else if (preg_match('/VAM-json.php$/i',$host)) {
169 216
         	//$formats[$id] = 'phpvmacars';
170 217
         	$globalSources[$id]['format'] = 'vam';
171
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
218
+        	if ($globalDebug) {
219
+        		echo "Connect to Vam source (".$host.")...\n";
220
+        	}
172 221
             } else if (preg_match('/whazzup/i',$host)) {
173 222
         	//$formats[$id] = 'whazzup';
174 223
         	$globalSources[$id]['format'] = 'whazzup';
175 224
         	//$last_exec['whazzup'] = 0;
176
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
225
+        	if ($globalDebug) {
226
+        		echo "Connect to whazzup source (".$host.")...\n";
227
+        	}
177 228
             } else if (preg_match('/recentpireps/i',$host)) {
178 229
         	//$formats[$id] = 'pirepsjson';
179 230
         	$globalSources[$id]['format'] = 'pirepsjson';
180 231
         	//$last_exec['pirepsjson'] = 0;
181
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
232
+        	if ($globalDebug) {
233
+        		echo "Connect to pirepsjson source (".$host.")...\n";
234
+        	}
182 235
             } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
183 236
         	//$formats[$id] = 'fr24json';
184 237
         	$globalSources[$id]['format'] = 'fr24json';
185 238
         	//$last_exec['fr24json'] = 0;
186
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
239
+        	if ($globalDebug) {
240
+        		echo "Connect to fr24 source (".$host.")...\n";
241
+        	}
187 242
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
188 243
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
189 244
         	    exit(0);
@@ -192,7 +247,9 @@  discard block
 block discarded – undo
192 247
         	//$formats[$id] = 'fr24json';
193 248
         	$globalSources[$id]['format'] = 'myshiptracking';
194 249
         	//$last_exec['fr24json'] = 0;
195
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
250
+        	if ($globalDebug) {
251
+        		echo "Connect to myshiptracking source (".$host.")...\n";
252
+        	}
196 253
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
197 254
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
198 255
         	    exit(0);
@@ -201,17 +258,24 @@  discard block
 block discarded – undo
201 258
             } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
202 259
         	//$formats[$id] = 'tsv';
203 260
         	$globalSources[$id]['format'] = 'tsv';
204
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
261
+        	if ($globalDebug) {
262
+        		echo "Connect to tsv source (".$host.")...\n";
263
+        	}
205 264
             }
206 265
         } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
207 266
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
208 267
     		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
209 268
     		    if ($idf !== false) {
210 269
     			$httpfeeds[$id] = $idf;
211
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
270
+        		if ($globalDebug) {
271
+        			echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
272
+        		}
273
+    		    } elseif ($globalDebug) {
274
+    		    	echo "Can't connect to ".$globalSources[$id]['host']."\n";
212 275
     		    }
213
-    		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
214
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
276
+    		} elseif ($globalDebug) {
277
+    			echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
278
+    		}
215 279
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
216 280
 	    $hostport = explode(':',$host);
217 281
 	    if (isset($hostport[1])) {
@@ -251,17 +315,25 @@  discard block
 block discarded – undo
251 315
         		//$formats[$id] = 'beast';
252 316
         		$globalSources[$id]['format'] = 'beast';
253 317
 		    //} else $formats[$id] = 'sbs';
254
-		    } else $globalSources[$id]['format'] = 'sbs';
318
+		    } else {
319
+		    	$globalSources[$id]['format'] = 'sbs';
320
+		    }
255 321
 		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
256 322
 		}
257
-		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
323
+		if ($globalDebug) {
324
+			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
325
+		}
258 326
             } else {
259
-		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
327
+		if ($globalDebug) {
328
+			echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
329
+		}
260 330
     	    }
261 331
         }
262 332
     }
263 333
 }
264
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
334
+if (!isset($globalMinFetch)) {
335
+	$globalMinFetch = 15;
336
+}
265 337
 
266 338
 // Initialize all
267 339
 $status = array();
@@ -270,13 +342,19 @@  discard block
 block discarded – undo
270 342
 $formats = array();
271 343
 $last_exec = array();
272 344
 $time = time();
273
-if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;
274
-else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
275
-else $timeout = 20;
345
+if (isset($globalSourcesTimeout)) {
346
+	$timeout = $globalSourcesTimeOut;
347
+} else if (isset($globalSBS1TimeOut)) {
348
+	$timeout = $globalSBS1TimeOut;
349
+} else {
350
+	$timeout = 20;
351
+}
276 352
 $errno = '';
277 353
 $errstr='';
278 354
 
279
-if (!isset($globalDaemon)) $globalDaemon = TRUE;
355
+if (!isset($globalDaemon)) {
356
+	$globalDaemon = TRUE;
357
+}
280 358
 /* Initiate connections to all the hosts simultaneously */
281 359
 //connect_all($hosts);
282 360
 //connect_all($globalSources);
@@ -302,7 +380,9 @@  discard block
 block discarded – undo
302 380
     if (isset($source['format']) && $source['format'] == 'aprs') {
303 381
 	$aprs_connect = 0;
304 382
 	$use_aprs = true;
305
-	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
383
+	if (isset($source['port']) && $source['port'] == '10152') {
384
+		$aprs_full = true;
385
+	}
306 386
 	break;
307 387
     }
308 388
 }
@@ -313,25 +393,48 @@  discard block
 block discarded – undo
313 393
 	$aprs_connect = 0;
314 394
 	$aprs_keep = 120;
315 395
 	$aprs_last_tx = time();
316
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
317
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
318
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
319
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
320
-	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
321
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
322
-	if ($aprs_full) $aprs_filter = '';
323
-	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
324
-	else $aprs_pass = '-1';
396
+	if (isset($globalAPRSversion)) {
397
+		$aprs_version = $globalAPRSversion;
398
+	} else {
399
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
400
+	}
401
+	if (isset($globalAPRSssid)) {
402
+		$aprs_ssid = $globalAPRSssid;
403
+	} else {
404
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
405
+	}
406
+	if (isset($globalAPRSfilter)) {
407
+		$aprs_filter = $globalAPRSfilter;
408
+	} else {
409
+		$aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
410
+	}
411
+	if ($aprs_full) {
412
+		$aprs_filter = '';
413
+	}
414
+	if (isset($globalAPRSpass)) {
415
+		$aprs_pass = $globalAPRSpass;
416
+	} else {
417
+		$aprs_pass = '-1';
418
+	}
325 419
 
326
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
327
-	else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
328
-}
420
+	if ($aprs_filter != '') {
421
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
422
+	} else {
423
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
424
+	}
425
+	}
329 426
 
330 427
 // connected - lets do some work
331
-if ($globalDebug) echo "Connected!\n";
428
+if ($globalDebug) {
429
+	echo "Connected!\n";
430
+}
332 431
 sleep(1);
333
-if ($globalDebug) echo "SCAN MODE \n\n";
334
-if (!isset($globalCronEnd)) $globalCronEnd = 60;
432
+if ($globalDebug) {
433
+	echo "SCAN MODE \n\n";
434
+}
435
+if (!isset($globalCronEnd)) {
436
+	$globalCronEnd = 60;
437
+}
335 438
 $endtime = time()+$globalCronEnd;
336 439
 $i = 1;
337 440
 $tt = array();
@@ -345,10 +448,14 @@  discard block
 block discarded – undo
345 448
 
346 449
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
347 450
 while ($i > 0) {
348
-    if (!$globalDaemon) $i = $endtime-time();
451
+    if (!$globalDaemon) {
452
+    	$i = $endtime-time();
453
+    }
349 454
     // Delete old ATC
350 455
     if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
351
-	if ($globalDebug) echo 'Delete old ATC...'."\n";
456
+	if ($globalDebug) {
457
+		echo 'Delete old ATC...'."\n";
458
+	}
352 459
         $ATC->deleteOldATC();
353 460
     }
354 461
     
@@ -356,10 +463,14 @@  discard block
 block discarded – undo
356 463
     if (count($last_exec) == count($globalSources)) {
357 464
 	$max = $globalMinFetch;
358 465
 	foreach ($last_exec as $last) {
359
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
466
+	    if ((time() - $last['last']) < $max) {
467
+	    	$max = time() - $last['last'];
468
+	    }
360 469
 	}
361 470
 	if ($max != $globalMinFetch) {
362
-	    if ($globalDebug) echo 'Sleeping...'."\n";
471
+	    if ($globalDebug) {
472
+	    	echo 'Sleeping...'."\n";
473
+	    }
363 474
 	    sleep($globalMinFetch-$max+2);
364 475
 	}
365 476
     }
@@ -368,11 +479,15 @@  discard block
 block discarded – undo
368 479
     //foreach ($formats as $id => $value) {
369 480
     foreach ($globalSources as $id => $value) {
370 481
 	date_default_timezone_set('UTC');
371
-	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
482
+	if (!isset($last_exec[$id]['last'])) {
483
+		$last_exec[$id]['last'] = 0;
484
+	}
372 485
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
373 486
 	    //$buffer = $Common->getData($hosts[$id]);
374 487
 	    $buffer = $Common->getData($value['host']);
375
-	    if ($buffer != '') $reset = 0;
488
+	    if ($buffer != '') {
489
+	    	$reset = 0;
490
+	    }
376 491
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
377 492
 	    $buffer = explode('\n',$buffer);
378 493
 	    foreach ($buffer as $line) {
@@ -381,20 +496,41 @@  discard block
 block discarded – undo
381 496
 	            $data = array();
382 497
 	            $data['hex'] = $line[1]; // hex
383 498
 	            $data['ident'] = $line[2]; // ident
384
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
385
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
386
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
387
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
388
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
499
+	            if (isset($line[3])) {
500
+	            	$data['altitude'] = $line[3];
501
+	            }
502
+	            // altitude
503
+	            if (isset($line[4])) {
504
+	            	$data['speed'] = $line[4];
505
+	            }
506
+	            // speed
507
+	            if (isset($line[5])) {
508
+	            	$data['heading'] = $line[5];
509
+	            }
510
+	            // heading
511
+	            if (isset($line[6])) {
512
+	            	$data['latitude'] = $line[6];
513
+	            }
514
+	            // lat
515
+	            if (isset($line[7])) {
516
+	            	$data['longitude'] = $line[7];
517
+	            }
518
+	            // long
389 519
 	            $data['verticalrate'] = ''; // vertical rate
390 520
 	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
391 521
 	            $data['emergency'] = ''; // emergency
392 522
 		    $data['datetime'] = date('Y-m-d H:i:s');
393 523
 		    $data['format_source'] = 'deltadbtxt';
394 524
     		    $data['id_source'] = $id_source;
395
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
396
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
397
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
525
+		    if (isset($value['name']) && $value['name'] != '') {
526
+		    	$data['source_name'] = $value['name'];
527
+		    }
528
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
529
+		    	$data['noarchive'] = true;
530
+		    }
531
+		    if (isset($value['sourcestats'])) {
532
+		    	$data['sourcestats'] = $value['sourcestats'];
533
+		    }
398 534
     		    $SI->add($data);
399 535
 		    unset($data);
400 536
     		}
@@ -404,7 +540,9 @@  discard block
 block discarded – undo
404 540
 	    date_default_timezone_set('CET');
405 541
 	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
406 542
 	    date_default_timezone_set('UTC');
407
-	    if ($buffer != '') $reset = 0;
543
+	    if ($buffer != '') {
544
+	    	$reset = 0;
545
+	    }
408 546
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
409 547
 	    $buffer = explode('\n',$buffer);
410 548
 	    foreach ($buffer as $line) {
@@ -413,16 +551,36 @@  discard block
 block discarded – undo
413 551
 		    $add = false;
414 552
 		    $ais_data = $AIS->parse_line(trim($line));
415 553
 		    $data = array();
416
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
417
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
418
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
419
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
420
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
421
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
422
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
423
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
424
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
425
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
554
+		    if (isset($ais_data['ident'])) {
555
+		    	$data['ident'] = $ais_data['ident'];
556
+		    }
557
+		    if (isset($ais_data['mmsi'])) {
558
+		    	$data['mmsi'] = $ais_data['mmsi'];
559
+		    }
560
+		    if (isset($ais_data['speed'])) {
561
+		    	$data['speed'] = $ais_data['speed'];
562
+		    }
563
+		    if (isset($ais_data['heading'])) {
564
+		    	$data['heading'] = $ais_data['heading'];
565
+		    }
566
+		    if (isset($ais_data['latitude'])) {
567
+		    	$data['latitude'] = $ais_data['latitude'];
568
+		    }
569
+		    if (isset($ais_data['longitude'])) {
570
+		    	$data['longitude'] = $ais_data['longitude'];
571
+		    }
572
+		    if (isset($ais_data['status'])) {
573
+		    	$data['status'] = $ais_data['status'];
574
+		    }
575
+		    if (isset($ais_data['type'])) {
576
+		    	$data['type'] = $ais_data['type'];
577
+		    }
578
+		    if (isset($ais_data['imo'])) {
579
+		    	$data['imo'] = $ais_data['imo'];
580
+		    }
581
+		    if (isset($ais_data['callsign'])) {
582
+		    	$data['callsign'] = $ais_data['callsign'];
583
+		    }
426 584
 		    if (isset($ais_data['timestamp'])) {
427 585
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
428 586
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
@@ -436,8 +594,12 @@  discard block
 block discarded – undo
436 594
 		    $data['format_source'] = 'aisnmeatxt';
437 595
     		    $data['id_source'] = $id_source;
438 596
 		    //print_r($data);
439
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
440
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
597
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
598
+		    	$data['noarchive'] = true;
599
+		    }
600
+		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
601
+		    	$MI->add($data);
602
+		    }
441 603
 		    unset($data);
442 604
 		}
443 605
     	    }
@@ -457,20 +619,48 @@  discard block
 block discarded – undo
457 619
 			    if ($line != '') {
458 620
 				$ais_data = $AIS->parse_line(trim($line));
459 621
 				$data = array();
460
-				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
461
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
462
-				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
463
-				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
464
-				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
465
-				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
466
-				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
467
-				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
468
-				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
469
-				if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
470
-				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
471
-				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
472
-				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
473
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
622
+				if (isset($ais_data['ident'])) {
623
+					$data['ident'] = $ais_data['ident'];
624
+				}
625
+				if (isset($ais_data['mmsi'])) {
626
+					$data['mmsi'] = $ais_data['mmsi'];
627
+				}
628
+				if (isset($ais_data['speed'])) {
629
+					$data['speed'] = $ais_data['speed'];
630
+				}
631
+				if (isset($ais_data['heading'])) {
632
+					$data['heading'] = $ais_data['heading'];
633
+				}
634
+				if (isset($ais_data['latitude'])) {
635
+					$data['latitude'] = $ais_data['latitude'];
636
+				}
637
+				if (isset($ais_data['longitude'])) {
638
+					$data['longitude'] = $ais_data['longitude'];
639
+				}
640
+				if (isset($ais_data['status'])) {
641
+					$data['status'] = $ais_data['status'];
642
+				}
643
+				if (isset($ais_data['statusid'])) {
644
+					$data['status_id'] = $ais_data['statusid'];
645
+				}
646
+				if (isset($ais_data['type'])) {
647
+					$data['type'] = $ais_data['type'];
648
+				}
649
+				if (isset($ais_data['typeid'])) {
650
+					$data['type_id'] = $ais_data['typeid'];
651
+				}
652
+				if (isset($ais_data['imo'])) {
653
+					$data['imo'] = $ais_data['imo'];
654
+				}
655
+				if (isset($ais_data['callsign'])) {
656
+					$data['callsign'] = $ais_data['callsign'];
657
+				}
658
+				if (isset($ais_data['destination'])) {
659
+					$data['arrival_code'] = $ais_data['destination'];
660
+				}
661
+				if (isset($ais_data['eta_ts'])) {
662
+					$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
663
+				}
474 664
 				if (isset($ais_data['timestamp'])) {
475 665
 				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
476 666
 				} else {
@@ -478,18 +668,27 @@  discard block
 block discarded – undo
478 668
 				}
479 669
 				$data['format_source'] = 'aisnmeahttp';
480 670
 				$data['id_source'] = $id_source;
481
-				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
482
-				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
671
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
672
+					$data['noarchive'] = true;
673
+				}
674
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
675
+					$MI->add($data);
676
+				}
483 677
 				unset($data);
484 678
 			    }
485 679
 			}
486 680
 		    }
487 681
 		} else {
488 682
 		    $format = $value['format'];
489
-		    if (isset($tt[$format])) $tt[$format]++;
490
-		    else $tt[$format] = 0;
683
+		    if (isset($tt[$format])) {
684
+		    	$tt[$format]++;
685
+		    } else {
686
+		    	$tt[$format] = 0;
687
+		    }
491 688
 		    if ($tt[$format] > 30) {
492
-			if ($globalDebug) echo 'Reconnect...'."\n";
689
+			if ($globalDebug) {
690
+				echo 'Reconnect...'."\n";
691
+			}
493 692
 			sleep(2);
494 693
 			$sourceeen[] = $value;
495 694
 			connect_all($sourceeen);
@@ -519,7 +718,9 @@  discard block
 block discarded – undo
519 718
 			$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
520 719
 			$data['format_source'] = 'myshiptracking';
521 720
 			$data['id_source'] = $id_source;
522
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
721
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
722
+				$data['noarchive'] = true;
723
+			}
523 724
 			$MI->add($data);
524 725
 			unset($data);
525 726
 		    }
@@ -540,7 +741,9 @@  discard block
 block discarded – undo
540 741
 			    $data['callsign'] = $line['callsign'];
541 742
 			    $data['mmsi'] = $line['mmsi'];
542 743
 			    $data['speed'] = $line['sog'];
543
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
744
+			    if ($line['heading'] != '511') {
745
+			    	$data['heading'] = $line['heading'];
746
+			    }
544 747
 			    $data['latitude'] = $line['latitude'];
545 748
 			    $data['longitude'] = $line['longitude'];
546 749
 			    $data['type_id'] = $line['shiptype'];
@@ -548,7 +751,9 @@  discard block
 block discarded – undo
548 751
 			    $data['datetime'] = $line['time'];
549 752
 			    $data['format_source'] = 'boatbeaconapp';
550 753
 			    $data['id_source'] = $id_source;
551
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
754
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
755
+			    	$data['noarchive'] = true;
756
+			    }
552 757
 			    $MI->add($data);
553 758
 			    unset($data);
554 759
 			}
@@ -561,7 +766,9 @@  discard block
 block discarded – undo
561 766
 	    echo 'download...';
562 767
 	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
563 768
 	    echo 'done !'."\n";
564
-	    if ($buffer != '') $reset = 0;
769
+	    if ($buffer != '') {
770
+	    	$reset = 0;
771
+	    }
565 772
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
566 773
 	    $buffer = explode('\n',$buffer);
567 774
 	    foreach ($buffer as $line) {
@@ -586,7 +793,9 @@  discard block
 block discarded – undo
586 793
 		    //$data['etaTime'] = substr($line,135,5);
587 794
 		    $data['format_source'] = 'shipplotter';
588 795
     		    $data['id_source'] = $id_source;
589
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
796
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
797
+		    	$data['noarchive'] = true;
798
+		    }
590 799
 		    //print_r($data);
591 800
 		    echo 'Add...'."\n";
592 801
 		    $MI->add($data);
@@ -606,16 +815,28 @@  discard block
 block discarded – undo
606 815
     		    $line = explode(':', $line);
607 816
     		    if (count($line) > 30 && $line[0] != 'callsign') {
608 817
 			$data = array();
609
-			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
610
-			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
818
+			if (isset($line[37]) && $line[37] != '') {
819
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
820
+			} else {
821
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
822
+			}
611 823
 			$data['pilot_id'] = $line[1];
612 824
 			$data['pilot_name'] = $line[2];
613 825
 			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
614 826
 			$data['ident'] = $line[0]; // ident
615
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
827
+			if ($line[7] != '' && $line[7] != 0) {
828
+				$data['altitude'] = $line[7];
829
+			}
830
+			// altitude
616 831
 			$data['speed'] = $line[8]; // speed
617
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
618
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
832
+			if (isset($line[45])) {
833
+				$data['heading'] = $line[45];
834
+			}
835
+			// heading
836
+			elseif (isset($line[38])) {
837
+				$data['heading'] = $line[38];
838
+			}
839
+			// heading
619 840
 			$data['latitude'] = $line[5]; // lat
620 841
 	        	$data['longitude'] = $line[6]; // long
621 842
 	        	$data['verticalrate'] = ''; // vertical rate
@@ -631,7 +852,9 @@  discard block
 block discarded – undo
631 852
 			$data['frequency'] = $line[4];
632 853
 			$data['type'] = $line[18];
633 854
 			$data['range'] = $line[19];
634
-			if (isset($line[35])) $data['info'] = $line[35];
855
+			if (isset($line[35])) {
856
+				$data['info'] = $line[35];
857
+			}
635 858
     			$data['id_source'] = $id_source;
636 859
 	    		//$data['arrival_airport_time'] = ;
637 860
 	    		if ($line[9] != '') {
@@ -645,25 +868,44 @@  discard block
 block discarded – undo
645 868
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
646 869
 	    		*/
647 870
 	    		$data['format_source'] = $value['format'];
648
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
649
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
650
-    			if ($line[3] == 'PILOT') $SI->add($data);
651
-			elseif ($line[3] == 'ATC') {
871
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
872
+				$data['noarchive'] = true;
873
+			}
874
+			if (isset($value['name']) && $value['name'] != '') {
875
+				$data['source_name'] = $value['name'];
876
+			}
877
+    			if ($line[3] == 'PILOT') {
878
+    				$SI->add($data);
879
+    			} elseif ($line[3] == 'ATC') {
652 880
 				//print_r($data);
653 881
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
654 882
 				$data['info'] = str_replace('&amp;sect;','',$data['info']);
655 883
 				$typec = substr($data['ident'],-3);
656
-				if ($typec == 'APP') $data['type'] = 'Approach';
657
-				elseif ($typec == 'TWR') $data['type'] = 'Tower';
658
-				elseif ($typec == 'OBS') $data['type'] = 'Observer';
659
-				elseif ($typec == 'GND') $data['type'] = 'Ground';
660
-				elseif ($typec == 'DEL') $data['type'] = 'Delivery';
661
-				elseif ($typec == 'DEP') $data['type'] = 'Departure';
662
-				elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
663
-				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
664
-				elseif ($data['type'] == '') $data['type'] = 'Observer';
665
-				if (!isset($data['source_name'])) $data['source_name'] = '';
666
-				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']);
884
+				if ($typec == 'APP') {
885
+					$data['type'] = 'Approach';
886
+				} elseif ($typec == 'TWR') {
887
+					$data['type'] = 'Tower';
888
+				} elseif ($typec == 'OBS') {
889
+					$data['type'] = 'Observer';
890
+				} elseif ($typec == 'GND') {
891
+					$data['type'] = 'Ground';
892
+				} elseif ($typec == 'DEL') {
893
+					$data['type'] = 'Delivery';
894
+				} elseif ($typec == 'DEP') {
895
+					$data['type'] = 'Departure';
896
+				} elseif ($typec == 'FSS') {
897
+					$data['type'] = 'Flight Service Station';
898
+				} elseif ($typec == 'CTR') {
899
+					$data['type'] = 'Control Radar or Centre';
900
+				} elseif ($data['type'] == '') {
901
+					$data['type'] = 'Observer';
902
+				}
903
+				if (!isset($data['source_name'])) {
904
+					$data['source_name'] = '';
905
+				}
906
+				if (isset($ATC)) {
907
+					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']);
908
+				}
667 909
 			}
668 910
     			unset($data);
669 911
     		    }
@@ -682,27 +924,61 @@  discard block
 block discarded – undo
682 924
 		foreach ($all_data['acList'] as $line) {
683 925
 		    $data = array();
684 926
 		    $data['hex'] = $line['Icao']; // hex
685
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
686
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
687
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
688
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
689
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
690
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
927
+		    if (isset($line['Call'])) {
928
+		    	$data['ident'] = $line['Call'];
929
+		    }
930
+		    // ident
931
+		    if (isset($line['Alt'])) {
932
+		    	$data['altitude'] = $line['Alt'];
933
+		    }
934
+		    // altitude
935
+		    if (isset($line['Spd'])) {
936
+		    	$data['speed'] = $line['Spd'];
937
+		    }
938
+		    // speed
939
+		    if (isset($line['Trak'])) {
940
+		    	$data['heading'] = $line['Trak'];
941
+		    }
942
+		    // heading
943
+		    if (isset($line['Lat'])) {
944
+		    	$data['latitude'] = $line['Lat'];
945
+		    }
946
+		    // lat
947
+		    if (isset($line['Long'])) {
948
+		    	$data['longitude'] = $line['Long'];
949
+		    }
950
+		    // long
691 951
 		    //$data['verticalrate'] = $line['']; // verticale rate
692
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
952
+		    if (isset($line['Sqk'])) {
953
+		    	$data['squawk'] = $line['Sqk'];
954
+		    }
955
+		    // squawk
693 956
 		    $data['emergency'] = ''; // emergency
694
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
957
+		    if (isset($line['Reg'])) {
958
+		    	$data['registration'] = $line['Reg'];
959
+		    }
695 960
 		    
696
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
697
-		    else $data['datetime'] = date('Y-m-d H:i:s');
961
+		    if (isset($line['PosTime'])) {
962
+		    	$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
963
+		    } else {
964
+		    	$data['datetime'] = date('Y-m-d H:i:s');
965
+		    }
698 966
 		    
699 967
 		    //$data['datetime'] = date('Y-m-d H:i:s');
700
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
968
+		    if (isset($line['Type'])) {
969
+		    	$data['aircraft_icao'] = $line['Type'];
970
+		    }
701 971
 	    	    $data['format_source'] = 'aircraftlistjson';
702 972
 		    $data['id_source'] = $id_source;
703
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
704
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
705
-		    if (isset($data['latitude'])) $SI->add($data);
973
+		    if (isset($value['name']) && $value['name'] != '') {
974
+		    	$data['source_name'] = $value['name'];
975
+		    }
976
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
977
+		    	$data['noarchive'] = true;
978
+		    }
979
+		    if (isset($data['latitude'])) {
980
+		    	$SI->add($data);
981
+		    }
706 982
 		    unset($data);
707 983
 		}
708 984
 	    } elseif (is_array($all_data)) {
@@ -719,12 +995,19 @@  discard block
 block discarded – undo
719 995
 		    $data['verticalrate'] = $line['vrt']; // verticale rate
720 996
 		    $data['squawk'] = $line['squawk']; // squawk
721 997
 		    $data['emergency'] = ''; // emergency
722
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
723
-		    else $data['datetime'] = date('Y-m-d H:i:s');
998
+		    if (isset($line['PosTime'])) {
999
+		    	$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1000
+		    } else {
1001
+		    	$data['datetime'] = date('Y-m-d H:i:s');
1002
+		    }
724 1003
 	    	    $data['format_source'] = 'aircraftlistjson';
725 1004
     		    $data['id_source'] = $id_source;
726
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
727
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1005
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1006
+		    	$data['noarchive'] = true;
1007
+		    }
1008
+		    if (isset($value['name']) && $value['name'] != '') {
1009
+		    	$data['source_name'] = $value['name'];
1010
+		    }
728 1011
 		    $SI->add($data);
729 1012
 		    unset($data);
730 1013
 		}
@@ -760,8 +1043,12 @@  discard block
 block discarded – undo
760 1043
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
761 1044
 	    	    $data['format_source'] = 'planeupdatefaa';
762 1045
     		    $data['id_source'] = $id_source;
763
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
764
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1046
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1047
+		    	$data['noarchive'] = true;
1048
+		    }
1049
+		    if (isset($value['name']) && $value['name'] != '') {
1050
+		    	$data['source_name'] = $value['name'];
1051
+		    }
765 1052
 		    $SI->add($data);
766 1053
 		    unset($data);
767 1054
 		}
@@ -790,7 +1077,9 @@  discard block
 block discarded – undo
790 1077
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
791 1078
 	    	    $data['format_source'] = 'opensky';
792 1079
     		    $data['id_source'] = $id_source;
793
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1080
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1081
+		    	$data['noarchive'] = true;
1082
+		    }
794 1083
 		    $SI->add($data);
795 1084
 		    unset($data);
796 1085
 		}
@@ -802,7 +1091,9 @@  discard block
 block discarded – undo
802 1091
 	    //$buffer = $Common->getData($hosts[$id]);
803 1092
 	    $buffer = $Common->getData($value['host']);
804 1093
 	    $all_data = json_decode($buffer,true);
805
-	    if (!empty($all_data)) $reset = 0;
1094
+	    if (!empty($all_data)) {
1095
+	    	$reset = 0;
1096
+	    }
806 1097
 	    foreach ($all_data as $key => $line) {
807 1098
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
808 1099
 		    $data = array();
@@ -823,8 +1114,12 @@  discard block
 block discarded – undo
823 1114
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
824 1115
 	    	    $data['format_source'] = 'fr24json';
825 1116
     		    $data['id_source'] = $id_source;
826
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
827
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1117
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1118
+		    	$data['noarchive'] = true;
1119
+		    }
1120
+		    if (isset($value['name']) && $value['name'] != '') {
1121
+		    	$data['source_name'] = $value['name'];
1122
+		    }
828 1123
 		    $SI->add($data);
829 1124
 		    unset($data);
830 1125
 		}
@@ -848,24 +1143,42 @@  discard block
 block discarded – undo
848 1143
 		    if (isset($line['inf'])) {
849 1144
 			$data = array();
850 1145
 			$data['hex'] = $line['inf']['ia'];
851
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
1146
+			if (isset($line['inf']['cs'])) {
1147
+				$data['ident'] = $line['inf']['cs'];
1148
+			}
1149
+			//$line[13]
852 1150
 	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
853
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
854
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
1151
+	    		if (isset($line['inf']['gs'])) {
1152
+	    			$data['speed'] = round($line['inf']['gs']*0.539957);
1153
+	    		}
1154
+	    		// speed
1155
+	    		if (isset($line['inf']['tr'])) {
1156
+	    			$data['heading'] = $line['inf']['tr'];
1157
+	    		}
1158
+	    		// heading
855 1159
 	    		$data['latitude'] = $line['pt'][0]; // lat
856 1160
 	    		$data['longitude'] = $line['pt'][1]; // long
857 1161
 	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
858
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
1162
+	    		if (isset($line['inf']['sq'])) {
1163
+	    			$data['squawk'] = $line['inf']['sq'];
1164
+	    		}
1165
+	    		// squawk
859 1166
 	    		//$data['aircraft_icao'] = $line[8];
860
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
1167
+	    		if (isset($line['inf']['rc'])) {
1168
+	    			$data['registration'] = $line['inf']['rc'];
1169
+	    		}
861 1170
 			//$data['departure_airport_iata'] = $line[11];
862 1171
 			//$data['arrival_airport_iata'] = $line[12];
863 1172
 	    		//$data['emergency'] = ''; // emergency
864 1173
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
865 1174
 	    		$data['format_source'] = 'radarvirtueljson';
866 1175
     			$data['id_source'] = $id_source;
867
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
868
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1176
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1177
+				$data['noarchive'] = true;
1178
+			}
1179
+			if (isset($value['name']) && $value['name'] != '') {
1180
+				$data['source_name'] = $value['name'];
1181
+			}
869 1182
 			$SI->add($data);
870 1183
 			unset($data);
871 1184
 		    }
@@ -886,30 +1199,65 @@  discard block
 block discarded – undo
886 1199
 		    $data['id'] = $line['id'];
887 1200
 		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
888 1201
 		    $data['ident'] = $line['callsign']; // ident
889
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
890
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
891
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
892
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
893
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
894
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1202
+		    if (isset($line['pilotid'])) {
1203
+		    	$data['pilot_id'] = $line['pilotid'];
1204
+		    }
1205
+		    // pilot id
1206
+		    if (isset($line['name'])) {
1207
+		    	$data['pilot_name'] = $line['name'];
1208
+		    }
1209
+		    // pilot name
1210
+		    if (isset($line['alt'])) {
1211
+		    	$data['altitude'] = $line['alt'];
1212
+		    }
1213
+		    // altitude
1214
+		    if (isset($line['gs'])) {
1215
+		    	$data['speed'] = $line['gs'];
1216
+		    }
1217
+		    // speed
1218
+		    if (isset($line['heading'])) {
1219
+		    	$data['heading'] = $line['heading'];
1220
+		    }
1221
+		    // heading
1222
+		    if (isset($line['route'])) {
1223
+		    	$data['waypoints'] = $line['route'];
1224
+		    }
1225
+		    // route
895 1226
 		    $data['latitude'] = $line['lat']; // lat
896 1227
 		    $data['longitude'] = $line['lon']; // long
897 1228
 		    //$data['verticalrate'] = $line['vrt']; // verticale rate
898 1229
 		    //$data['squawk'] = $line['squawk']; // squawk
899 1230
 		    //$data['emergency'] = ''; // emergency
900
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
901
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
902
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
1231
+		    if (isset($line['depicao'])) {
1232
+		    	$data['departure_airport_icao'] = $line['depicao'];
1233
+		    }
1234
+		    if (isset($line['deptime'])) {
1235
+		    	$data['departure_airport_time'] = $line['deptime'];
1236
+		    }
1237
+		    if (isset($line['arricao'])) {
1238
+		    	$data['arrival_airport_icao'] = $line['arricao'];
1239
+		    }
903 1240
 		    //$data['arrival_airport_time'] = $line['arrtime'];
904
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
905
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
906
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
907
-		    else $data['info'] = '';
1241
+		    if (isset($line['aircraft'])) {
1242
+		    	$data['aircraft_icao'] = $line['aircraft'];
1243
+		    }
1244
+		    if (isset($line['transponder'])) {
1245
+		    	$data['squawk'] = $line['transponder'];
1246
+		    }
1247
+		    if (isset($line['atis'])) {
1248
+		    	$data['info'] = $line['atis'];
1249
+		    } else {
1250
+		    	$data['info'] = '';
1251
+		    }
908 1252
 		    $data['format_source'] = 'pireps';
909 1253
     		    $data['id_source'] = $id_source;
910 1254
 		    $data['datetime'] = date('Y-m-d H:i:s');
911
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
912
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1255
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1256
+		    	$data['noarchive'] = true;
1257
+		    }
1258
+		    if (isset($value['name']) && $value['name'] != '') {
1259
+		    	$data['source_name'] = $value['name'];
1260
+		    }
913 1261
 		    if ($line['icon'] == 'plane') {
914 1262
 			$SI->add($data);
915 1263
 		    //    print_r($data);
@@ -918,16 +1266,28 @@  discard block
 block discarded – undo
918 1266
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
919 1267
 			$typec = substr($data['ident'],-3);
920 1268
 			$data['type'] = '';
921
-			if ($typec == 'APP') $data['type'] = 'Approach';
922
-			elseif ($typec == 'TWR') $data['type'] = 'Tower';
923
-			elseif ($typec == 'OBS') $data['type'] = 'Observer';
924
-			elseif ($typec == 'GND') $data['type'] = 'Ground';
925
-			elseif ($typec == 'DEL') $data['type'] = 'Delivery';
926
-			elseif ($typec == 'DEP') $data['type'] = 'Departure';
927
-			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
928
-			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
929
-			else $data['type'] = 'Observer';
930
-			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']);
1269
+			if ($typec == 'APP') {
1270
+				$data['type'] = 'Approach';
1271
+			} elseif ($typec == 'TWR') {
1272
+				$data['type'] = 'Tower';
1273
+			} elseif ($typec == 'OBS') {
1274
+				$data['type'] = 'Observer';
1275
+			} elseif ($typec == 'GND') {
1276
+				$data['type'] = 'Ground';
1277
+			} elseif ($typec == 'DEL') {
1278
+				$data['type'] = 'Delivery';
1279
+			} elseif ($typec == 'DEP') {
1280
+				$data['type'] = 'Departure';
1281
+			} elseif ($typec == 'FSS') {
1282
+				$data['type'] = 'Flight Service Station';
1283
+			} elseif ($typec == 'CTR') {
1284
+				$data['type'] = 'Control Radar or Centre';
1285
+			} else {
1286
+				$data['type'] = 'Observer';
1287
+			}
1288
+			if (isset($ATC)) {
1289
+				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']);
1290
+			}
931 1291
 		    }
932 1292
 		    unset($data);
933 1293
 		}
@@ -937,7 +1297,9 @@  discard block
 block discarded – undo
937 1297
     	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
938 1298
     	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
939 1299
 	    //$buffer = $Common->getData($hosts[$id]);
940
-	    if ($globalDebug) echo 'Get Data...'."\n";
1300
+	    if ($globalDebug) {
1301
+	    	echo 'Get Data...'."\n";
1302
+	    }
941 1303
 	    $buffer = $Common->getData($value['host']);
942 1304
 	    $all_data = json_decode($buffer,true);
943 1305
 	    if ($buffer != '' && is_array($all_data)) {
@@ -945,10 +1307,16 @@  discard block
 block discarded – undo
945 1307
 		foreach ($all_data as $line) {
946 1308
 	    	    $data = array();
947 1309
 	    	    //$data['id'] = $line['id']; // id not usable
948
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1310
+	    	    if (isset($line['pilotid'])) {
1311
+	    	    	$data['id'] = $line['pilotid'].$line['flightnum'];
1312
+	    	    }
949 1313
 	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
950
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
951
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1314
+	    	    if (isset($line['pilotname'])) {
1315
+	    	    	$data['pilot_name'] = $line['pilotname'];
1316
+	    	    }
1317
+	    	    if (isset($line['pilotid'])) {
1318
+	    	    	$data['pilot_id'] = $line['pilotid'];
1319
+	    	    }
952 1320
 	    	    $data['ident'] = $line['flightnum']; // ident
953 1321
 	    	    $data['altitude'] = $line['alt']; // altitude
954 1322
 	    	    $data['speed'] = $line['gs']; // speed
@@ -966,28 +1334,44 @@  discard block
 block discarded – undo
966 1334
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
967 1335
     		    $data['arrival_airport_time'] = $line['arrtime'];
968 1336
     		    $data['registration'] = $line['aircraft'];
969
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
970
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1337
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1338
+		    	$data['noarchive'] = true;
1339
+		    }
1340
+		    if (isset($line['route'])) {
1341
+		    	$data['waypoints'] = $line['route'];
1342
+		    }
1343
+		    // route
971 1344
 		    if (isset($line['aircraftname'])) {
972 1345
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
973 1346
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
974 1347
 	    		$aircraft_data = explode('-',$line['aircraftname']);
975
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
976
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
977
-	    		else {
1348
+	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) {
1349
+	    			$data['aircraft_icao'] = $aircraft_data[0];
1350
+	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) {
1351
+	    			$data['aircraft_icao'] = $aircraft_data[1];
1352
+	    		} else {
978 1353
 	    		    $aircraft_data = explode(' ',$line['aircraftname']);
979
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
980
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1354
+	    		    if (isset($aircraft_data[1])) {
1355
+	    		    	$data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1356
+	    		    } else {
1357
+	    		    	$data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1358
+	    		    }
981 1359
 	    		}
982 1360
 	    	    }
983
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
1361
+    		    if (isset($line['route'])) {
1362
+    		    	$data['waypoints'] = $line['route'];
1363
+    		    }
984 1364
     		    $data['id_source'] = $id_source;
985 1365
 	    	    $data['format_source'] = 'phpvmacars';
986
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1366
+		    if (isset($value['name']) && $value['name'] != '') {
1367
+		    	$data['source_name'] = $value['name'];
1368
+		    }
987 1369
 		    $SI->add($data);
988 1370
 		    unset($data);
989 1371
 		}
990
-		if ($globalDebug) echo 'No more data...'."\n";
1372
+		if ($globalDebug) {
1373
+			echo 'No more data...'."\n";
1374
+		}
991 1375
 		unset($buffer);
992 1376
 		unset($all_data);
993 1377
 	    }
@@ -995,7 +1379,9 @@  discard block
 block discarded – undo
995 1379
     	    $last_exec[$id]['last'] = time();
996 1380
     	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
997 1381
 	    //$buffer = $Common->getData($hosts[$id]);
998
-	    if ($globalDebug) echo 'Get Data...'."\n";
1382
+	    if ($globalDebug) {
1383
+	    	echo 'Get Data...'."\n";
1384
+	    }
999 1385
 	    $buffer = $Common->getData($value['host']);
1000 1386
 	    $all_data = json_decode($buffer,true);
1001 1387
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1024,16 +1410,25 @@  discard block
 block discarded – undo
1024 1410
 	    	    $data['arrival_airport_icao'] = $line['arrival'];
1025 1411
     		    //$data['arrival_airport_time'] = $line['arrival_time'];
1026 1412
     		    //$data['registration'] = $line['aircraft'];
1027
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1413
+		    if (isset($line['route'])) {
1414
+		    	$data['waypoints'] = $line['route'];
1415
+		    }
1416
+		    // route
1028 1417
 	    	    $data['aircraft_icao'] = $line['plane_type'];
1029 1418
     		    $data['id_source'] = $id_source;
1030 1419
 	    	    $data['format_source'] = 'vam';
1031
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1032
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1420
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1421
+		    	$data['noarchive'] = true;
1422
+		    }
1423
+		    if (isset($value['name']) && $value['name'] != '') {
1424
+		    	$data['source_name'] = $value['name'];
1425
+		    }
1033 1426
 		    $SI->add($data);
1034 1427
 		    unset($data);
1035 1428
 		}
1036
-		if ($globalDebug) echo 'No more data...'."\n";
1429
+		if ($globalDebug) {
1430
+			echo 'No more data...'."\n";
1431
+		}
1037 1432
 		unset($buffer);
1038 1433
 		unset($all_data);
1039 1434
 	    }
@@ -1041,7 +1436,9 @@  discard block
 block discarded – undo
1041 1436
     	    $last_exec[$id]['last'] = time();
1042 1437
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
1043 1438
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') {
1044
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1439
+	    if (function_exists('pcntl_fork')) {
1440
+	    	pcntl_signal_dispatch();
1441
+	    }
1045 1442
     	    //$last_exec[$id]['last'] = time();
1046 1443
 
1047 1444
 	    //$read = array( $sockets[$id] );
@@ -1049,7 +1446,9 @@  discard block
 block discarded – undo
1049 1446
 	    $write = NULL;
1050 1447
 	    $e = NULL;
1051 1448
 	    $n = socket_select($read, $write, $e, $timeout);
1052
-	    if ($e != NULL) var_dump($e);
1449
+	    if ($e != NULL) {
1450
+	    	var_dump($e);
1451
+	    }
1053 1452
 	    if ($n > 0) {
1054 1453
 		$reset = 0;
1055 1454
 		foreach ($read as $nb => $r) {
@@ -1070,12 +1469,16 @@  discard block
 block discarded – undo
1070 1469
 		    //$SI::del();
1071 1470
 		    if ($format == 'vrstcp') {
1072 1471
 			$buffer = explode('},{',$buffer);
1073
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1472
+		    } else {
1473
+		    	$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1474
+		    }
1074 1475
 		    // SBS format is CSV format
1075 1476
 		    if ($buffer !== FALSE && $buffer != '') {
1076 1477
 			$tt[$format] = 0;
1077 1478
 			if ($format == 'acarssbs3') {
1078
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1479
+			    if ($globalDebug) {
1480
+			    	echo 'ACARS : '.$buffer."\n";
1481
+			    }
1079 1482
 			    $ACARS->add(trim($buffer));
1080 1483
 			    $ACARS->deleteLiveAcarsData();
1081 1484
 			} elseif ($format == 'raw') {
@@ -1084,30 +1487,70 @@  discard block
 block discarded – undo
1084 1487
 			    if (is_array($data)) {
1085 1488
 				$data['datetime'] = date('Y-m-d H:i:s');
1086 1489
 				$data['format_source'] = 'raw';
1087
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1088
-				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1089
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1090
-				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1490
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1491
+					$data['source_name'] = $globalSources[$nb]['name'];
1492
+				}
1493
+				if (isset($globalSources[$nb]['sourcestats'])) {
1494
+					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1495
+				}
1496
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1497
+					$data['noarchive'] = true;
1498
+				}
1499
+				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1500
+					$SI->add($data);
1501
+				}
1091 1502
 			    }
1092 1503
 			} elseif ($format == 'ais') {
1093 1504
 			    $ais_data = $AIS->parse_line(trim($buffer));
1094 1505
 			    $data = array();
1095
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1096
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1097
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1098
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1099
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1100
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1101
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1102
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1103
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1104
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1105
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1106
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1107
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1108
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1109
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1110
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1506
+			    if (isset($ais_data['ident'])) {
1507
+			    	$data['ident'] = $ais_data['ident'];
1508
+			    }
1509
+			    if (isset($ais_data['mmsi'])) {
1510
+			    	$data['mmsi'] = $ais_data['mmsi'];
1511
+			    }
1512
+			    if (isset($ais_data['speed'])) {
1513
+			    	$data['speed'] = $ais_data['speed'];
1514
+			    }
1515
+			    if (isset($ais_data['heading'])) {
1516
+			    	$data['heading'] = $ais_data['heading'];
1517
+			    }
1518
+			    if (isset($ais_data['latitude'])) {
1519
+			    	$data['latitude'] = $ais_data['latitude'];
1520
+			    }
1521
+			    if (isset($ais_data['longitude'])) {
1522
+			    	$data['longitude'] = $ais_data['longitude'];
1523
+			    }
1524
+			    if (isset($ais_data['status'])) {
1525
+			    	$data['status'] = $ais_data['status'];
1526
+			    }
1527
+			    if (isset($ais_data['statusid'])) {
1528
+			    	$data['status_id'] = $ais_data['statusid'];
1529
+			    }
1530
+			    if (isset($ais_data['type'])) {
1531
+			    	$data['type'] = $ais_data['type'];
1532
+			    }
1533
+			    if (isset($ais_data['imo'])) {
1534
+			    	$data['imo'] = $ais_data['imo'];
1535
+			    }
1536
+			    if (isset($ais_data['callsign'])) {
1537
+			    	$data['callsign'] = $ais_data['callsign'];
1538
+			    }
1539
+			    if (isset($ais_data['destination'])) {
1540
+			    	$data['arrival_code'] = $ais_data['destination'];
1541
+			    }
1542
+			    if (isset($ais_data['eta_ts'])) {
1543
+			    	$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1544
+			    }
1545
+			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1546
+			    	$data['noarchive'] = true;
1547
+			    }
1548
+			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1549
+			    	$data['source_name'] = $globalSources[$nb]['name'];
1550
+			    }
1551
+			    if (isset($globalSources[$nb]['sourcestats'])) {
1552
+			    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1553
+			    }
1111 1554
 
1112 1555
 			    if (isset($ais_data['timestamp'])) {
1113 1556
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
@@ -1116,7 +1559,9 @@  discard block
 block discarded – undo
1116 1559
 			    }
1117 1560
 			    $data['format_source'] = 'aisnmea';
1118 1561
     			    $data['id_source'] = $id_source;
1119
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1562
+			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
1563
+			    	$MI->add($data);
1564
+			    }
1120 1565
 			    unset($data);
1121 1566
                         } elseif ($format == 'flightgearsp') {
1122 1567
                     	    //echo $buffer."\n";
@@ -1134,12 +1579,18 @@  discard block
 block discarded – undo
1134 1579
 				$data['speed'] = round($line[5]*1.94384);
1135 1580
 				$data['datetime'] = date('Y-m-d H:i:s');
1136 1581
 				$data['format_source'] = 'flightgearsp';
1137
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1138
-				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1582
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1583
+					$data['noarchive'] = true;
1584
+				}
1585
+				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1586
+					$SI->add($data);
1587
+				}
1139 1588
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1140 1589
 			    }
1141 1590
                         } elseif ($format == 'acars') {
1142
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1591
+                    	    if ($globalDebug) {
1592
+                    	    	echo 'ACARS : '.$buffer."\n";
1593
+                    	    }
1143 1594
 			    $ACARS->add(trim($buffer));
1144 1595
 			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1145 1596
 			    $ACARS->deleteLiveAcarsData();
@@ -1160,8 +1611,12 @@  discard block
 block discarded – undo
1160 1611
 				    $aircraft_type = $line[10];
1161 1612
 				    $aircraft_type = preg_split(':/:',$aircraft_type);
1162 1613
 				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1163
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1164
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1614
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1615
+				    	$data['noarchive'] = true;
1616
+				    }
1617
+				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1618
+				    	$SI->add($data);
1619
+				    }
1165 1620
 				}
1166 1621
 			    }
1167 1622
 			} elseif ($format == 'beast') {
@@ -1171,28 +1626,62 @@  discard block
 block discarded – undo
1171 1626
 			    foreach($buffer as $all_data) {
1172 1627
 				$line = json_decode('{'.$all_data.'}',true);
1173 1628
 				$data = array();
1174
-				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1175
-				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
1176
-				if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
1177
-				if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
1178
-				if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
1179
-				if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
1180
-				if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
1629
+				if (isset($line['Icao'])) {
1630
+					$data['hex'] = $line['Icao'];
1631
+				}
1632
+				// hex
1633
+				if (isset($line['Call'])) {
1634
+					$data['ident'] = $line['Call'];
1635
+				}
1636
+				// ident
1637
+				if (isset($line['Alt'])) {
1638
+					$data['altitude'] = $line['Alt'];
1639
+				}
1640
+				// altitude
1641
+				if (isset($line['Spd'])) {
1642
+					$data['speed'] = $line['Spd'];
1643
+				}
1644
+				// speed
1645
+				if (isset($line['Trak'])) {
1646
+					$data['heading'] = $line['Trak'];
1647
+				}
1648
+				// heading
1649
+				if (isset($line['Lat'])) {
1650
+					$data['latitude'] = $line['Lat'];
1651
+				}
1652
+				// lat
1653
+				if (isset($line['Long'])) {
1654
+					$data['longitude'] = $line['Long'];
1655
+				}
1656
+				// long
1181 1657
 				//$data['verticalrate'] = $line['']; // verticale rate
1182
-				if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
1658
+				if (isset($line['Sqk'])) {
1659
+					$data['squawk'] = $line['Sqk'];
1660
+				}
1661
+				// squawk
1183 1662
 				$data['emergency'] = ''; // emergency
1184
-				if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
1663
+				if (isset($line['Reg'])) {
1664
+					$data['registration'] = $line['Reg'];
1665
+				}
1185 1666
 				/*
1186 1667
 				if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
1187 1668
 				else $data['datetime'] = date('Y-m-d H:i:s');
1188 1669
 				*/
1189 1670
 				$data['datetime'] = date('Y-m-d H:i:s');
1190
-				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1671
+				if (isset($line['Type'])) {
1672
+					$data['aircraft_icao'] = $line['Type'];
1673
+				}
1191 1674
 		    		$data['format_source'] = 'vrstcp';
1192 1675
 				$data['id_source'] = $id_source;
1193
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1194
-				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1195
-				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1676
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1677
+					$data['noarchive'] = true;
1678
+				}
1679
+				if (isset($value['name']) && $value['name'] != '') {
1680
+					$data['source_name'] = $value['name'];
1681
+				}
1682
+				if (isset($data['latitude']) && isset($data['hex'])) {
1683
+					$SI->add($data);
1684
+				}
1196 1685
 				unset($data);
1197 1686
 			    }
1198 1687
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
@@ -1205,22 +1694,46 @@  discard block
 block discarded – undo
1205 1694
     				$data['hex'] = $lined['hexid'];
1206 1695
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1207 1696
     				$data['datetime'] = date('Y-m-d H:i:s');;
1208
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1209
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1210
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1211
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1212
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1213
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1214
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1697
+    				if (isset($lined['ident'])) {
1698
+    					$data['ident'] = $lined['ident'];
1699
+    				}
1700
+    				if (isset($lined['lat'])) {
1701
+    					$data['latitude'] = $lined['lat'];
1702
+    				}
1703
+    				if (isset($lined['lon'])) {
1704
+    					$data['longitude'] = $lined['lon'];
1705
+    				}
1706
+    				if (isset($lined['speed'])) {
1707
+    					$data['speed'] = $lined['speed'];
1708
+    				}
1709
+    				if (isset($lined['squawk'])) {
1710
+    					$data['squawk'] = $lined['squawk'];
1711
+    				}
1712
+    				if (isset($lined['alt'])) {
1713
+    					$data['altitude'] = $lined['alt'];
1714
+    				}
1715
+    				if (isset($lined['heading'])) {
1716
+    					$data['heading'] = $lined['heading'];
1717
+    				}
1215 1718
     				$data['id_source'] = $id_source;
1216 1719
     				$data['format_source'] = 'tsv';
1217
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1218
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1219
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1220
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1720
+    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1721
+    					$data['source_name'] = $globalSources[$nb]['name'];
1722
+    				}
1723
+    				if (isset($globalSources[$nb]['sourcestats'])) {
1724
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1725
+    				}
1726
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1727
+					$data['noarchive'] = true;
1728
+				}
1729
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1730
+    					$SI->add($data);
1731
+    				}
1221 1732
     				unset($lined);
1222 1733
     				unset($data);
1223
-    			    } else $error = true;
1734
+    			    } else {
1735
+    			    	$error = true;
1736
+    			    }
1224 1737
 			} elseif ($format == 'aprs' && $use_aprs) {
1225 1738
 			    if ($aprs_connect == 0) {
1226 1739
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
@@ -1245,39 +1758,86 @@  discard block
 block discarded – undo
1245 1758
 				    $aprs_last_tx = time();
1246 1759
 				    $data = array();
1247 1760
 				    //print_r($line);
1248
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1249
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1250
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1251
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1252
-				    if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1253
-				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1254
-				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1255
-				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1256
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1257
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1761
+				    if (isset($line['address'])) {
1762
+				    	$data['hex'] = $line['address'];
1763
+				    }
1764
+				    if (isset($line['mmsi'])) {
1765
+				    	$data['mmsi'] = $line['mmsi'];
1766
+				    }
1767
+				    if (isset($line['imo'])) {
1768
+				    	$data['imo'] = $line['imo'];
1769
+				    }
1770
+				    if (isset($line['squawk'])) {
1771
+				    	$data['squawk'] = $line['squawk'];
1772
+				    }
1773
+				    if (isset($line['arrival_code'])) {
1774
+				    	$data['arrical_code'] = $line['arrival_code'];
1775
+				    }
1776
+				    if (isset($line['arrival_date'])) {
1777
+				    	$data['arrical_date'] = $line['arrival_date'];
1778
+				    }
1779
+				    if (isset($line['type_id'])) {
1780
+				    	$data['type_id'] = $line['typeid'];
1781
+				    }
1782
+				    if (isset($line['status_id'])) {
1783
+				    	$data['status_id'] = $line['statusid'];
1784
+				    }
1785
+				    if (isset($line['timestamp'])) {
1786
+				    	$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1787
+				    } else {
1788
+				    	$data['datetime'] = date('Y-m-d H:i:s');
1789
+				    }
1258 1790
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1259
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1791
+				    if (isset($line['ident'])) {
1792
+				    	$data['ident'] = $line['ident'];
1793
+				    }
1260 1794
 				    $data['latitude'] = $line['latitude'];
1261 1795
 				    $data['longitude'] = $line['longitude'];
1262 1796
 				    //$data['verticalrate'] = $line[16];
1263
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1264
-				    else $data['speed'] = 0;
1265
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1266
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1267
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1268
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
1797
+				    if (isset($line['speed'])) {
1798
+				    	$data['speed'] = $line['speed'];
1799
+				    } else {
1800
+				    	$data['speed'] = 0;
1801
+				    }
1802
+				    if (isset($line['altitude'])) {
1803
+				    	$data['altitude'] = $line['altitude'];
1804
+				    }
1805
+				    if (isset($line['comment'])) {
1806
+				    	$data['comment'] = $line['comment'];
1807
+				    }
1808
+				    if (isset($line['symbol'])) {
1809
+				    	$data['type'] = $line['symbol'];
1810
+				    }
1811
+				    if (isset($line['heading'])) {
1812
+				    	$data['heading'] = $line['heading'];
1813
+				    }
1269 1814
 				    //else $data['heading'] = 0;
1270
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1271
-				    if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1272
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1273
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1815
+				    if (isset($line['stealth'])) {
1816
+				    	$data['aircraft_type'] = $line['stealth'];
1817
+				    }
1818
+				    if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) {
1819
+				    	$data['noarchive'] = true;
1820
+				    }
1821
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1822
+				    	$data['noarchive'] = true;
1823
+				    } elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) {
1824
+				    	$data['noarchive'] = false;
1825
+				    }
1274 1826
     				    $data['id_source'] = $id_source;
1275
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1276
-				    else $data['format_source'] = 'aprs';
1827
+    				    if (isset($line['format_source'])) {
1828
+    				    	$data['format_source'] = $line['format_source'];
1829
+    				    } else {
1830
+				    	$data['format_source'] = 'aprs';
1831
+				    }
1277 1832
 				    $data['source_name'] = $line['source'];
1278
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1279
-				    else $data['source_type'] = 'flarm';
1280
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1833
+				    if (isset($line['source_type'])) {
1834
+				    	$data['source_type'] = $line['source_type'];
1835
+				    } else {
1836
+				    	$data['source_type'] = 'flarm';
1837
+				    }
1838
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
1839
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1840
+    				    }
1281 1841
 				    $currentdate = date('Y-m-d H:i:s');
1282 1842
 				    $aprsdate = strtotime($data['datetime']);
1283 1843
 				    // Accept data if time <= system time + 20s
@@ -1285,21 +1845,26 @@  discard block
 block discarded – undo
1285 1845
 				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1286 1846
 					$send = $SI->add($data);
1287 1847
 				    } elseif ($data['source_type'] == 'ais') {
1288
-					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
1848
+					if (isset($globalMarine) && $globalMarine) {
1849
+						$send = $MI->add($data);
1850
+					}
1289 1851
 				    } elseif (isset($line['stealth'])) {
1290
-					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1291
-					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1852
+					if ($line['stealth'] != 0) {
1853
+						echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1854
+					} else {
1855
+						echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1856
+					}
1292 1857
 				    //} 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')) {
1293 1858
 				    } 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') {
1294 1859
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1295
-					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1860
+					if (isset($globalTracker) && $globalTracker) {
1861
+						$send = $TI->add($data);
1862
+					}
1296 1863
 				    }
1297 1864
 				    unset($data);
1298
-				} 
1299
-				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1865
+				} elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1300 1866
 					echo '!! Weather Station not yet supported'."\n";
1301
-				}
1302
-				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) {
1867
+				} elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) {
1303 1868
 					echo '!! Car & Trucks not yet supported'."\n";
1304 1869
 				}
1305 1870
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
@@ -1332,26 +1897,45 @@  discard block
 block discarded – undo
1332 1897
     				$data['ground'] = $line[21];
1333 1898
     				$data['emergency'] = $line[19];
1334 1899
     				$data['format_source'] = 'sbs';
1335
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1336
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1337
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1900
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1901
+					$data['source_name'] = $globalSources[$nb]['name'];
1902
+				}
1903
+    				if (isset($globalSources[$nb]['sourcestats'])) {
1904
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1905
+    				}
1906
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1907
+					$data['noarchive'] = true;
1908
+				}
1338 1909
     				$data['id_source'] = $id_source;
1339
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1340
-    				else $error = true;
1910
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1911
+    					$send = $SI->add($data);
1912
+    				} else {
1913
+    					$error = true;
1914
+    				}
1341 1915
     				unset($data);
1342
-    			    } else $error = true;
1916
+    			    } else {
1917
+    			    	$error = true;
1918
+    			    }
1343 1919
 			    if ($error) {
1344 1920
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
1345
-					if ($globalDebug) echo "Not a message. Ignoring... \n";
1921
+					if ($globalDebug) {
1922
+						echo "Not a message. Ignoring... \n";
1923
+					}
1346 1924
 				} else {
1347
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
1925
+					if ($globalDebug) {
1926
+						echo "Wrong line format. Ignoring... \n";
1927
+					}
1348 1928
 					if ($globalDebug) {
1349 1929
 						echo $buffer;
1350 1930
 						//print_r($line);
1351 1931
 					}
1352 1932
 					//socket_close($r);
1353
-					if ($globalDebug) echo "Reconnect after an error...\n";
1354
-					if ($format == 'aprs') $aprs_connect = 0;
1933
+					if ($globalDebug) {
1934
+						echo "Reconnect after an error...\n";
1935
+					}
1936
+					if ($format == 'aprs') {
1937
+						$aprs_connect = 0;
1938
+					}
1355 1939
 					$sourceer[$nb] = $globalSources[$nb];
1356 1940
 					connect_all($sourceer);
1357 1941
 					$sourceer = array();
@@ -1359,10 +1943,14 @@  discard block
 block discarded – undo
1359 1943
 			    }
1360 1944
 			}
1361 1945
 			// Sleep for xxx microseconds
1362
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1946
+			if (isset($globalSBSSleep)) {
1947
+				usleep($globalSBSSleep);
1948
+			}
1363 1949
 		    } else {
1364 1950
 			if ($format == 'flightgearmp') {
1365
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1951
+			    	if ($globalDebug) {
1952
+			    		echo "Reconnect FlightGear MP...";
1953
+			    	}
1366 1954
 				//@socket_close($r);
1367 1955
 				sleep($globalMinFetch);
1368 1956
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1371,10 +1959,15 @@  discard block
 block discarded – undo
1371 1959
 				break;
1372 1960
 				
1373 1961
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1374
-			    if (isset($tt[$format])) $tt[$format]++;
1375
-			    else $tt[$format] = 0;
1962
+			    if (isset($tt[$format])) {
1963
+			    	$tt[$format]++;
1964
+			    } else {
1965
+			    	$tt[$format] = 0;
1966
+			    }
1376 1967
 			    if ($tt[$format] > 30) {
1377
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1968
+				if ($globalDebug) {
1969
+					echo "ERROR : Reconnect ".$format."...";
1970
+				}
1378 1971
 				//@socket_close($r);
1379 1972
 				sleep(2);
1380 1973
 				$aprs_connect = 0;
@@ -1391,11 +1984,17 @@  discard block
 block discarded – undo
1391 1984
 	    } else {
1392 1985
 		$error = socket_strerror(socket_last_error());
1393 1986
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1394
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1395
-			if (isset($globalDebug)) echo "Restarting...\n";
1987
+			if ($globalDebug) {
1988
+				echo "ERROR : socket_select give this error ".$error . "\n";
1989
+			}
1990
+			if (isset($globalDebug)) {
1991
+				echo "Restarting...\n";
1992
+			}
1396 1993
 			// Restart the script if possible
1397 1994
 			if (is_array($sockets)) {
1398
-			    if ($globalDebug) echo "Shutdown all sockets...";
1995
+			    if ($globalDebug) {
1996
+			    	echo "Shutdown all sockets...";
1997
+			    }
1399 1998
 			    
1400 1999
 			    foreach ($sockets as $sock) {
1401 2000
 				@socket_shutdown($sock,2);
@@ -1403,22 +2002,36 @@  discard block
 block discarded – undo
1403 2002
 			    }
1404 2003
 			    
1405 2004
 			}
1406
-			if ($globalDebug) echo "Waiting...";
2005
+			if ($globalDebug) {
2006
+				echo "Waiting...";
2007
+			}
1407 2008
 			sleep(2);
1408 2009
 			$time = time();
1409 2010
 			//connect_all($hosts);
1410 2011
 			$aprs_connect = 0;
1411
-			if ($reset%5 == 0) sleep(20);
1412
-			if ($reset%10 == 0) sleep(100);
1413
-			if ($reset%20 == 0) sleep(200);
1414
-			if ($reset > 100) exit('Too many attempts...');
1415
-			if ($globalDebug) echo "Restart all connections...";
2012
+			if ($reset%5 == 0) {
2013
+				sleep(20);
2014
+			}
2015
+			if ($reset%10 == 0) {
2016
+				sleep(100);
2017
+			}
2018
+			if ($reset%20 == 0) {
2019
+				sleep(200);
2020
+			}
2021
+			if ($reset > 100) {
2022
+				exit('Too many attempts...');
2023
+			}
2024
+			if ($globalDebug) {
2025
+				echo "Restart all connections...";
2026
+			}
1416 2027
 			connect_all($globalSources);
1417 2028
 		}
1418 2029
 	    }
1419 2030
 	}
1420 2031
 	if ($globalDaemon === false) {
1421
-	    if ($globalDebug) echo 'Check all...'."\n";
2032
+	    if ($globalDebug) {
2033
+	    	echo 'Check all...'."\n";
2034
+	    }
1422 2035
 	    $SI->checkAll();
1423 2036
 	}
1424 2037
     }
Please login to merge, or discard this patch.