View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( d02653...48f01d )
by Yannick
09:33
created
Status
Category
Toggle Patches
require/class.MarineImport.php 1 patch
Indentation   +168 added lines, -168 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;
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']);
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,8 +103,8 @@  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
 
@@ -121,64 +121,64 @@  discard block
 
 block discarded – undo
121 121
122 122 
 		$Common = new Common();
123 123 
 		$AIS = new AIS();
124 
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
125 
-	        else $id = trim($line['id']);
124 
+			if (!isset($line['id'])) $id = trim($line['mmsi']);
125 
+			else $id = trim($line['id']);
126 126
127 127 
 		if (!isset($this->all_tracked[$id])) {
128 
-		    $this->all_tracked[$id] = array();
129 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
130 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
131 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
132 
-		    if (!isset($line['id'])) {
128 
+			$this->all_tracked[$id] = array();
129 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
130 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
131 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
132 
+			if (!isset($line['id'])) {
133 133 
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
134 134 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
135 
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
136 
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
135 
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
136 
+			if ($globalAllTracked !== FALSE) $dataFound = true;
137 137 
 		}
138 138
139 139 
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
140 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
141 
-		    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
140 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
141 
+			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
142 142 
 			$Marine = new Marine($this->db);
143 143 
 			$identity = $Marine->getIdentity($line['mmsi']);
144 144 
 			if (!empty($identity)) {
145 
-			    $this->all_tracked[$id]['ident'] = $identity['ship_name'];
146 
-			    $this->all_tracked[$id]['type'] = $identity['type'];
145 
+				$this->all_tracked[$id]['ident'] = $identity['ship_name'];
146 
+				$this->all_tracked[$id]['type'] = $identity['type'];
147 147 
 			}
148 148 
 			//print_r($identity);
149 149 
 			unset($Marine);
150 150 
 			//$dataFound = true;
151 
-		    }
151 
+			}
152 152 
 		}
153 153 
 		if (isset($line['type_id']) && $line['type_id'] != '') {
154 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
154 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
155 155 
 		}
156 156 
 		if (isset($line['type']) && $line['type'] != '') {
157 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
157 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
158 158 
 		}
159 159 
 		if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') {
160 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
160 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
161 161 
 		}
162 162 
 		if (isset($line['imo']) && $line['imo'] != '') {
163 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
163 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
164 164 
 		}
165 165 
 		if (isset($line['callsign']) && $line['callsign'] != '') {
166 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
166 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
167 167 
 		}
168 168 
 		if (isset($line['arrival_code']) && $line['arrival_code'] != '') {
169 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
169 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
170 170 
 		}
171 171 
 		if (isset($line['arrival_date']) && $line['arrival_date'] != '') {
172 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
172 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
173 173 
 		}
174 174
175 175
176 176 
 		//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'])) {
177 177 
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
178 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
179 
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
178 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
179 
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
180 180 
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
181 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
181 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
182 182 
 				$timeelapsed = microtime(true);
183 183 
 				$Marine = new Marine($this->db);
184 184 
 				$fromsource = NULL;
 
@@ -186,31 +186,31 @@  discard block
 
 block discarded – undo
186 186 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
187 187 
 				$Marine->db = null;
188 188 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
189 
-			    }
189 
+				}
190 190 
 			}
191 
-		    }
192 
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
191 
+			}
192 
+			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 193 
 		}
194 194
195 195 
 		if (isset($line['speed']) && $line['speed'] != '') {
196 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
197 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
196 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
197 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
198 198 
 		} 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'])) {
199 
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
200 
-		    if ($distance > 1000 && $distance < 10000) {
199 
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
200 
+			if ($distance > 1000 && $distance < 10000) {
201 201 
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
202 202 
 			$speed = $speed*3.6;
203 203 
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
204 204 
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
205 
-		    }
205 
+			}
206 206 
 		}
207 207
208 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
209 
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
210 
-	    	    else unset($timediff);
211 
-	    	    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')))) {
208 
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
209 
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
210 
+				else unset($timediff);
211 
+				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')))) {
212 212 
 			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'])) {
213 
-			    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'])) {
213 
+				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'])) {
214 214 
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
215 215 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
216 216 
 				$this->all_tracked[$id]['putinarchive'] = true;
 
@@ -218,84 +218,84 @@  discard block
 
 block discarded – undo
218 218 
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
219 219 
 				$timeelapsed = microtime(true);
220 220 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
221 
-				    $Marine = new Marine($this->db);
222 
-				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
223 
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
224 
-				    $Marine->db = null;
225 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
221 
+					$Marine = new Marine($this->db);
222 
+					$all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
223 
+					if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
224 
+					$Marine->db = null;
225 
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
226 226 
 				}
227 227 
 				$this->tmd = 0;
228 228 
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
229 
-			    }
229 
+				}
230 230 
 			}
231 231
232 232 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
233 233 
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
234 234 
 				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') {
235 
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
236 
-				    $dataFound = true;
237 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
235 
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
236 
+					$dataFound = true;
237 
+					$this->all_tracked[$id]['time_last_coord'] = time();
238 238 
 				}
239 239 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
240 240 
 			}
241 241 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
242 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
242 
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
243 243 
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
244 244 
 				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') {
245 
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
246 
-				    $dataFound = true;
247 
-				    $this->all_tracked[$id]['time_last_coord'] = time();
245 
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
246 
+					$dataFound = true;
247 
+					$this->all_tracked[$id]['time_last_coord'] = time();
248 248 
 				}
249 249 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
250 250 
 			}
251 251
252 
-		    } else if ($globalDebug && $timediff > 20) {
252 
+			} else if ($globalDebug && $timediff > 20) {
253 253 
 			$this->tmd = $this->tmd + 1;
254 254 
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
255 255 
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
256 256 
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
257 257 
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
258 
-		    }
258 
+			}
259 259 
 		}
260 260 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
261 
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
262 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
261 
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
262 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
263 263 
 		}
264 264 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
265 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
265 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
266 266 
 		}
267 267 
 		if (isset($line['source_name']) && $line['source_name'] != '') {
268 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
268 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
269 269 
 		}
270 270 
 		if (isset($line['status']) && $line['status'] != '') {
271 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
271 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
272 272 
 		}
273 273
274 274 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
275 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
275 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
276 276 
 		}
277 277
278 278 
 		if (isset($line['heading']) && $line['heading'] != '') {
279 
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
280 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
281 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
282 
-		    //$dataFound = true;
279 
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
280 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
281 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
282 
+			//$dataFound = true;
283 283 
   		} 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']) {
284 
-  		    $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']);
285 
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
286 
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
287 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
284 
+  			$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']);
285 
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
286 
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
287 
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
288 288 
   		}
289 289 
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
290 290
291 291 
 		if (isset($line['datetime'])) {
292 
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
292 
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
293 293 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
294 
-		    } else {
294 
+			} else {
295 295 
 				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";
296 296 
 				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";
297 297 
 				return '';
298 
-		    }
298 
+			}
299 299 
 		} else {
300 300 
 			date_default_timezone_set('UTC');
301 301 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
 
@@ -303,50 +303,50 @@  discard block
 
 block discarded – undo
303 303
304 304
305 305 
 		if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) {
306 
-		    $this->all_tracked[$id]['lastupdate'] = time();
307 
-		    if ($this->all_tracked[$id]['addedMarine'] == 0) {
308 
-		        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'])) {
309 
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
306 
+			$this->all_tracked[$id]['lastupdate'] = time();
307 
+			if ($this->all_tracked[$id]['addedMarine'] == 0) {
308 
+				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'])) {
309 
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
310 310 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
311 
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
312 
-				    $timeelapsed = microtime(true);
313 
-				    $MarineLive = new MarineLive($this->db);
314 
-				    if (isset($line['id'])) {
311 
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
312 
+					$timeelapsed = microtime(true);
313 
+					$MarineLive = new MarineLive($this->db);
314 
+					if (isset($line['id'])) {
315 315 
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
316 316 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
317 
-				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
317 
+					} elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
318 318 
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
319 319 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
320 
-				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
320 
+					} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
321 321 
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
322 322 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
323 
-				    } else $recent_ident = '';
324 
-				    $MarineLive->db=null;
325 
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
326 
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
323 
+					} else $recent_ident = '';
324 
+					$MarineLive->db=null;
325 
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
326 
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
327 327 
 				} else $recent_ident = '';
328 
-			    } else {
328 
+				} else {
329 329 
 				$recent_ident = '';
330 330 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
331 
-			    }
332 
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
333 
-			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
334 
-			    {
331 
+				}
332 
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
333 
+				if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
334 
+				{
335 335 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
336 336 
 				//adds the spotter data for the archive
337 
-				    $highlight = '';
338 
-				    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')));
339 
-				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
337 
+					$highlight = '';
338 
+					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')));
339 
+					if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
340 340 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
341 
-					    $timeelapsed = microtime(true);
342 
-					    $Marine = new Marine($this->db);
343 
-					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
344 
-					    $Marine->db = null;
345 
-					    if ($globalDebug && isset($result)) echo $result."\n";
346 
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
341 
+						$timeelapsed = microtime(true);
342 
+						$Marine = new Marine($this->db);
343 
+						$result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
344 
+						$Marine->db = null;
345 
+						if ($globalDebug && isset($result)) echo $result."\n";
346 
+						if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
347 347 
 					}
348 
-				    }
349 
-				    /*
348 
+					}
349 
+					/*
350 350 
 				    // Add source stat in DB
351 351 
 				    $Stats = new Stats($this->db);
352 352 
 				    if (!empty($this->stats)) {
 
@@ -373,56 +373,56 @@  discard block
 
 block discarded – undo
373 373 
 				    }
374 374 
 				    $Stats->db = null;
375 375 
 				    */
376 
-				    $this->del();
376 
+					$this->del();
377 377 
 				//$ignoreImport = false;
378 378 
 				$this->all_tracked[$id]['addedMarine'] = 1;
379 379 
 				//print_r($this->all_tracked[$id]);
380 380 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
381 
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
382 
-				    //MarineLive->deleteLiveMarineDataNotUpdated();
383 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
381 
+					if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
382 
+					//MarineLive->deleteLiveMarineDataNotUpdated();
383 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
384 384 
 					$MarineLive = new MarineLive($this->db);
385 385 
 					$MarineLive->deleteLiveMarineData();
386 386 
 					$MarineLive->db=null;
387 387 
 					if ($globalDebug) echo " Done\n";
388 
-				    }
389 
-				    $this->last_delete = time();
388 
+					}
389 
+					$this->last_delete = time();
390 390 
 				}
391 
-			    } elseif ($recent_ident != '') {
391 
+				} elseif ($recent_ident != '') {
392 392 
 				$this->all_tracked[$id]['id'] = $recent_ident;
393 393 
 				$this->all_tracked[$id]['addedMarine'] = 1;
394 394 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
395 
-				    if (isset($globalDaemon) && !$globalDaemon) {
395 
+					if (isset($globalDaemon) && !$globalDaemon) {
396 396 
 					$Marine = new Marine($this->db);
397 397 
 					$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']);
398 398 
 					$Marine->db = null;
399 
-				    }
399 
+					}
400 400 
 				}
401 401
402 
-			    }
402 
+				}
403 403 
 			}
404 
-		    }
405 
-		    //adds the spotter LIVE data
406 
-		    if ($globalDebug) {
404 
+			}
405 
+			//adds the spotter LIVE data
406 
+			if ($globalDebug) {
407 407 
 			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";
408 
-		    }
409 
-		    $ignoreImport = false;
408 
+			}
409 
+			$ignoreImport = false;
410 410
411 
-		    if (!$ignoreImport) {
411 
+			if (!$ignoreImport) {
412 412 
 			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'])) {
413 413 
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
414 414 
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
415 
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
415 
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
416 416 
 					$timeelapsed = microtime(true);
417 417 
 					$MarineLive = new MarineLive($this->db);
418 418 
 					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
419 419 
 					$MarineLive->db = null;
420 420 
 					if ($globalDebug) echo $result."\n";
421 421 
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
422 
-				    }
422 
+					}
423 423 
 				}
424 424 
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
425 
-				    $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
425 
+					$APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
426 426 
 				}
427 427 
 				$this->all_tracked[$id]['putinarchive'] = false;
428 428 
 
@@ -487,24 +487,24 @@  discard block
 
 block discarded – undo
487 487
488 488
489 489 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
490 
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
490 
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
491 491 
 				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
492 492 
 				$MarineLive = new MarineLive($this->db);
493 493 
 				$MarineLive->deleteLiveMarineDataNotUpdated();
494 494 
 				$MarineLive->db = null;
495 495 
 				//MarineLive->deleteLiveMarineData();
496 496 
 				if ($globalDebug) echo " Done\n";
497 
-			    }
498 
-			    $this->last_delete_hourly = time();
497 
+				}
498 
+				$this->last_delete_hourly = time();
499 499 
 			}
500 500
501 
-		    }
502 
-		    //$ignoreImport = false;
501 
+			}
502 
+			//$ignoreImport = false;
503 503 
 		}
504 504 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
505 505 
 		if ($send) return $this->all_tracked[$id];
506 
-	    }
506 
+		}
507 
+	}
507 508 
 	}
508 
-    }
509 509 
 }
510 510 
 ?>
Please login to merge, or discard this patch.