Ysurac / FlightAirMap

require/class.MarineImport.php

Braces +193 added lines, -66 removed lines

@@ -54,7 +54,9 @@ 
     public function checkAll() {
 	global $globalDebug, $globalNoDB;
 	if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-	    if ($globalDebug) echo "Update last seen tracked data...\n";
+	    if ($globalDebug) {
+	    	echo "Update last seen tracked data...\n";
+	    }
 	    foreach ($this->all_tracked as $key => $flight) {
 		if (isset($this->all_tracked[$key]['id'])) {
 		    //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
@@ -68,13 +70,17 @@ 
     public function del() {
 	global $globalDebug, $globalNoDB, $globalNoImport;
 	// Delete old infos
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old values and update latest data...'."\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
         	if ($flight['lastupdate'] < (time()-3000)) {
             	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
             		if (isset($this->all_tracked[$key]['id'])) {
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		    if ($globalDebug) {
+            		    	echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		    }
 			    /*
 			    $MarineLive = new MarineLive();
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
@@ -84,7 +90,9 @@ 
             		    $Marine = new Marine($this->db);
             		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$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']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			    }
 			    // Put in archive
 //				$Marine->db = null;
@@ -98,7 +106,9 @@ 
 
     public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
+		$globalCoordMinChange = '0.02';
+	}
 	date_default_timezone_set('UTC');
 	$dataFound = false;
 	$send = false;
@@ -112,20 +122,30 @@ 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
 		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+		    if (isset($line['source_name'])) {
+		    	$source = $line['source_name'];
+		    } else {
+		    	$source = '';
+		    }
+		    if ($source == '' || $line['format_source'] == 'aprs') {
+		    	$source = $line['format_source'];
+		    }
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    } else {
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    }
 		}
 		
 		
 		$Common = new Common();
 		$AIS = new AIS();
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
-	        else $id = trim($line['id']);
+	        if (!isset($line['id'])) {
+	        	$id = trim($line['mmsi']);
+	        } else {
+	        	$id = trim($line['id']);
+	        }
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
@@ -133,10 +153,16 @@ 
 		    $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' => ''));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
+			if (!isset($globalDaemon)) {
+				$globalDaemon = TRUE;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+		     } else {
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+		     }
+		    if ($globalAllTracked !== FALSE) {
+		    	$dataFound = true;
+		    }
 		}
 		
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
@@ -186,35 +212,50 @@ 
 				$Marine = new Marine($this->db);
 				$fromsource = NULL;
 				$result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 				$Marine->addIdentity($this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['type']);
 				$Marine->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 			    }
 			}
 		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+		    if (!isset($this->all_tracked[$id]['id'])) {
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+		    }
 		}
 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-30*60 && strtotime($line['datetime']) < time()+20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
 		    } else {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				return '';
 		    }
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time()-30*60) {
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) >= time()+20*60) {
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
 		} else {
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." date: ".$line['datetime']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." date: ".$line['datetime']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		}
 
@@ -227,14 +268,21 @@ 
 		    if ($distance > 1000 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
+			if ($speed < 1000) {
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
+			}
+  			if ($globalDebug) {
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
+  			}
 		    }
 		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+	    	    } else {
+	    	    	unset($timediff);
+	    	    }
 	    	    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')))) {
 			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'])) {
 			    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'])) {
@@ -242,22 +290,32 @@ 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
 				
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				if ($globalDebug) {
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				}
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    $Marine = new Marine($this->db);
 				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				    if (!empty($all_country)) {
+				    	$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				    }
 				    $Marine->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				}
 				$this->tmd = 0;
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				if ($globalDebug) {
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				}
 			    }
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				}
 				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') {
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
@@ -266,8 +324,12 @@ 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+			    if ($line['longitude'] > 180) {
+			    	$line['longitude'] = $line['longitude'] - 360;
+			    }
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+				}
 				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') {
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
@@ -285,7 +347,9 @@ 
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
+		    	$dataFound = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
@@ -315,15 +379,21 @@ 
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} 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']) {
   		    $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']);
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
+  		    if ($globalDebug) {
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  		    }
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
@@ -335,23 +405,38 @@ 
 		        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'])) {
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if ($globalDebug) echo "Check if vessel is already in DB...";
+				    if ($globalDebug) {
+				    	echo "Check if vessel is already in DB...";
+				    }
 				    $timeelapsed = microtime(true);
 				    $MarineLive = new MarineLive($this->db);
 				    if (isset($line['id'])) {
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } else $recent_ident = '';
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
+				    } else {
+				    	$recent_ident = '';
+				    }
 				    $MarineLive->db=null;
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
-				} else $recent_ident = '';
+				    if ($globalDebug && $recent_ident == '') {
+				    	echo " Not in DB.\n";
+				    } elseif ($globalDebug && $recent_ident != '') {
+				    	echo " Already in DB.\n";
+				    }
+				} else {
+					$recent_ident = '';
+				}
 			    } else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
@@ -359,30 +444,44 @@ 
 			    //if there was no vessel with the same callsign within the last hour and go post it into the archive
 			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
 			    {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
+				}
 				//adds the spotter data for the archive
 				    $highlight = '';
-				    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')));
+				    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')));
+				    }
 				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $timeelapsed = microtime(true);
 					    $Marine = new Marine($this->db);
 					    $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']);
 					    $Marine->db = null;
-					    if ($globalDebug && isset($result)) echo $result."\n";
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					    if ($globalDebug && isset($result)) {
+					    	echo $result."\n";
+					    }
+					    if ($globalDebugTimeElapsed) {
+					    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					    }
 					}
 				    }
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					// Add source stat in DB
 					$Stats = new Stats($this->db);
 					if (!empty($this->stats)) {
-					    if ($globalDebug) echo 'Add source stats : ';
+					    if ($globalDebug) {
+					    	echo 'Add source stats : ';
+					    }
 				    	    foreach($this->stats as $date => $data) {
 						foreach($data as $source => $sourced) {
 					    	    //print_r($sourced);
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
+				    	    	    if (isset($sourced['polar'])) {
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
+				    	    	    }
+				    	    	    if (isset($sourced['hist'])) {
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
+				    	    	    }
 				    		    if (isset($sourced['msg'])) {
 				    			if (time() - $sourced['msg']['date'] > 10) {
 				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -395,7 +494,9 @@ 
 			    			    unset($this->stats[$date]);
 			    			}
 				    	    }
-				    	    if ($globalDebug) echo 'Done'."\n";
+				    	    if ($globalDebug) {
+				    	    	echo 'Done'."\n";
+				    	    }
 					}
 					$Stats->db = null;
 				    }
@@ -405,13 +506,17 @@ 
 				$this->all_tracked[$id]['addedMarine'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
+				    if ($globalDebug) {
+				    	echo "---- Deleting Live Marine data older than 9 hours...";
+				    }
 				    //MarineLive->deleteLiveMarineDataNotUpdated();
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$MarineLive = new MarineLive($this->db);
 					$MarineLive->deleteLiveMarineData();
 					$MarineLive->db=null;
-					if ($globalDebug) echo " Done\n";
+					if ($globalDebug) {
+						echo " Done\n";
+					}
 				    }
 				    $this->last_delete = time();
 				}
@@ -437,15 +542,21 @@ 
 
 		    if (!$ignoreImport) {
 			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'])) {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				}
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$timeelapsed = microtime(true);
 					$MarineLive = new MarineLive($this->db);
 					$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']);
 					$MarineLive->db = null;
-					if ($globalDebug) echo $result."\n";
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebug) {
+						echo $result."\n";
+					}
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    }
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
@@ -457,7 +568,9 @@ 
 				
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					$source = $this->all_tracked[$id]['source_name'];
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
+					if ($source == '') {
+						$source = $this->all_tracked[$id]['format_source'];
+					}
 					if (!isset($this->source_location[$source])) {
 						$Location = new Source($this->db);
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -478,7 +591,9 @@ 
 					$stats_heading = round($stats_heading/22.5);
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
-					if ($stats_heading == 16) $stats_heading = 0;
+					if ($stats_heading == 16) {
+						$stats_heading = 0;
+					}
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -496,7 +611,9 @@ 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
-						} else $mini = 0;
+						} else {
+							$mini = 0;
+						}
 						for ($i=$mini;$i<=$distance;$i+=10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
@@ -508,19 +625,27 @@ 
 				
 
 				$this->all_tracked[$id]['lastupdate'] = time();
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+				if ($this->all_tracked[$id]['putinarchive']) {
+					$send = true;
+				}
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			}
 			//$this->del();
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
+				if ($globalDebug) {
+					echo "---- Deleting Live Marine data Not updated since 2 hour...";
+				}
 				$MarineLive = new MarineLive($this->db);
 				$MarineLive->deleteLiveMarineDataNotUpdated();
 				$MarineLive->db = null;
 				//MarineLive->deleteLiveMarineData();
-				if ($globalDebug) echo " Done\n";
+				if ($globalDebug) {
+					echo " Done\n";
+				}
 			    }
 			    $this->last_delete_hourly = time();
 			}
@@ -529,7 +654,9 @@ 
 		    //$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
-		if ($send) return $this->all_tracked[$id];
+		if ($send) {
+			return $this->all_tracked[$id];
+		}
 	    }
 	}
     }