Completed
Push — master ( cf0b6f...6e68de )
by Yannick
14:21 queued 01:24
created
require/class.SpotterImport.php 1 patch
Indentation   +403 added lines, -403 removed lines patch added patch discarded remove patch
@@ -8,20 +8,20 @@  discard block
 block discarded – undo
8 8
 require_once(dirname(__FILE__).'/class.Stats.php');
9 9
 require_once(dirname(__FILE__).'/class.Source.php');
10 10
 if (isset($globalServerAPRS) && $globalServerAPRS) {
11
-    require_once(dirname(__FILE__).'/class.APRS.php');
11
+	require_once(dirname(__FILE__).'/class.APRS.php');
12 12
 }
13 13
 
14 14
 class SpotterImport {
15
-    private $all_flights = array();
16
-    private $last_delete_hourly = 0;
17
-    private $last_delete = 0;
18
-    private $stats = array();
19
-    private $tmd = 0;
20
-    private $source_location = array();
21
-    public $db = null;
22
-    public $nb = 0;
23
-
24
-    public function __construct($dbc = null) {
15
+	private $all_flights = array();
16
+	private $last_delete_hourly = 0;
17
+	private $last_delete = 0;
18
+	private $stats = array();
19
+	private $tmd = 0;
20
+	private $source_location = array();
21
+	public $db = null;
22
+	public $nb = 0;
23
+
24
+	public function __construct($dbc = null) {
25 25
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB;
26 26
 	if (!(isset($globalNoDB) && $globalNoDB)) {
27 27
 		$Connection = new Connection($dbc);
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
 		$currentdate = date('Y-m-d');
34 34
 		$sourcestat = $Stats->getStatsSource($currentdate);
35 35
 		if (!empty($sourcestat)) {
36
-		    foreach($sourcestat as $srcst) {
37
-		    	$type = $srcst['stats_type'];
36
+			foreach($sourcestat as $srcst) {
37
+				$type = $srcst['stats_type'];
38 38
 			if ($type == 'polar' || $type == 'hist') {
39
-			    $source = $srcst['source_name'];
40
-			    $data = $srcst['source_data'];
41
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
42
-	    		}
43
-		    }
39
+				$source = $srcst['source_name'];
40
+				$data = $srcst['source_data'];
41
+				$this->stats[$currentdate][$source][$type] = json_decode($data,true);
42
+				}
43
+			}
44 44
 		}
45 45
 	}
46 46
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
 		//$APRSSpotter->connect();
49 49
 	}
50 50
 
51
-    }
51
+	}
52 52
 
53
-    public function get_Schedule($id,$ident) {
53
+	public function get_Schedule($id,$ident) {
54 54
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
55 55
 	// Get schedule here, so it's done only one time
56 56
 	
@@ -70,42 +70,42 @@  discard block
 block discarded – undo
70 70
 	$operator = $Spotter->getOperator($ident);
71 71
 	$scheduleexist = false;
72 72
 	if ($Schedule->checkSchedule($operator) == 0) {
73
-	    $operator = $Translation->checkTranslation($ident);
74
-	    if ($Schedule->checkSchedule($operator) == 0) {
73
+		$operator = $Translation->checkTranslation($ident);
74
+		if ($Schedule->checkSchedule($operator) == 0) {
75 75
 		$schedule = $Schedule->fetchSchedule($operator);
76 76
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
77
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80
-		    // Should also check if route schedule = route from DB
81
-		    if ($schedule['DepartureAirportIATA'] != '') {
77
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80
+			// Should also check if route schedule = route from DB
81
+			if ($schedule['DepartureAirportIATA'] != '') {
82 82
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
83
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84
-			    if (trim($airport_icao) != '') {
83
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84
+				if (trim($airport_icao) != '') {
85 85
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
86 86
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
87
-			    }
87
+				}
88
+			}
88 89
 			}
89
-		    }
90
-		    if ($schedule['ArrivalAirportIATA'] != '') {
90
+			if ($schedule['ArrivalAirportIATA'] != '') {
91 91
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
92
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93
-			    if (trim($airport_icao) != '') {
92
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93
+				if (trim($airport_icao) != '') {
94 94
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
95 95
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
96
-			    }
96
+				}
97 97
 			}
98
-		    }
99
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
98
+			}
99
+			$Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
100 100
 		}
101
-	    } else $scheduleexist = true;
101
+		} else $scheduleexist = true;
102 102
 	} else $scheduleexist = true;
103 103
 	// close connection, at least one way will work ?
104
-       if ($scheduleexist) {
104
+	   if ($scheduleexist) {
105 105
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
106
-    		$sch = $Schedule->getSchedule($operator);
106
+			$sch = $Schedule->getSchedule($operator);
107 107
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
108
-       }
108
+	   }
109 109
 	$Spotter->db = null;
110 110
 	$Schedule->db = null;
111 111
 	$Translation->db = null;
@@ -120,96 +120,96 @@  discard block
 block discarded – undo
120 120
 	}
121 121
 	  */
122 122
 	}
123
-    }
123
+	}
124 124
 
125
-    public function checkAll() {
125
+	public function checkAll() {
126 126
 	global $globalDebug, $globalNoImport;
127 127
 	if ($globalDebug) echo "Update last seen flights data...\n";
128 128
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
129
-	    foreach ($this->all_flights as $key => $flight) {
129
+		foreach ($this->all_flights as $key => $flight) {
130 130
 		if (isset($this->all_flights[$key]['id'])) {
131
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132
-    		    $Spotter = new Spotter($this->db);
133
-        	    $real_arrival = $this->arrival($key);
134
-        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
135
-        	}
136
-	    }
131
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132
+				$Spotter = new Spotter($this->db);
133
+				$real_arrival = $this->arrival($key);
134
+				if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
135
+			}
136
+		}
137
+	}
137 138
 	}
138
-    }
139 139
 
140
-    public function arrival($key) {
140
+	public function arrival($key) {
141 141
 	global $globalClosestMinDist, $globalDebug;
142 142
 	if ($globalDebug) echo 'Update arrival...'."\n";
143 143
 	$Spotter = new Spotter($this->db);
144
-        $airport_icao = '';
145
-        $airport_time = '';
146
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
144
+		$airport_icao = '';
145
+		$airport_time = '';
146
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
147 147
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
148
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149
-    	    if (isset($closestAirports[0])) {
150
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151
-        	    $airport_icao = $closestAirports[0]['icao'];
152
-        	    $airport_time = $this->all_flights[$key]['datetime'];
153
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155
-        	    foreach ($closestAirports as $airport) {
156
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157
-        		    $airport_icao = $airport['icao'];
158
-        		    $airport_time = $this->all_flights[$key]['datetime'];
159
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160
-        		    break;
161
-        		}
162
-        	    }
163
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
164
-        		$airport_icao = $closestAirports[0]['icao'];
165
-        		$airport_time = $this->all_flights[$key]['datetime'];
166
-        	} else {
167
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168
-        	}
169
-    	    } else {
170
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171
-    	    }
172
-
173
-        } else {
174
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175
-        }
176
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177
-    }
178
-
179
-
180
-
181
-    public function del() {
148
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149
+			if (isset($closestAirports[0])) {
150
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151
+				$airport_icao = $closestAirports[0]['icao'];
152
+				$airport_time = $this->all_flights[$key]['datetime'];
153
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155
+				foreach ($closestAirports as $airport) {
156
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157
+					$airport_icao = $airport['icao'];
158
+					$airport_time = $this->all_flights[$key]['datetime'];
159
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160
+					break;
161
+				}
162
+				}
163
+			} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
164
+				$airport_icao = $closestAirports[0]['icao'];
165
+				$airport_time = $this->all_flights[$key]['datetime'];
166
+			} else {
167
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168
+			}
169
+			} else {
170
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171
+			}
172
+
173
+		} else {
174
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175
+		}
176
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177
+	}
178
+
179
+
180
+
181
+	public function del() {
182 182
 	global $globalDebug, $globalNoImport, $globalNoDB;
183 183
 	// Delete old infos
184 184
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
185 185
 	foreach ($this->all_flights as $key => $flight) {
186
-    	    if (isset($flight['lastupdate'])) {
187
-        	if ($flight['lastupdate'] < (time()-3000)) {
188
-            	    if (isset($this->all_flights[$key]['id'])) {
189
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
186
+			if (isset($flight['lastupdate'])) {
187
+			if ($flight['lastupdate'] < (time()-3000)) {
188
+					if (isset($this->all_flights[$key]['id'])) {
189
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
190 190
 			/*
191 191
 			$SpotterLive = new SpotterLive();
192 192
             		$SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']);
193 193
 			$SpotterLive->db = null;
194 194
 			*/
195 195
 			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
196
-            		    $real_arrival = $this->arrival($key);
197
-            		    $Spotter = new Spotter($this->db);
198
-            	    	    if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
196
+						$real_arrival = $this->arrival($key);
197
+						$Spotter = new Spotter($this->db);
198
+							if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
199 199
 				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
200 200
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
201
-			    }
201
+				}
202 202
 			// Put in archive
203 203
 //				$Spotter->db = null;
204 204
 			}
205
-            	    }
206
-            	    unset($this->all_flights[$key]);
207
-    	        }
208
-	    }
209
-        }
210
-    }
205
+					}
206
+					unset($this->all_flights[$key]);
207
+				}
208
+		}
209
+		}
210
+	}
211 211
 
212
-    public function add($line) {
212
+	public function add($line) {
213 213
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA;
214 214
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
215 215
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
@@ -234,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' => '', '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' => '', '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
-		    }
306
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
307
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
305
+			}
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,36 +361,36 @@  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
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
378
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
377
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
378
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
379 379
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
380
-			    $timeelapsed = microtime(true);
381
-            		    $Spotter = new Spotter($this->db);
382
-            		    $fromsource = NULL;
383
-            		    if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
384
-            		    elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
385
-			    elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
386
-			    elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
387
-			    elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
388
-            		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
389
-			    if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
390
-			    $Spotter->db = null;
391
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
392
-			}
393
-		    }
380
+				$timeelapsed = microtime(true);
381
+						$Spotter = new Spotter($this->db);
382
+						$fromsource = NULL;
383
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
384
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
385
+				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
386
+				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
387
+				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
388
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
389
+				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
390
+				$Spotter->db = null;
391
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
392
+			}
393
+			}
394 394
 
395 395
 /*
396 396
 		    if (!isset($line['id'])) {
@@ -400,104 +400,104 @@  discard block
 block discarded – undo
400 400
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
401 401
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
402 402
   */
403
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
403
+			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']));
404 404
 
405
-		    //$putinarchive = true;
406
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
405
+			//$putinarchive = true;
406
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
407 407
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
408
-		    }
409
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
408
+			}
409
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
410 410
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
411
-		    }
412
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
413
-		    		$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' => ''));
414
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
411
+			}
412
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
413
+					$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' => ''));
414
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
415 415
 			$timeelapsed = microtime(true);
416 416
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
417 417
 				$Spotter = new Spotter($this->db);
418 418
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
419 419
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
420
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
420
+					$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' => ''));
421 421
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
422
-                        }
423
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
422
+						}
423
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
424 424
 			$timeelapsed = microtime(true);
425 425
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
426
-			    $Spotter = new Spotter($this->db);
427
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
428
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
426
+				$Spotter = new Spotter($this->db);
427
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
428
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
429 429
 				$Translation = new Translation($this->db);
430 430
 				$ident = $Translation->checkTranslation(trim($line['ident']));
431 431
 				$route = $Spotter->getRouteInfo($ident);
432 432
 				$Translation->db = null;
433
-			    }
434
-			    $Spotter->db = null;
435
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
436
-                    	}
433
+				}
434
+				$Spotter->db = null;
435
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
436
+						}
437 437
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
438
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
439
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
438
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
439
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
440 440
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
441
-		    		$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']));
442
-		    	    }
441
+					$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']));
442
+					}
443 443
 			}
444 444
 			if (!isset($globalFork)) $globalFork = TRUE;
445 445
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
446 446
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
447 447
 			}
448
-		    }
448
+			}
449 449
 		}
450 450
 
451 451
 		if (isset($line['speed']) && $line['speed'] != '') {
452 452
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
453
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
454
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
455
-		    //$dataFound = true;
453
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
454
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
455
+			//$dataFound = true;
456 456
 		} 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'])) {
457
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
458
-		    if ($distance > 1000 && $distance < 10000) {
459
-		    // use datetime
457
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
458
+			if ($distance > 1000 && $distance < 10000) {
459
+			// use datetime
460 460
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
461 461
 			$speed = $speed*3.6;
462 462
 			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
463 463
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
464
-		    }
464
+			}
465 465
 		}
466 466
 
467 467
 
468 468
 
469
-	        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'])) {
470
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
471
-	    	    else unset($timediff);
472
-	    	    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')))) {
469
+			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'])) {
470
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
471
+				else unset($timediff);
472
+				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')))) {
473 473
 			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'])) {
474
-			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
474
+				if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
475 475
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
476 476
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
477 477
 				$this->all_flights[$id]['putinarchive'] = true;
478 478
 				$this->tmd = 0;
479 479
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
480
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
481
-				    $timeelapsed = microtime(true);
482
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
480
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
481
+					$timeelapsed = microtime(true);
482
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
483 483
 					$Spotter = new Spotter($this->db);
484 484
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
485 485
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
486 486
 					$Spotter->db = null;
487 487
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
488 488
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
489
-				    }
489
+					}
490
+				}
490 491
 				}
491
-			    }
492 492
 			}
493 493
 
494 494
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
495
-			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
495
+				//if (!isset($this->all_flights[$id]['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) {
496 496
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
497 497
 				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') {
498
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
499
-				    $dataFound = true;
500
-				    $this->all_flights[$id]['time_last_coord'] = time();
498
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
499
+					$dataFound = true;
500
+					$this->all_flights[$id]['time_last_coord'] = time();
501 501
 				}
502 502
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
503 503
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
@@ -508,20 +508,20 @@  discard block
 block discarded – undo
508 508
 				    //$putinarchive = true;
509 509
 				}
510 510
 				*/
511
-			    /*
511
+				/*
512 512
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
513 513
 				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";
514 514
 			    }
515 515
 			    */
516 516
 			}
517 517
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
518
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
519
-			    //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) {
518
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
519
+				//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) {
520 520
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
521 521
 				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') {
522
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
523
-				    $dataFound = true;
524
-				    $this->all_flights[$id]['time_last_coord'] = time();
522
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
523
+					$dataFound = true;
524
+					$this->all_flights[$id]['time_last_coord'] = time();
525 525
 				}
526 526
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
527 527
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
@@ -539,95 +539,95 @@  discard block
 block discarded – undo
539 539
 			    */
540 540
 			}
541 541
 
542
-		    } else if ($globalDebug && $timediff > 30) {
542
+			} else if ($globalDebug && $timediff > 30) {
543 543
 			$this->tmd = $this->tmd + 1;
544 544
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
545 545
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
546 546
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
547 547
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
548
-		    }
548
+			}
549 549
 		}
550 550
 		if (isset($line['last_update']) && $line['last_update'] != '') {
551
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
552
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
551
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
552
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
553 553
 		}
554 554
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
555
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
556
-		    //$dataFound = true;
555
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
556
+			//$dataFound = true;
557 557
 		}
558 558
 		if (isset($line['format_source']) && $line['format_source'] != '') {
559
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
559
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
560 560
 		}
561 561
 		if (isset($line['source_name']) && $line['source_name'] != '') {
562
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
562
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
563 563
 		}
564 564
 		if (isset($line['emergency']) && $line['emergency'] != '') {
565
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
566
-		    //$dataFound = true;
565
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
566
+			//$dataFound = true;
567 567
 		}
568 568
 		if (isset($line['ground']) && $line['ground'] != '') {
569
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
569
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
570 570
 			// Here we force archive of flight because after ground it's a new one (or should be)
571 571
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
572 572
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
573 573
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
574
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
574
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
575 575
 			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']));
576
-		    }
577
-		    if ($line['ground'] != 1) $line['ground'] = 0;
578
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
579
-		    //$dataFound = true;
576
+			}
577
+			if ($line['ground'] != 1) $line['ground'] = 0;
578
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
579
+			//$dataFound = true;
580 580
 		}
581 581
 		if (isset($line['squawk']) && $line['squawk'] != '') {
582
-		    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'])) {
583
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
584
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
585
-			    $highlight = '';
586
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
587
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
588
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
589
-			    if ($highlight != '') {
582
+			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'])) {
583
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
584
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
585
+				$highlight = '';
586
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
587
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
588
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
589
+				if ($highlight != '') {
590 590
 				$timeelapsed = microtime(true);
591 591
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
592
-				    $Spotter = new Spotter($this->db);
593
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
594
-				    $Spotter->db = null;
595
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
592
+					$Spotter = new Spotter($this->db);
593
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
594
+					$Spotter->db = null;
595
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
596 596
 				}
597 597
 				//$putinarchive = true;
598 598
 				//$highlight = '';
599
-			    }
599
+				}
600 600
 			    
601
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
602
-		    //$dataFound = true;
601
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
602
+			//$dataFound = true;
603 603
 		}
604 604
 
605 605
 		if (isset($line['altitude']) && $line['altitude'] != '') {
606
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
606
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
607 607
 			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;
608 608
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
609 609
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
610 610
 			//$dataFound = true;
611
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
611
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
612 612
   		}
613 613
 
614 614
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
615
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
615
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
616 616
 		}
617 617
 		
618 618
 		if (isset($line['heading']) && $line['heading'] != '') {
619
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
620
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
621
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
622
-		    //$dataFound = true;
619
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
620
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
621
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
622
+			//$dataFound = true;
623 623
   		} 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']) {
624
-  		    $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']);
625
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
626
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
627
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
624
+  			$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']);
625
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
626
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
627
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
628 628
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
629
-  		    // If not enough messages and ACARS set heading to 0
630
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
629
+  			// If not enough messages and ACARS set heading to 0
630
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
631 631
   		}
632 632
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
633 633
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -638,125 +638,125 @@  discard block
 block discarded – undo
638 638
 		//if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
639 639
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
640 640
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
641
-		    $this->all_flights[$id]['lastupdate'] = time();
642
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
643
-		        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'])) {
644
-			    //print_r($this->all_flights);
645
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
646
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
647
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
641
+			$this->all_flights[$id]['lastupdate'] = time();
642
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
643
+				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'])) {
644
+				//print_r($this->all_flights);
645
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
646
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
647
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
648 648
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
649
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
650
-				    $timeelapsed = microtime(true);
651
-				    $SpotterLive = new SpotterLive($this->db);
652
-				    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')) {
649
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
650
+					$timeelapsed = microtime(true);
651
+					$SpotterLive = new SpotterLive($this->db);
652
+					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')) {
653 653
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
654 654
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
655
-				    } elseif (isset($line['id'])) {
655
+					} elseif (isset($line['id'])) {
656 656
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
657 657
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
658
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
658
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
659 659
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
660 660
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
661
-				    } else $recent_ident = '';
662
-				    $SpotterLive->db=null;
663
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
664
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
661
+					} else $recent_ident = '';
662
+					$SpotterLive->db=null;
663
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
664
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
665 665
 				} else $recent_ident = '';
666
-			    } else {
666
+				} else {
667 667
 				$recent_ident = '';
668 668
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
669
-			    }
670
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
671
-			    if($recent_ident == "")
672
-			    {
669
+				}
670
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
671
+				if($recent_ident == "")
672
+				{
673 673
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
674 674
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
675 675
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
676 676
 				//adds the spotter data for the archive
677 677
 				$ignoreImport = false;
678 678
 				foreach($globalAirportIgnore as $airportIgnore) {
679
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
679
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
680 680
 					$ignoreImport = true;
681
-				    }
681
+					}
682 682
 				}
683 683
 				if (count($globalAirportAccept) > 0) {
684
-				    $ignoreImport = true;
685
-				    foreach($globalAirportIgnore as $airportIgnore) {
684
+					$ignoreImport = true;
685
+					foreach($globalAirportIgnore as $airportIgnore) {
686 686
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
687
-					    $ignoreImport = false;
687
+						$ignoreImport = false;
688
+					}
688 689
 					}
689
-				    }
690 690
 				}
691 691
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
692
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
692
+					foreach($globalAirlineIgnore as $airlineIgnore) {
693 693
 					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)) {
694
-					    $ignoreImport = true;
694
+						$ignoreImport = true;
695
+					}
695 696
 					}
696
-				    }
697 697
 				}
698 698
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
699
-				    $ignoreImport = true;
700
-				    foreach($globalAirlineAccept as $airlineAccept) {
699
+					$ignoreImport = true;
700
+					foreach($globalAirlineAccept as $airlineAccept) {
701 701
 					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)) {
702
-					    $ignoreImport = false;
702
+						$ignoreImport = false;
703
+					}
703 704
 					}
704
-				    }
705 705
 				}
706 706
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
707
-				    $ignoreImport = true;
708
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
707
+					$ignoreImport = true;
708
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
709 709
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
710
-					    $ignoreImport = false;
710
+						$ignoreImport = false;
711
+					}
711 712
 					}
712
-				    }
713 713
 				}
714 714
 				
715 715
 				if (!$ignoreImport) {
716
-				    $highlight = '';
717
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
718
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
719
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
720
-				    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')));
721
-				    $timeelapsed = microtime(true);
722
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
716
+					$highlight = '';
717
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
718
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
719
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
720
+					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')));
721
+					$timeelapsed = microtime(true);
722
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
723 723
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
724
-					    $Spotter = new Spotter($this->db);
725
-					    $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']);
726
-					    $Spotter->db = null;
727
-					    if ($globalDebug && isset($result)) echo $result."\n";
724
+						$Spotter = new Spotter($this->db);
725
+						$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']);
726
+						$Spotter->db = null;
727
+						if ($globalDebug && isset($result)) echo $result."\n";
728
+					}
728 729
 					}
729
-				    }
730
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
731
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
730
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
731
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
732 732
 
733
-				    // Add source stat in DB
734
-				    $Stats = new Stats($this->db);
735
-				    if (!empty($this->stats)) {
733
+					// Add source stat in DB
734
+					$Stats = new Stats($this->db);
735
+					if (!empty($this->stats)) {
736 736
 					if ($globalDebug) echo 'Add source stats : ';
737
-				        foreach($this->stats as $date => $data) {
738
-					    foreach($data as $source => $sourced) {
739
-					        //print_r($sourced);
740
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
741
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
742
-				    		if (isset($sourced['msg'])) {
743
-				    		    if (time() - $sourced['msg']['date'] > 10) {
744
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
745
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
746
-			    			        unset($this->stats[$date][$source]['msg']);
747
-			    			    }
748
-			    			}
749
-			    		    }
750
-			    		    if ($date != date('Y-m-d')) {
751
-			    			unset($this->stats[$date]);
752
-			    		    }
753
-				    	}
754
-				    	if ($globalDebug) echo 'Done'."\n";
755
-
756
-				    }
757
-				    $Stats->db = null;
758
-				    }
759
-				    $this->del();
737
+						foreach($this->stats as $date => $data) {
738
+						foreach($data as $source => $sourced) {
739
+							//print_r($sourced);
740
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
741
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
742
+							if (isset($sourced['msg'])) {
743
+								if (time() - $sourced['msg']['date'] > 10) {
744
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
745
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
746
+									unset($this->stats[$date][$source]['msg']);
747
+								}
748
+							}
749
+							}
750
+							if ($date != date('Y-m-d')) {
751
+							unset($this->stats[$date]);
752
+							}
753
+						}
754
+						if ($globalDebug) echo 'Done'."\n";
755
+
756
+					}
757
+					$Stats->db = null;
758
+					}
759
+					$this->del();
760 760
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
761 761
 				//$ignoreImport = false;
762 762
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -774,41 +774,41 @@  discard block
 block discarded – undo
774 774
 			*/
775 775
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
776 776
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
777
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
778
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
779
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
777
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
778
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
779
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
780 780
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
781
-					    $SpotterLive = new SpotterLive($this->db);
782
-					    $SpotterLive->deleteLiveSpotterData();
783
-					    $SpotterLive->db=null;
781
+						$SpotterLive = new SpotterLive($this->db);
782
+						$SpotterLive->deleteLiveSpotterData();
783
+						$SpotterLive->db=null;
784
+					}
784 785
 					}
785
-				    }
786
-				    if ($globalDebug) echo " Done\n";
787
-				    $this->last_delete = time();
786
+					if ($globalDebug) echo " Done\n";
787
+					$this->last_delete = time();
788 788
 				}
789
-			    } else {
789
+				} else {
790 790
 				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')) {
791
-				    $this->all_flights[$id]['id'] = $recent_ident;
792
-				    $this->all_flights[$id]['addedSpotter'] = 1;
791
+					$this->all_flights[$id]['id'] = $recent_ident;
792
+					$this->all_flights[$id]['addedSpotter'] = 1;
793 793
 				}
794 794
 				if (isset($globalDaemon) && !$globalDaemon) {
795
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
795
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
796 796
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
797
-					    $Spotter = new Spotter($this->db);
798
-					    $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']);
799
-					    $Spotter->db = null;
797
+						$Spotter = new Spotter($this->db);
798
+						$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']);
799
+						$Spotter->db = null;
800
+					}
800 801
 					}
801
-				    }
802 802
 				}
803 803
 				
804
-			    }
804
+				}
805
+			}
805 806
 			}
806
-		    }
807
-		    //adds the spotter LIVE data
808
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
809
-		    //echo "\nAdd in Live !! \n";
810
-		    //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";
811
-		    if ($globalDebug) {
807
+			//adds the spotter LIVE data
808
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
809
+			//echo "\nAdd in Live !! \n";
810
+			//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";
811
+			if ($globalDebug) {
812 812
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
813 813
 				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";
814 814
 				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";
@@ -816,60 +816,60 @@  discard block
 block discarded – undo
816 816
 				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";
817 817
 				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";
818 818
 			}
819
-		    }
820
-		    $ignoreImport = false;
821
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
822
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
819
+			}
820
+			$ignoreImport = false;
821
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
822
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
823 823
 
824
-		    foreach($globalAirportIgnore as $airportIgnore) {
825
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
826
-			    $ignoreImport = true;
824
+			foreach($globalAirportIgnore as $airportIgnore) {
825
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
826
+				$ignoreImport = true;
827 827
 			}
828
-		    }
829
-		    if (count($globalAirportAccept) > 0) {
830
-		        $ignoreImport = true;
831
-		        foreach($globalAirportIgnore as $airportIgnore) {
832
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
828
+			}
829
+			if (count($globalAirportAccept) > 0) {
830
+				$ignoreImport = true;
831
+				foreach($globalAirportIgnore as $airportIgnore) {
832
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
833 833
 				$ignoreImport = false;
834
-			    }
834
+				}
835
+			}
835 836
 			}
836
-		    }
837
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
837
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
838 838
 			foreach($globalAirlineIgnore as $airlineIgnore) {
839
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
839
+				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)) {
840 840
 				$ignoreImport = true;
841
-			    }
841
+				}
842 842
 			}
843
-		    }
844
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
843
+			}
844
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
845 845
 			$ignoreImport = true;
846 846
 			foreach($globalAirlineAccept as $airlineAccept) {
847
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
847
+				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)) {
848 848
 				$ignoreImport = false;
849
-			    }
849
+				}
850
+			}
850 851
 			}
851
-		    }
852
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
852
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
853 853
 			$ignoreImport = true;
854 854
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
855
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
856
-			        $ignoreImport = false;
857
-			    }
855
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
856
+					$ignoreImport = false;
857
+				}
858
+			}
858 859
 			}
859
-		    }
860 860
 
861
-		    if (!$ignoreImport) {
861
+			if (!$ignoreImport) {
862 862
 			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'])) {
863 863
 				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')));
864 864
 				$timeelapsed = microtime(true);
865 865
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
866
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
866
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
867 867
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
868 868
 					$SpotterLive = new SpotterLive($this->db);
869 869
 					$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']);
870 870
 					$SpotterLive->db = null;
871 871
 					if ($globalDebug) echo $result."\n";
872
-				    }
872
+					}
873 873
 				}
874 874
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
875 875
 					$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']);
@@ -881,7 +881,7 @@  discard block
 block discarded – undo
881 881
 				//if ($line['format_source'] != 'aprs') {
882 882
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
883 883
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
884
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
884
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
885 885
 					$source = $this->all_flights[$id]['source_name'];
886 886
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
887 887
 					if (!isset($this->source_location[$source])) {
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
 					if ($stats_heading == 16) $stats_heading = 0;
908 908
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
909 909
 						for ($i=0;$i<=15;$i++) {
910
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
910
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
911 911
 						}
912 912
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
913 913
 					} else {
@@ -920,17 +920,17 @@  discard block
 block discarded – undo
920 920
 					//var_dump($this->stats);
921 921
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
922 922
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
923
-						    end($this->stats[$current_date][$source]['hist']);
924
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
923
+							end($this->stats[$current_date][$source]['hist']);
924
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
925 925
 						} else $mini = 0;
926 926
 						for ($i=$mini;$i<=$distance;$i+=10) {
927
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
927
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
928 928
 						}
929 929
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
930 930
 					} else {
931 931
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
932 932
 					}
933
-				    }
933
+					}
934 934
 				}
935 935
 
936 936
 				$this->all_flights[$id]['lastupdate'] = time();
@@ -940,7 +940,7 @@  discard block
 block discarded – undo
940 940
 			//$this->del();
941 941
 			
942 942
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
943
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
943
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
944 944
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
945 945
 				$SpotterLive = new SpotterLive($this->db);
946 946
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
@@ -948,19 +948,19 @@  discard block
 block discarded – undo
948 948
 				//SpotterLive->deleteLiveSpotterData();
949 949
 				if ($globalDebug) echo " Done\n";
950 950
 				$this->last_delete_hourly = time();
951
-			    } else {
951
+				} else {
952 952
 				$this->del();
953 953
 				$this->last_delete_hourly = time();
954
-			    }
954
+				}
955 955
 			}
956 956
 			
957
-		    }
958
-		    //$ignoreImport = false;
957
+			}
958
+			//$ignoreImport = false;
959 959
 		}
960 960
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
961 961
 		if ($send) return $this->all_flights[$id];
962
-	    }
962
+		}
963
+	}
963 964
 	}
964
-    }
965 965
 }
966 966
 ?>
Please login to merge, or discard this patch.
require/class.TrackerImport.php 1 patch
Indentation   +175 added lines, -175 removed lines patch added patch discarded remove patch
@@ -7,16 +7,16 @@  discard block
 block discarded – undo
7 7
 require_once(dirname(__FILE__).'/class.Source.php');
8 8
 
9 9
 class TrackerImport {
10
-    private $all_tracked = array();
11
-    private $last_delete_hourly = 0;
12
-    private $last_delete = 0;
13
-    private $stats = array();
14
-    private $tmd = 0;
15
-    private $source_location = array();
16
-    public $db = null;
17
-    public $nb = 0;
10
+	private $all_tracked = array();
11
+	private $last_delete_hourly = 0;
12
+	private $last_delete = 0;
13
+	private $stats = array();
14
+	private $tmd = 0;
15
+	private $source_location = array();
16
+	public $db = null;
17
+	public $nb = 0;
18 18
 
19
-    public function __construct($dbc = null) {
19
+	public function __construct($dbc = null) {
20 20
 	global $globalBeta;
21 21
 	$Connection = new Connection($dbc);
22 22
 	$this->db = $Connection->db();
@@ -38,50 +38,50 @@  discard block
 block discarded – undo
38 38
 	    }
39 39
 	}
40 40
 	*/
41
-    }
41
+	}
42 42
 
43
-    public function checkAll() {
43
+	public function checkAll() {
44 44
 	global $globalDebug;
45 45
 	if ($globalDebug) echo "Update last seen tracked data...\n";
46 46
 	foreach ($this->all_tracked as $key => $flight) {
47
-	    if (isset($this->all_tracked[$key]['id'])) {
47
+		if (isset($this->all_tracked[$key]['id'])) {
48 48
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
49
-    		$Tracker = new Tracker($this->db);
50
-        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
51
-            }
49
+			$Tracker = new Tracker($this->db);
50
+			$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
51
+			}
52
+	}
52 53
 	}
53
-    }
54 54
 
55
-    public function del() {
55
+	public function del() {
56 56
 	global $globalDebug;
57 57
 	// Delete old infos
58 58
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
59 59
 	foreach ($this->all_tracked as $key => $flight) {
60
-    	    if (isset($flight['lastupdate'])) {
61
-        	if ($flight['lastupdate'] < (time()-3000)) {
62
-            	    if (isset($this->all_tracked[$key]['id'])) {
63
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
60
+			if (isset($flight['lastupdate'])) {
61
+			if ($flight['lastupdate'] < (time()-3000)) {
62
+					if (isset($this->all_tracked[$key]['id'])) {
63
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
64 64
 			/*
65 65
 			$TrackerLive = new TrackerLive();
66 66
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
67 67
 			$TrackerLive->db = null;
68 68
 			*/
69
-            		//$real_arrival = $this->arrival($key);
70
-            		$Tracker = new Tracker($this->db);
71
-            		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
69
+					//$real_arrival = $this->arrival($key);
70
+					$Tracker = new Tracker($this->db);
71
+					if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
72 72
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
73 73
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
74 74
 			}
75 75
 			// Put in archive
76 76
 //			$Tracker->db = null;
77
-            	    }
78
-            	    unset($this->all_tracked[$key]);
79
-    	        }
80
-	    }
81
-        }
82
-    }
77
+					}
78
+					unset($this->all_tracked[$key]);
79
+				}
80
+		}
81
+		}
82
+	}
83 83
 
84
-    public function add($line) {
84
+	public function add($line) {
85 85
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
86 86
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
87 87
 	date_default_timezone_set('UTC');
@@ -90,47 +90,47 @@  discard block
 block discarded – undo
90 90
 	
91 91
 	// SBS format is CSV format
92 92
 	if(is_array($line) && isset($line['ident'])) {
93
-	    //print_r($line);
94
-  	    if (isset($line['ident'])) {
93
+		//print_r($line);
94
+  		if (isset($line['ident'])) {
95 95
 
96 96
 		
97 97
 		// Increment message number
98 98
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
99
-		    $current_date = date('Y-m-d');
100
-		    if (isset($line['source_name'])) $source = $line['source_name'];
101
-		    else $source = '';
102
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
103
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
104
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
105
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
106
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
99
+			$current_date = date('Y-m-d');
100
+			if (isset($line['source_name'])) $source = $line['source_name'];
101
+			else $source = '';
102
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
103
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
104
+				$this->stats[$current_date][$source]['msg']['date'] = time();
105
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
106
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
107 107
 		}
108 108
 		
109 109
 		
110 110
 		$Common = new Common();
111
-	        if (!isset($line['id'])) $id = trim($line['ident']);
112
-	        else $id = trim($line['id']);
111
+			if (!isset($line['id'])) $id = trim($line['ident']);
112
+			else $id = trim($line['id']);
113 113
 		
114 114
 		if (!isset($this->all_tracked[$id])) {
115
-		    $this->all_tracked[$id] = array();
116
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
117
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
118
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
119
-		    if (!isset($line['id'])) {
115
+			$this->all_tracked[$id] = array();
116
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
117
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
118
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
119
+			if (!isset($line['id'])) {
120 120
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
121 121
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
122
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
123
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
122
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
123
+			if ($globalAllTracked !== FALSE) $dataFound = true;
124 124
 		}
125 125
 		
126 126
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
127
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
127
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
128 128
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
129
-		    } else {
129
+			} else {
130 130
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
131 131
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
132 132
 				return '';
133
-		    }
133
+			}
134 134
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
135 135
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
136 136
 			return '';
@@ -147,38 +147,38 @@  discard block
 block discarded – undo
147 147
 		
148 148
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
149 149
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
150
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
151
-		    if ($this->all_tracked[$id]['addedTracker'] == 1) {
150
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
151
+			if ($this->all_tracked[$id]['addedTracker'] == 1) {
152 152
 			$timeelapsed = microtime(true);
153
-            		$Tracker = new Tracker($this->db);
154
-            		$fromsource = NULL;
155
-            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
153
+					$Tracker = new Tracker($this->db);
154
+					$fromsource = NULL;
155
+					$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
156 156
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
157 157
 			$Tracker->db = null;
158 158
 			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
159
-		    }
160
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
159
+			}
160
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
161 161
 		}
162 162
 
163 163
 		if (isset($line['speed']) && $line['speed'] != '') {
164
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
165
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
164
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
165
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
166 166
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
167
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
168
-		    if ($distance > 100 && $distance < 10000) {
167
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
168
+			if ($distance > 100 && $distance < 10000) {
169 169
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
170 170
 			$speed = $speed*3.6;
171 171
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
172 172
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
173
-		    }
173
+			}
174 174
 		}
175 175
 
176
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
177
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
178
-	    	    else unset($timediff);
179
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
176
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
177
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
178
+				else unset($timediff);
179
+				if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
180 180
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
181
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
181
+				if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
182 182
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
183 183
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
184 184
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -192,160 +192,160 @@  discard block
 block discarded – undo
192 192
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
193 193
 				$this->tmd = 0;
194 194
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
195
-			    }
195
+				}
196 196
 			}
197 197
 
198 198
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
199 199
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
200 200
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
201
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
202
-				    $dataFound = true;
203
-				    $this->all_tracked[$id]['time_last_coord'] = time();
201
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
202
+					$dataFound = true;
203
+					$this->all_tracked[$id]['time_last_coord'] = time();
204 204
 				}
205 205
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
206 206
 			}
207 207
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
208
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
208
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
209 209
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
210 210
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
211
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
212
-				    $dataFound = true;
213
-				    $this->all_tracked[$id]['time_last_coord'] = time();
211
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
212
+					$dataFound = true;
213
+					$this->all_tracked[$id]['time_last_coord'] = time();
214 214
 				}
215 215
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
216 216
 			}
217 217
 
218
-		    } else if ($globalDebug && $timediff > 20) {
218
+			} else if ($globalDebug && $timediff > 20) {
219 219
 			$this->tmd = $this->tmd + 1;
220 220
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
221 221
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
222 222
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
223 223
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
224
-		    }
224
+			}
225 225
 		}
226 226
 		if (isset($line['last_update']) && $line['last_update'] != '') {
227
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
228
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
227
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
228
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
229 229
 		}
230 230
 		if (isset($line['format_source']) && $line['format_source'] != '') {
231
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
231
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
232 232
 		}
233 233
 		if (isset($line['source_name']) && $line['source_name'] != '') {
234
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
234
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
235 235
 		}
236 236
 		if (isset($line['comment']) && $line['comment'] != '') {
237
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
238
-		    //$dataFound = true;
237
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
238
+			//$dataFound = true;
239 239
 		}
240 240
 		if (isset($line['type']) && $line['type'] != '') {
241
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
242
-		    //$dataFound = true;
241
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
242
+			//$dataFound = true;
243 243
 		}
244 244
 
245 245
 		if (isset($line['altitude']) && $line['altitude'] != '') {
246
-		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
246
+			//if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
247 247
 			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
248 248
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => round($line['altitude']/100)));
249 249
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
250 250
 			//$dataFound = true;
251
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
251
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
252 252
   		}
253 253
 
254 254
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
255
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
255
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
256 256
 		}
257 257
 		
258 258
 		if (isset($line['heading']) && $line['heading'] != '') {
259
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
260
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
261
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
262
-		    //$dataFound = true;
259
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
260
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
261
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
262
+			//$dataFound = true;
263 263
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
264
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
265
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
266
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
267
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
264
+  			$heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
265
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
266
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
267
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
268 268
   		}
269 269
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
270 270
 
271 271
 		if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) {
272
-		    $this->all_tracked[$id]['lastupdate'] = time();
273
-		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
274
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
275
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
272
+			$this->all_tracked[$id]['lastupdate'] = time();
273
+			if ($this->all_tracked[$id]['addedTracker'] == 0) {
274
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
275
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
276 276
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
277 277
 				$timeelapsed = microtime(true);
278 278
 				$TrackerLive = new TrackerLive($this->db);
279 279
 				if (isset($line['id'])) {
280
-				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
281
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
280
+					$recent_ident = $TrackerLive->checkIdRecent($line['id']);
281
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
282 282
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
283
-				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
284
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
283
+					$recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
284
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
285 285
 				} else $recent_ident = '';
286 286
 				$TrackerLive->db=null;
287 287
 
288 288
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
289 289
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
290
-			    } else {
290
+				} else {
291 291
 				$recent_ident = '';
292 292
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
293
-			    }
294
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
295
-			    if($recent_ident == "")
296
-			    {
293
+				}
294
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
295
+				if($recent_ident == "")
296
+				{
297 297
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
298 298
 				//adds the spotter data for the archive
299
-				    $highlight = '';
300
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
301
-				    $timeelapsed = microtime(true);
302
-				    $Tracker = new Tracker($this->db);
303
-				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
304
-				    $Tracker->db = null;
305
-				    if ($globalDebug && isset($result)) echo $result."\n";
306
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
299
+					$highlight = '';
300
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
301
+					$timeelapsed = microtime(true);
302
+					$Tracker = new Tracker($this->db);
303
+					$result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
304
+					$Tracker->db = null;
305
+					if ($globalDebug && isset($result)) echo $result."\n";
306
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
307 307
 				    
308 308
 				    
309
-				    // Add source stat in DB
310
-				    $Stats = new Stats($this->db);
311
-				    if (!empty($this->stats)) {
309
+					// Add source stat in DB
310
+					$Stats = new Stats($this->db);
311
+					if (!empty($this->stats)) {
312 312
 					if ($globalDebug) echo 'Add source stats : ';
313
-				        foreach($this->stats as $date => $data) {
314
-					    foreach($data as $source => $sourced) {
315
-					        //print_r($sourced);
316
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
317
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
318
-				    		if (isset($sourced['msg'])) {
319
-				    		    if (time() - $sourced['msg']['date'] > 10) {
320
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
321
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
322
-			    			        unset($this->stats[$date][$source]['msg']);
323
-			    			    }
324
-			    			}
325
-			    		    }
326
-			    		    if ($date != date('Y-m-d')) {
327
-			    			unset($this->stats[$date]);
328
-			    		    }
329
-				    	}
330
-				    	if ($globalDebug) echo 'Done'."\n";
313
+						foreach($this->stats as $date => $data) {
314
+						foreach($data as $source => $sourced) {
315
+							//print_r($sourced);
316
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
317
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
318
+							if (isset($sourced['msg'])) {
319
+								if (time() - $sourced['msg']['date'] > 10) {
320
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
321
+									echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
322
+									unset($this->stats[$date][$source]['msg']);
323
+								}
324
+							}
325
+							}
326
+							if ($date != date('Y-m-d')) {
327
+							unset($this->stats[$date]);
328
+							}
329
+						}
330
+						if ($globalDebug) echo 'Done'."\n";
331 331
 
332
-				    }
333
-				    $Stats->db = null;
334
-				    */
335
-				    $this->del();
332
+					}
333
+					$Stats->db = null;
334
+					*/
335
+					$this->del();
336 336
 				//$ignoreImport = false;
337 337
 				$this->all_tracked[$id]['addedTracker'] = 1;
338 338
 				//print_r($this->all_tracked[$id]);
339 339
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
340
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
341
-				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
342
-				    $TrackerLive = new TrackerLive($this->db);
343
-				    $TrackerLive->deleteLiveTrackerData();
344
-				    $TrackerLive->db=null;
345
-				    if ($globalDebug) echo " Done\n";
346
-				    $this->last_delete = time();
340
+					if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
341
+					//TrackerLive->deleteLiveTrackerDataNotUpdated();
342
+					$TrackerLive = new TrackerLive($this->db);
343
+					$TrackerLive->deleteLiveTrackerData();
344
+					$TrackerLive->db=null;
345
+					if ($globalDebug) echo " Done\n";
346
+					$this->last_delete = time();
347 347
 				}
348
-			    } else {
348
+				} else {
349 349
 				$this->all_tracked[$id]['id'] = $recent_ident;
350 350
 				$this->all_tracked[$id]['addedTracker'] = 1;
351 351
 				if (isset($globalDaemon) && !$globalDaemon) {
@@ -354,16 +354,16 @@  discard block
 block discarded – undo
354 354
 					$Tracker->db = null;
355 355
 				}
356 356
 				
357
-			    }
357
+				}
358 358
 			}
359
-		    }
360
-		    //adds the spotter LIVE data
361
-		    if ($globalDebug) {
359
+			}
360
+			//adds the spotter LIVE data
361
+			if ($globalDebug) {
362 362
 			echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Altitude : '.$this->all_tracked[$id]['altitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n";
363
-		    }
364
-		    $ignoreImport = false;
363
+			}
364
+			$ignoreImport = false;
365 365
 
366
-		    if (!$ignoreImport) {
366
+			if (!$ignoreImport) {
367 367
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
368 368
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
369 369
 				$timeelapsed = microtime(true);
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 					if ($stats_heading == 16) $stats_heading = 0;
402 402
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
403 403
 						for ($i=0;$i<=15;$i++) {
404
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
404
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
405 405
 						}
406 406
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
407 407
 					} else {
@@ -414,11 +414,11 @@  discard block
 block discarded – undo
414 414
 					//var_dump($this->stats);
415 415
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
416 416
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
417
-						    end($this->stats[$current_date][$source]['hist']);
418
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
417
+							end($this->stats[$current_date][$source]['hist']);
418
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
419 419
 						} else $mini = 0;
420 420
 						for ($i=$mini;$i<=$distance;$i+=10) {
421
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
421
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
422 422
 						}
423 423
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
424 424
 					} else {
@@ -434,22 +434,22 @@  discard block
 block discarded – undo
434 434
 			
435 435
 			
436 436
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
437
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
438
-			    $TrackerLive = new TrackerLive($this->db);
439
-			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
440
-			    $TrackerLive->db = null;
441
-			    //TrackerLive->deleteLiveTrackerData();
442
-			    if ($globalDebug) echo " Done\n";
443
-			    $this->last_delete_hourly = time();
437
+				if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
438
+				$TrackerLive = new TrackerLive($this->db);
439
+				$TrackerLive->deleteLiveTrackerDataNotUpdated();
440
+				$TrackerLive->db = null;
441
+				//TrackerLive->deleteLiveTrackerData();
442
+				if ($globalDebug) echo " Done\n";
443
+				$this->last_delete_hourly = time();
444 444
 			}
445 445
 			
446
-		    }
447
-		    //$ignoreImport = false;
446
+			}
447
+			//$ignoreImport = false;
448 448
 		}
449 449
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
450 450
 		if ($send) return $this->all_tracked[$id];
451
-	    }
451
+		}
452
+	}
452 453
 	}
453
-    }
454 454
 }
455 455
 ?>
Please login to merge, or discard this patch.
require/class.MarineImport.php 1 patch
Indentation   +204 added lines, -204 removed lines patch added patch discarded remove patch
@@ -9,25 +9,25 @@  discard block
 block discarded – undo
9 9
 require_once(dirname(__FILE__).'/class.Stats.php');
10 10
 require_once(dirname(__FILE__).'/class.Source.php');
11 11
 if (isset($globalServerAPRS) && $globalServerAPRS) {
12
-    require_once(dirname(__FILE__).'/class.APRS.php');
12
+	require_once(dirname(__FILE__).'/class.APRS.php');
13 13
 }
14 14
 
15 15
 class MarineImport {
16
-    private $all_tracked = array();
17
-    private $last_delete_hourly = 0;
18
-    private $last_delete = 0;
19
-    private $stats = array();
20
-    private $tmd = 0;
21
-    private $source_location = array();
22
-    public $db = null;
23
-    public $nb = 0;
16
+	private $all_tracked = array();
17
+	private $last_delete_hourly = 0;
18
+	private $last_delete = 0;
19
+	private $stats = array();
20
+	private $tmd = 0;
21
+	private $source_location = array();
22
+	public $db = null;
23
+	public $nb = 0;
24 24
 
25
-    public function __construct($dbc = null) {
25
+	public function __construct($dbc = null) {
26 26
 	global $globalBeta, $globalServerAPRS, $APRSMarine, $globalNoDB;
27 27
 	if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
28
-	    $Connection = new Connection($dbc);
29
-	    $this->db = $Connection->db();
30
-	    date_default_timezone_set('UTC');
28
+		$Connection = new Connection($dbc);
29
+		$this->db = $Connection->db();
30
+		date_default_timezone_set('UTC');
31 31
 	}
32 32
 	// Get previous source stats
33 33
 	/*
@@ -46,55 +46,55 @@  discard block
 block discarded – undo
46 46
 	}
47 47
 	*/
48 48
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
49
-	    $APRSMarine = new APRSMarine();
50
-	    //$APRSSpotter->connect();
49
+		$APRSMarine = new APRSMarine();
50
+		//$APRSSpotter->connect();
51
+	}
51 52
 	}
52
-    }
53 53
 
54
-    public function checkAll() {
54
+	public function checkAll() {
55 55
 	global $globalDebug;
56 56
 	if ($globalDebug) echo "Update last seen tracked data...\n";
57 57
 	foreach ($this->all_tracked as $key => $flight) {
58
-	    if (isset($this->all_tracked[$key]['id'])) {
58
+		if (isset($this->all_tracked[$key]['id'])) {
59 59
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
60
-    		$Marine = new Marine($this->db);
61
-        	$Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
62
-            }
60
+			$Marine = new Marine($this->db);
61
+			$Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
62
+			}
63
+	}
63 64
 	}
64
-    }
65 65
 
66
-    public function del() {
66
+	public function del() {
67 67
 	global $globalDebug, $globalNoDB, $globalNoImport;
68 68
 	// Delete old infos
69 69
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
70 70
 	foreach ($this->all_tracked as $key => $flight) {
71
-    	    if (isset($flight['lastupdate'])) {
72
-        	if ($flight['lastupdate'] < (time()-3000)) {
73
-            	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
74
-            		if (isset($this->all_tracked[$key]['id'])) {
75
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
76
-			    /*
71
+			if (isset($flight['lastupdate'])) {
72
+			if ($flight['lastupdate'] < (time()-3000)) {
73
+					if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
74
+					if (isset($this->all_tracked[$key]['id'])) {
75
+						if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
76
+				/*
77 77
 			    $MarineLive = new MarineLive();
78 78
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
79 79
 			    $MarineLive->db = null;
80 80
 			    */
81
-            		    //$real_arrival = $this->arrival($key);
82
-            		    $Marine = new Marine($this->db);
83
-            		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
81
+						//$real_arrival = $this->arrival($key);
82
+						$Marine = new Marine($this->db);
83
+						if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
84 84
 				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
85 85
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
86
-			    }
87
-			    // Put in archive
86
+				}
87
+				// Put in archive
88 88
 //				$Marine->db = null;
89 89
 			}
90
-            	    }
91
-            	    unset($this->all_tracked[$key]);
92
-    	        }
93
-	    }
94
-        }
95
-    }
90
+					}
91
+					unset($this->all_tracked[$key]);
92
+				}
93
+		}
94
+		}
95
+	}
96 96
 
97
-    public function add($line) {
97
+	public function add($line) {
98 98
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
99 99
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
100 100
 	date_default_timezone_set('UTC');
@@ -103,83 +103,83 @@  discard block
 block discarded – undo
103 103
 	
104 104
 	// SBS format is CSV format
105 105
 	if(is_array($line) && isset($line['mmsi'])) {
106
-	    //print_r($line);
107
-  	    if (isset($line['mmsi'])) {
106
+		//print_r($line);
107
+  		if (isset($line['mmsi'])) {
108 108
 
109 109
 		
110 110
 		// Increment message number
111 111
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
112
-		    $current_date = date('Y-m-d');
113
-		    if (isset($line['source_name'])) $source = $line['source_name'];
114
-		    else $source = '';
115
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
116
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
117
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
118
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
119
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
112
+			$current_date = date('Y-m-d');
113
+			if (isset($line['source_name'])) $source = $line['source_name'];
114
+			else $source = '';
115
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
116
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
117
+				$this->stats[$current_date][$source]['msg']['date'] = time();
118
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
119
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
120 120
 		}
121 121
 		
122 122
 		
123 123
 		$Common = new Common();
124 124
 		$AIS = new AIS();
125
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
126
-	        else $id = trim($line['id']);
125
+			if (!isset($line['id'])) $id = trim($line['mmsi']);
126
+			else $id = trim($line['id']);
127 127
 		
128 128
 		if (!isset($this->all_tracked[$id])) {
129
-		    $this->all_tracked[$id] = array();
130
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
131
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
132
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
133
-		    if (!isset($line['id'])) {
129
+			$this->all_tracked[$id] = array();
130
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
131
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
132
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
133
+			if (!isset($line['id'])) {
134 134
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
135 135
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
136
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
137
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
136
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
137
+			if ($globalAllTracked !== FALSE) $dataFound = true;
138 138
 		}
139 139
 		
140 140
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
141
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
142
-		    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
141
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
142
+			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
143 143
 			$Marine = new Marine($this->db);
144 144
 			$identity = $Marine->getIdentity($line['mmsi']);
145 145
 			if (!empty($identity)) {
146
-			    $this->all_tracked[$id]['ident'] = $identity['ship_name'];
147
-			    $this->all_tracked[$id]['type'] = $identity['type'];
146
+				$this->all_tracked[$id]['ident'] = $identity['ship_name'];
147
+				$this->all_tracked[$id]['type'] = $identity['type'];
148 148
 			}
149 149
 			//print_r($identity);
150 150
 			unset($Marine);
151 151
 			//$dataFound = true;
152
-		    }
152
+			}
153 153
 		}
154 154
 		if (isset($line['type_id'])) {
155
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
155
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
156 156
 		}
157 157
 		if (isset($line['type']) && $line['type'] != '') {
158
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
158
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
159 159
 		}
160 160
 		if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') {
161
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
161
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
162 162
 		}
163 163
 		if (isset($line['imo']) && $line['imo'] != '') {
164
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
164
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
165 165
 		}
166 166
 		if (isset($line['callsign']) && $line['callsign'] != '') {
167
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
167
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
168 168
 		}
169 169
 		if (isset($line['arrival_code']) && $line['arrival_code'] != '') {
170
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
170
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
171 171
 		}
172 172
 		if (isset($line['arrival_date']) && $line['arrival_date'] != '') {
173
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
173
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
174 174
 		}
175 175
 
176 176
 
177 177
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
178 178
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
179
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
180
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
179
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
180
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
181 181
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
182
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
182
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
183 183
 				$timeelapsed = microtime(true);
184 184
 				$Marine = new Marine($this->db);
185 185
 				$fromsource = NULL;
@@ -187,20 +187,20 @@  discard block
 block discarded – undo
187 187
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
188 188
 				$Marine->db = null;
189 189
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
190
-			    }
190
+				}
191
+			}
191 192
 			}
192
-		    }
193
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
193
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
194 194
 		}
195 195
 
196 196
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
197
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
197
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
198 198
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
199
-		    } else {
199
+			} else {
200 200
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
201 201
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
202 202
 				return '';
203
-		    }
203
+			}
204 204
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
205 205
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
206 206
 			return '';
@@ -217,24 +217,24 @@  discard block
 block discarded – undo
217 217
 
218 218
 
219 219
 		if (isset($line['speed'])) {
220
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
221
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
220
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
221
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
222 222
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
223
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
224
-		    if ($distance > 1000 && $distance < 10000) {
223
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
224
+			if ($distance > 1000 && $distance < 10000) {
225 225
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
226 226
 			$speed = $speed*3.6;
227 227
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
228 228
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
229
-		    }
229
+			}
230 230
 		}
231 231
 
232
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
233
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
234
-	    	    else unset($timediff);
235
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
232
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
233
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
234
+				else unset($timediff);
235
+				if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
236 236
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
237
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
237
+				if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
238 238
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
239 239
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
240 240
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -242,211 +242,211 @@  discard block
 block discarded – undo
242 242
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
243 243
 				$timeelapsed = microtime(true);
244 244
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
245
-				    $Marine = new Marine($this->db);
246
-				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
247
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
248
-				    $Marine->db = null;
249
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
245
+					$Marine = new Marine($this->db);
246
+					$all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
247
+					if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
248
+					$Marine->db = null;
249
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
250 250
 				}
251 251
 				$this->tmd = 0;
252 252
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
253
-			    }
253
+				}
254 254
 			}
255 255
 
256 256
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
257 257
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
258 258
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
259
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
260
-				    $dataFound = true;
261
-				    $this->all_tracked[$id]['time_last_coord'] = time();
259
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
260
+					$dataFound = true;
261
+					$this->all_tracked[$id]['time_last_coord'] = time();
262 262
 				}
263 263
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
264 264
 			}
265 265
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
266
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
266
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
267 267
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
268 268
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
269
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
270
-				    $dataFound = true;
271
-				    $this->all_tracked[$id]['time_last_coord'] = time();
269
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
270
+					$dataFound = true;
271
+					$this->all_tracked[$id]['time_last_coord'] = time();
272 272
 				}
273 273
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
274 274
 			}
275 275
 
276
-		    } else if ($globalDebug && $timediff > 20) {
276
+			} else if ($globalDebug && $timediff > 20) {
277 277
 			$this->tmd = $this->tmd + 1;
278 278
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
279 279
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
280 280
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
281 281
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
282
-		    }
282
+			}
283 283
 		}
284 284
 		if (isset($line['last_update']) && $line['last_update'] != '') {
285
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
286
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
285
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
286
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
287 287
 		}
288 288
 		if (isset($line['format_source']) && $line['format_source'] != '') {
289
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
289
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
290 290
 		}
291 291
 		if (isset($line['source_name']) && $line['source_name'] != '') {
292
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
292
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
293 293
 		}
294 294
 		if (isset($line['status']) && $line['status'] != '') {
295
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
295
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
296 296
 		}
297 297
 		if (isset($line['status_id']) && (!isset($this->all_tracked[$id]['status_id']) || $this->all_tracked[$id]['status_id'] != $line['status_id'])) {
298
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
299
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
298
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
299
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
300 300
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
301
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
301
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
302 302
 				$Marine = new Marine($this->db);
303 303
 				$Marine->updateStatusMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['status']);
304 304
 				unset($Marine);
305
-			    }
305
+				}
306
+			}
306 307
 			}
307
-		    }
308 308
 		}
309 309
 
310 310
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
311
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
311
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
312 312
 		}
313 313
 		
314 314
 		if (isset($line['heading']) && $line['heading'] != '') {
315
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
316
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
317
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
318
-		    //$dataFound = true;
315
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
316
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
317
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
318
+			//$dataFound = true;
319 319
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
320
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
321
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
322
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
323
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
320
+  			$heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
321
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
322
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
323
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
324 324
   		}
325 325
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
326 326
 
327 327
 
328 328
 
329 329
 		if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) {
330
-		    $this->all_tracked[$id]['lastupdate'] = time();
331
-		    if ($this->all_tracked[$id]['addedMarine'] == 0) {
332
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
333
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
330
+			$this->all_tracked[$id]['lastupdate'] = time();
331
+			if ($this->all_tracked[$id]['addedMarine'] == 0) {
332
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
333
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
334 334
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
335
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
336
-				    $timeelapsed = microtime(true);
337
-				    $MarineLive = new MarineLive($this->db);
338
-				    if (isset($line['id'])) {
335
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
336
+					$timeelapsed = microtime(true);
337
+					$MarineLive = new MarineLive($this->db);
338
+					if (isset($line['id'])) {
339 339
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
340 340
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
341
-				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
341
+					} elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
342 342
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
343 343
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
344
-				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
344
+					} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
345 345
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
346 346
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
347
-				    } else $recent_ident = '';
348
-				    $MarineLive->db=null;
349
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
350
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
347
+					} else $recent_ident = '';
348
+					$MarineLive->db=null;
349
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
350
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
351 351
 				} else $recent_ident = '';
352
-			    } else {
352
+				} else {
353 353
 				$recent_ident = '';
354 354
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
355
-			    }
356
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
357
-			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
358
-			    {
355
+				}
356
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
357
+				if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
358
+				{
359 359
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
360 360
 				//adds the spotter data for the archive
361
-				    $highlight = '';
362
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
363
-				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
361
+					$highlight = '';
362
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
363
+					if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
364 364
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
365
-					    $timeelapsed = microtime(true);
366
-					    $Marine = new Marine($this->db);
367
-					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
368
-					    $Marine->db = null;
369
-					    if ($globalDebug && isset($result)) echo $result."\n";
370
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
365
+						$timeelapsed = microtime(true);
366
+						$Marine = new Marine($this->db);
367
+						$result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
368
+						$Marine->db = null;
369
+						if ($globalDebug && isset($result)) echo $result."\n";
370
+						if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
371 371
 					}
372
-				    }
373
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
372
+					}
373
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
374 374
 					// Add source stat in DB
375 375
 					$Stats = new Stats($this->db);
376 376
 					if (!empty($this->stats)) {
377
-					    if ($globalDebug) echo 'Add source stats : ';
378
-				    	    foreach($this->stats as $date => $data) {
377
+						if ($globalDebug) echo 'Add source stats : ';
378
+							foreach($this->stats as $date => $data) {
379 379
 						foreach($data as $source => $sourced) {
380
-					    	    //print_r($sourced);
381
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
382
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
383
-				    		    if (isset($sourced['msg'])) {
384
-				    			if (time() - $sourced['msg']['date'] > 10) {
385
-				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
386
-				    		    	    echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
387
-			    			    	    unset($this->stats[$date][$source]['msg']);
388
-			    				}
389
-			    			    }
390
-			    			}
391
-			    			if ($date != date('Y-m-d')) {
392
-			    			    unset($this->stats[$date]);
393
-			    			}
394
-				    	    }
395
-				    	    if ($globalDebug) echo 'Done'."\n";
380
+								//print_r($sourced);
381
+									if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
382
+									if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
383
+								if (isset($sourced['msg'])) {
384
+								if (time() - $sourced['msg']['date'] > 10) {
385
+										$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
386
+										echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
387
+										unset($this->stats[$date][$source]['msg']);
388
+								}
389
+								}
390
+							}
391
+							if ($date != date('Y-m-d')) {
392
+								unset($this->stats[$date]);
393
+							}
394
+							}
395
+							if ($globalDebug) echo 'Done'."\n";
396 396
 					}
397 397
 					$Stats->db = null;
398
-				    }
398
+					}
399 399
 				    
400
-				    $this->del();
400
+					$this->del();
401 401
 				//$ignoreImport = false;
402 402
 				$this->all_tracked[$id]['addedMarine'] = 1;
403 403
 				//print_r($this->all_tracked[$id]);
404 404
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
405
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
406
-				    //MarineLive->deleteLiveMarineDataNotUpdated();
407
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
405
+					if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
406
+					//MarineLive->deleteLiveMarineDataNotUpdated();
407
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
408 408
 					$MarineLive = new MarineLive($this->db);
409 409
 					$MarineLive->deleteLiveMarineData();
410 410
 					$MarineLive->db=null;
411 411
 					if ($globalDebug) echo " Done\n";
412
-				    }
413
-				    $this->last_delete = time();
412
+					}
413
+					$this->last_delete = time();
414 414
 				}
415
-			    } elseif ($recent_ident != '') {
415
+				} elseif ($recent_ident != '') {
416 416
 				$this->all_tracked[$id]['id'] = $recent_ident;
417 417
 				$this->all_tracked[$id]['addedMarine'] = 1;
418 418
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
419
-				    if (isset($globalDaemon) && !$globalDaemon) {
419
+					if (isset($globalDaemon) && !$globalDaemon) {
420 420
 					$Marine = new Marine($this->db);
421 421
 					$Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']);
422 422
 					$Marine->db = null;
423
-				    }
423
+					}
424 424
 				}
425 425
 				
426
-			    }
426
+				}
427
+			}
427 428
 			}
428
-		    }
429
-		    //adds the spotter LIVE data
430
-		    if ($globalDebug) {
429
+			//adds the spotter LIVE data
430
+			if ($globalDebug) {
431 431
 			echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n";
432
-		    }
433
-		    $ignoreImport = false;
432
+			}
433
+			$ignoreImport = false;
434 434
 
435
-		    if (!$ignoreImport) {
435
+			if (!$ignoreImport) {
436 436
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
437 437
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
438 438
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
439
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
439
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
440 440
 					$timeelapsed = microtime(true);
441 441
 					$MarineLive = new MarineLive($this->db);
442 442
 					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
443 443
 					$MarineLive->db = null;
444 444
 					if ($globalDebug) echo $result."\n";
445 445
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
446
-				    }
446
+					}
447 447
 				}
448 448
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
449
-				    $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
449
+					$APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
450 450
 				}
451 451
 				$this->all_tracked[$id]['putinarchive'] = false;
452 452
 
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 					if ($stats_heading == 16) $stats_heading = 0;
479 479
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
480 480
 						for ($i=0;$i<=15;$i++) {
481
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
481
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
482 482
 						}
483 483
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
484 484
 					} else {
@@ -491,11 +491,11 @@  discard block
 block discarded – undo
491 491
 					//var_dump($this->stats);
492 492
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
493 493
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
494
-						    end($this->stats[$current_date][$source]['hist']);
495
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
494
+							end($this->stats[$current_date][$source]['hist']);
495
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
496 496
 						} else $mini = 0;
497 497
 						for ($i=$mini;$i<=$distance;$i+=10) {
498
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
498
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
499 499
 						}
500 500
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
501 501
 					} else {
@@ -511,24 +511,24 @@  discard block
 block discarded – undo
511 511
 			
512 512
 			
513 513
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
514
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
514
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
515 515
 				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
516 516
 				$MarineLive = new MarineLive($this->db);
517 517
 				$MarineLive->deleteLiveMarineDataNotUpdated();
518 518
 				$MarineLive->db = null;
519 519
 				//MarineLive->deleteLiveMarineData();
520 520
 				if ($globalDebug) echo " Done\n";
521
-			    }
522
-			    $this->last_delete_hourly = time();
521
+				}
522
+				$this->last_delete_hourly = time();
523 523
 			}
524 524
 			
525
-		    }
526
-		    //$ignoreImport = false;
525
+			}
526
+			//$ignoreImport = false;
527 527
 		}
528 528
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
529 529
 		if ($send) return $this->all_tracked[$id];
530
-	    }
530
+		}
531
+	}
531 532
 	}
532
-    }
533 533
 }
534 534
 ?>
Please login to merge, or discard this patch.