Ysurac / FlightAirMap

install/class.update_schema.php

Braces +323 added lines, -120 removed lines

@@ -258,7 +258,9 @@ 
     		// Update table countries
     		if ($Connection->tableExists('airspace')) {
     		    $error .= update_db::update_countries();
-		    if ($error != '') return $error;
+		    if ($error != '') {
+		    	return $error;
+		    }
 		}
 		// Update schema_version to 7
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
@@ -314,7 +316,9 @@ 
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/source_location.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
         	try {
@@ -331,7 +335,9 @@ 
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/notam.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
                         DELETE FROM config WHERE name = 'last_update_notam_db';
@@ -365,7 +371,9 @@ 
 		$error = '';
     		// Update table atc
 		$error .= create_db::import_file('../db/atc.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
         	try {
@@ -389,13 +397,21 @@ 
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/metar.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/taf.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
         	try {
@@ -469,19 +485,33 @@ 
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/stats.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airline.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_pilot.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/spotter_archive_output.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
         	try {
@@ -521,7 +551,9 @@ 
     		// Add tables
     		if (!$Connection->tableExists('stats_flight')) {
 			$error .= create_db::import_file('../db/stats_flight.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
         	try {
@@ -545,7 +577,9 @@ 
     		} catch(PDOException $e) {
 		    return "error (update stats) : ".$e->getMessage()."\n";
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -566,7 +600,9 @@ 
     		if (!$Connection->tableExists('stats_callsign')) {
 			$error .= create_db::import_file('../db/stats_callsign.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -584,7 +620,9 @@ 
     		if (!$Connection->tableExists('stats_country')) {
 			$error .= create_db::import_file('../db/stats_country.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -607,7 +645,9 @@ 
 			    return "error (update stats) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -623,7 +663,9 @@ 
 		$error = '';
     		// Update airport table
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return 'Import airport.sql : '.$error;
+		if ($error != '') {
+			return 'Import airport.sql : '.$error;
+		}
 		// Remove primary key on Spotter_Archive
 		$query = "alter table spotter_archive drop spotter_archive_id";
         	try {
@@ -699,7 +741,9 @@ 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -717,7 +761,9 @@ 
     		// Update airline table
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return 'Import airlines.sql : '.$error;
+			if ($error != '') {
+				return 'Import airlines.sql : '.$error;
+			}
 		}
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
 			// Add column over_country
@@ -729,7 +775,9 @@ 
 				return "error (add over_country) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		/*
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			// Force update ModeS (this will put type_flight data
@@ -759,7 +807,9 @@ 
 			} catch(PDOException $e) {
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
         	try {
@@ -782,7 +832,9 @@ 
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
         	try {
@@ -804,12 +856,16 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/pgsql/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
 			try {
@@ -849,7 +905,9 @@ 
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
 		}
-		if ($error != '') return 'Import airlines.sql : '.$error;
+		if ($error != '') {
+			return 'Import airlines.sql : '.$error;
+		}
 		if (!$Connection->checkColumnName('airlines','forsource')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
@@ -1332,20 +1390,28 @@ 
 		}
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) {
 			include_once(dirname(__FILE__).'/class.update_db.php');
 			if (isset($globalVATSIM) && $globalVATSIM) {
 				$error .= update_db::update_vatsim();
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) {
 				$error .= update_db::update_IVAO();
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 
@@ -1607,30 +1673,54 @@ 
 		*/
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/tracker_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/tracker_live.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/marine_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/marine_live.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/marine_identity.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/marine_mid.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/tracker_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/tracker_live.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_live.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_identity.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_mid.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '37' WHERE name = 'schema_version'";
 		try {
@@ -1650,8 +1740,11 @@ 
     	    if ($Connection->tableExists('aircraft')) {
     		if (!$Connection->tableExists('config')) {
     		    $version = '1';
-    		    if ($update) return self::update_from_1();
-    		    else return $version;
+    		    if ($update) {
+    		    	return self::update_from_1();
+    		    } else {
+    		    	return $version;
+    		    }
 		} else {
     		    $Connection = new Connection();
 		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
@@ -1665,150 +1758,260 @@ 
     		    if ($update) {
     			if ($result['value'] == '2') {
     			    $error = self::update_from_2();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '3') {
     			    $error = self::update_from_3();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '4') {
     			    $error = self::update_from_4();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '5') {
     			    $error = self::update_from_5();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '6') {
     			    $error = self::update_from_6();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '7') {
     			    $error = self::update_from_7();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '8') {
     			    $error = self::update_from_8();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '9') {
     			    $error = self::update_from_9();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '10') {
     			    $error = self::update_from_10();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '11') {
     			    $error = self::update_from_11();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '12') {
     			    $error = self::update_from_12();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '13') {
     			    $error = self::update_from_13();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '14') {
     			    $error = self::update_from_14();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '15') {
     			    $error = self::update_from_15();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '16') {
     			    $error = self::update_from_16();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '17') {
     			    $error = self::update_from_17();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '18') {
     			    $error = self::update_from_18();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '19') {
     			    $error = self::update_from_19();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '20') {
     			    $error = self::update_from_20();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '21') {
     			    $error = self::update_from_21();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '22') {
     			    $error = self::update_from_22();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '23') {
     			    $error = self::update_from_23();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '24') {
     			    $error = self::update_from_24();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '25') {
     			    $error = self::update_from_25();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '26') {
     			    $error = self::update_from_26();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '27') {
     			    $error = self::update_from_27();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '28') {
     			    $error = self::update_from_28();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '29') {
     			    $error = self::update_from_29();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '30') {
     			    $error = self::update_from_30();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '31') {
     			    $error = self::update_from_31();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '32') {
     			    $error = self::update_from_32();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '33') {
     			    $error = self::update_from_33();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '34') {
     			    $error = self::update_from_34();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '35') {
     			    $error = self::update_from_35();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '36') {
     			    $error = self::update_from_36();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} else return '';
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
+    			} else {
+    				return '';
+    			}
+    		    } else {
+    		    	return $result['value'];
     		    }
-    		    else return $result['value'];
 		}
 		
-	    } else return $version;
+	    } else {
+	    	return $version;
+	    }
     	}
     	
 }

scripts/daemon-spotter.php

Braces +699 added lines, -241 removed lines

@@ -13,13 +13,17 @@ 
 require_once(dirname(__FILE__).'/../require/class.SBS.php');
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+if (isset($globalTracker) && $globalTracker) {
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+}
 if (isset($globalMarine) && $globalMarine) {
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
-if (!isset($globalDebug)) $globalDebug = FALSE;
+if (!isset($globalDebug)) {
+	$globalDebug = FALSE;
+}
 
 // Check if schema is at latest version
 $Connection = new Connection();
@@ -59,14 +63,25 @@ 
     $globalSources = array();
     $globalSources[] = array('host' => $options['source']);
 }
-if (isset($options['server'])) $globalServer = TRUE;
-if (isset($options['idsource'])) $id_source = $options['idsource'];
-else $id_source = 1;
+if (isset($options['server'])) {
+	$globalServer = TRUE;
+}
+if (isset($options['idsource'])) {
+	$id_source = $options['idsource'];
+} else {
+	$id_source = 1;
+}
 if (isset($globalServer) && $globalServer) {
-    if ($globalDebug) echo "Using Server Mode\n";
+    if ($globalDebug) {
+    	echo "Using Server Mode\n";
+    }
     $SI=new SpotterServer();
-} else $SI=new SpotterImport($Connection->db);
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
+} else {
+	$SI=new SpotterImport($Connection->db);
+}
+if (isset($globalTracker) && $globalTracker) {
+	$TI = new TrackerImport($Connection->db);
+}
 if (isset($globalMarine) && $globalMarine) {
     $AIS = new AIS();
     $MI = new MarineImport($Connection->db);
@@ -88,7 +103,9 @@ 
 }
 
 // let's try and connect
-if ($globalDebug) echo "Connecting...\n";
+if ($globalDebug) {
+	echo "Connecting...\n";
+}
 $use_aprs = false;
 $aprs_full = false;
 $reset = 0;
@@ -97,7 +114,9 @@ 
     $ip = gethostbyname($host);
     $s = socket_create(AF_INET, SOCK_STREAM, 0);
     $r = @socket_connect($s, $ip, $port);
-    if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
+    if (!socket_set_nonblock($s)) {
+    	echo "Unable to set nonblock on socket\n";
+    }
     if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
         return $s;
     }
@@ -125,7 +144,9 @@ 
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
     global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
     $reset++;
-    if ($globalDebug) echo 'Connect to all...'."\n";
+    if ($globalDebug) {
+    	echo 'Connect to all...'."\n";
+    }
     foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
@@ -135,27 +156,37 @@ 
         	//$formats[$id] = 'deltadbtxt';
         	$globalSources[$id]['format'] = 'deltadbtxt';
         	//$last_exec['deltadbtxt'] = 0;
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to deltadb source (".$host.")...\n";
+        	}
             } else if (preg_match('/vatsim-data.txt$/i',$host)) {
         	//$formats[$id] = 'vatsimtxt';
         	$globalSources[$id]['format'] = 'vatsimtxt';
         	//$last_exec['vatsimtxt'] = 0;
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to vatsim source (".$host.")...\n";
+        	}
     	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'aircraftlistjson';
         	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to aircraftlist.json source (".$host.")...\n";
+        	}
     	    } else if (preg_match('/opensky/i',$host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'opensky';
         	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to opensky source (".$host.")...\n";
+        	}
     	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
         	//$formats[$id] = 'radarvirtueljson';
         	$globalSources[$id]['format'] = 'radarvirtueljson';
         	//$last_exec['radarvirtueljson'] = 0;
-        	if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -164,7 +195,9 @@ 
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -173,26 +206,36 @@ 
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'phpvmacars';
         	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to phpvmacars source (".$host.")...\n";
+        	}
             } else if (preg_match('/VAM-json.php$/i',$host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'vam';
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to Vam source (".$host.")...\n";
+        	}
             } else if (preg_match('/whazzup/i',$host)) {
         	//$formats[$id] = 'whazzup';
         	$globalSources[$id]['format'] = 'whazzup';
         	//$last_exec['whazzup'] = 0;
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to whazzup source (".$host.")...\n";
+        	}
             } else if (preg_match('/recentpireps/i',$host)) {
         	//$formats[$id] = 'pirepsjson';
         	$globalSources[$id]['format'] = 'pirepsjson';
         	//$last_exec['pirepsjson'] = 0;
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to pirepsjson source (".$host.")...\n";
+        	}
             } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'fr24json';
         	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to fr24 source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -201,17 +244,24 @@ 
             } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
         	//$formats[$id] = 'tsv';
         	$globalSources[$id]['format'] = 'tsv';
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to tsv source (".$host.")...\n";
+        	}
             }
         } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
     		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
     		    if ($idf !== false) {
     			$httpfeeds[$id] = $idf;
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
+        		if ($globalDebug) {
+        			echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
+        		}
+    		    } elseif ($globalDebug) {
+    		    	echo "Can't connect to ".$globalSources[$id]['host']."\n";
     		    }
-    		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+    		} elseif ($globalDebug) {
+    			echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+    		}
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
 	    $hostport = explode(':',$host);
 	    if (isset($hostport[1])) {
@@ -248,17 +298,25 @@ 
         		//$formats[$id] = 'beast';
         		$globalSources[$id]['format'] = 'beast';
 		    //} else $formats[$id] = 'sbs';
-		    } else $globalSources[$id]['format'] = 'sbs';
+		    } else {
+		    	$globalSources[$id]['format'] = 'sbs';
+		    }
 		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
 		}
-		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		if ($globalDebug) {
+			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		}
             } else {
-		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
+		if ($globalDebug) {
+			echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
+		}
     	    }
         }
     }
 }
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
+if (!isset($globalMinFetch)) {
+	$globalMinFetch = 15;
+}
 
 // Initialize all
 $status = array();
@@ -267,13 +325,19 @@ 
 $formats = array();
 $last_exec = array();
 $time = time();
-if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;
-else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
-else $timeout = 20;
+if (isset($globalSourcesTimeout)) {
+	$timeout = $globalSourcesTimeOut;
+} else if (isset($globalSBS1TimeOut)) {
+	$timeout = $globalSBS1TimeOut;
+} else {
+	$timeout = 20;
+}
 $errno = '';
 $errstr='';
 
-if (!isset($globalDaemon)) $globalDaemon = TRUE;
+if (!isset($globalDaemon)) {
+	$globalDaemon = TRUE;
+}
 /* Initiate connections to all the hosts simultaneously */
 //connect_all($hosts);
 //connect_all($globalSources);
@@ -299,7 +363,9 @@ 
     if (isset($source['format']) && $source['format'] == 'aprs') {
 	$aprs_connect = 0;
 	$use_aprs = true;
-	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
+	if (isset($source['port']) && $source['port'] == '10152') {
+		$aprs_full = true;
+	}
 	break;
     }
 }
@@ -310,23 +376,43 @@ 
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
-	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
-	if ($aprs_full) $aprs_filter = '';
+	if (isset($globalAPRSversion)) {
+		$aprs_version = $globalAPRSversion;
+	} else {
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	}
+	if (isset($globalAPRSssid)) {
+		$aprs_ssid = $globalAPRSssid;
+	} else {
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	}
+	if (isset($globalAPRSfilter)) {
+		$aprs_filter = $globalAPRSfilter;
+	} else {
+		$aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
+	}
+	if ($aprs_full) {
+		$aprs_filter = '';
+	}
 
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass -1 vers {$aprs_version} filter {$aprs_filter}\n";
-	else $aprs_login = "user {$aprs_ssid} pass -1 vers {$aprs_version}\n";
-}
+	if ($aprs_filter != '') {
+		$aprs_login = "user {$aprs_ssid} pass -1 vers {$aprs_version} filter {$aprs_filter}\n";
+	} else {
+		$aprs_login = "user {$aprs_ssid} pass -1 vers {$aprs_version}\n";
+	}
+	}
 
 // connected - lets do some work
-if ($globalDebug) echo "Connected!\n";
+if ($globalDebug) {
+	echo "Connected!\n";
+}
 sleep(1);
-if ($globalDebug) echo "SCAN MODE \n\n";
-if (!isset($globalCronEnd)) $globalCronEnd = 60;
+if ($globalDebug) {
+	echo "SCAN MODE \n\n";
+}
+if (!isset($globalCronEnd)) {
+	$globalCronEnd = 60;
+}
 $endtime = time()+$globalCronEnd;
 $i = 1;
 $tt = array();
@@ -340,10 +426,14 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (!$globalDaemon) $i = $endtime-time();
+    if (!$globalDaemon) {
+    	$i = $endtime-time();
+    }
     // Delete old ATC
     if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
-	if ($globalDebug) echo 'Delete old ATC...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old ATC...'."\n";
+	}
         $ATC->deleteOldATC();
     }
     
@@ -351,10 +441,14 @@ 
     if (count($last_exec) == count($globalSources)) {
 	$max = $globalMinFetch;
 	foreach ($last_exec as $last) {
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
+	    if ((time() - $last['last']) < $max) {
+	    	$max = time() - $last['last'];
+	    }
 	}
 	if ($max != $globalMinFetch) {
-	    if ($globalDebug) echo 'Sleeping...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Sleeping...'."\n";
+	    }
 	    sleep($globalMinFetch-$max+2);
 	}
     }
@@ -363,11 +457,15 @@ 
     //foreach ($formats as $id => $value) {
     foreach ($globalSources as $id => $value) {
 	date_default_timezone_set('UTC');
-	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
+	if (!isset($last_exec[$id]['last'])) {
+		$last_exec[$id]['last'] = 0;
+	}
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-	    if ($buffer != '') $reset = 0;
+	    if ($buffer != '') {
+	    	$reset = 0;
+	    }
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 	    $buffer = explode('\n',$buffer);
 	    foreach ($buffer as $line) {
@@ -376,19 +474,38 @@ 
 	            $data = array();
 	            $data['hex'] = $line[1]; // hex
 	            $data['ident'] = $line[2]; // ident
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
+	            if (isset($line[3])) {
+	            	$data['altitude'] = $line[3];
+	            }
+	            // altitude
+	            if (isset($line[4])) {
+	            	$data['speed'] = $line[4];
+	            }
+	            // speed
+	            if (isset($line[5])) {
+	            	$data['heading'] = $line[5];
+	            }
+	            // heading
+	            if (isset($line[6])) {
+	            	$data['latitude'] = $line[6];
+	            }
+	            // lat
+	            if (isset($line[7])) {
+	            	$data['longitude'] = $line[7];
+	            }
+	            // long
 	            $data['verticalrate'] = ''; // vertical rate
 	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
 	            $data['emergency'] = ''; // emergency
 		    $data['datetime'] = date('Y-m-d H:i:s');
 		    $data['format_source'] = 'deltadbtxt';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
+		    if (isset($value['sourcestats'])) {
+		    	$data['sourcestats'] = $value['sourcestats'];
+		    }
     		    $SI->add($data);
 		    unset($data);
     		}
@@ -398,7 +515,9 @@ 
 	    date_default_timezone_set('CET');
 	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
 	    date_default_timezone_set('UTC');
-	    if ($buffer != '') $reset = 0;
+	    if ($buffer != '') {
+	    	$reset = 0;
+	    }
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 	    $buffer = explode('\n',$buffer);
 	    foreach ($buffer as $line) {
@@ -407,16 +526,36 @@ 
 		    $add = false;
 		    $ais_data = $AIS->parse_line(trim($line));
 		    $data = array();
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
+		    if (isset($ais_data['ident'])) {
+		    	$data['ident'] = $ais_data['ident'];
+		    }
+		    if (isset($ais_data['mmsi'])) {
+		    	$data['mmsi'] = $ais_data['mmsi'];
+		    }
+		    if (isset($ais_data['speed'])) {
+		    	$data['speed'] = $ais_data['speed'];
+		    }
+		    if (isset($ais_data['heading'])) {
+		    	$data['heading'] = $ais_data['heading'];
+		    }
+		    if (isset($ais_data['latitude'])) {
+		    	$data['latitude'] = $ais_data['latitude'];
+		    }
+		    if (isset($ais_data['longitude'])) {
+		    	$data['longitude'] = $ais_data['longitude'];
+		    }
+		    if (isset($ais_data['status'])) {
+		    	$data['status'] = $ais_data['status'];
+		    }
+		    if (isset($ais_data['type'])) {
+		    	$data['type'] = $ais_data['type'];
+		    }
+		    if (isset($ais_data['imo'])) {
+		    	$data['imo'] = $ais_data['imo'];
+		    }
+		    if (isset($ais_data['callsign'])) {
+		    	$data['callsign'] = $ais_data['callsign'];
+		    }
 		    if (isset($ais_data['timestamp'])) {
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
@@ -431,7 +570,9 @@ 
     		    $data['id_source'] = $id_source;
 		    print_r($data);
 		    echo 'Add...'."\n";
-		    if ($add && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
+		    if ($add && $ais_data['mmsi_type'] == 'Ship') {
+		    	$MI->add($data);
+		    }
 		    unset($data);
 		}
     	    }
@@ -451,18 +592,42 @@ 
 			if ($line != '') {
 			    $ais_data = $AIS->parse_line(trim($line));
 			    $data = array();
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+			    if (isset($ais_data['ident'])) {
+			    	$data['ident'] = $ais_data['ident'];
+			    }
+			    if (isset($ais_data['mmsi'])) {
+			    	$data['mmsi'] = $ais_data['mmsi'];
+			    }
+			    if (isset($ais_data['speed'])) {
+			    	$data['speed'] = $ais_data['speed'];
+			    }
+			    if (isset($ais_data['heading'])) {
+			    	$data['heading'] = $ais_data['heading'];
+			    }
+			    if (isset($ais_data['latitude'])) {
+			    	$data['latitude'] = $ais_data['latitude'];
+			    }
+			    if (isset($ais_data['longitude'])) {
+			    	$data['longitude'] = $ais_data['longitude'];
+			    }
+			    if (isset($ais_data['status'])) {
+			    	$data['status'] = $ais_data['status'];
+			    }
+			    if (isset($ais_data['type'])) {
+			    	$data['type'] = $ais_data['type'];
+			    }
+			    if (isset($ais_data['imo'])) {
+			    	$data['imo'] = $ais_data['imo'];
+			    }
+			    if (isset($ais_data['callsign'])) {
+			    	$data['callsign'] = $ais_data['callsign'];
+			    }
+			    if (isset($ais_data['destination'])) {
+			    	$data['arrival_code'] = $ais_data['destination'];
+			    }
+			    if (isset($ais_data['eta_ts'])) {
+			    	$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+			    }
 			    if (isset($ais_data['timestamp'])) {
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 			    } else {
@@ -470,7 +635,9 @@ 
 			    }
 			    $data['format_source'] = 'aisnmeahttp';
 			    $data['id_source'] = $id_source;
-			    if ($ais_data['mmsi_type'] == 'Ship') $MI->add($data);
+			    if ($ais_data['mmsi_type'] == 'Ship') {
+			    	$MI->add($data);
+			    }
 			    unset($data);
 			}
 		    }
@@ -481,7 +648,9 @@ 
 	    echo 'download...';
 	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
 	    echo 'done !'."\n";
-	    if ($buffer != '') $reset = 0;
+	    if ($buffer != '') {
+	    	$reset = 0;
+	    }
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 	    $buffer = explode('\n',$buffer);
 	    foreach ($buffer as $line) {
@@ -525,16 +694,28 @@ 
     		    $line = explode(':', $line);
     		    if (count($line) > 30 && $line[0] != 'callsign') {
 			$data = array();
-			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
-			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
+			if (isset($line[37]) && $line[37] != '') {
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
+			} else {
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
+			}
 			$data['pilot_id'] = $line[1];
 			$data['pilot_name'] = $line[2];
 			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
 			$data['ident'] = $line[0]; // ident
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
+			if ($line[7] != '' && $line[7] != 0) {
+				$data['altitude'] = $line[7];
+			}
+			// altitude
 			$data['speed'] = $line[8]; // speed
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
+			if (isset($line[45])) {
+				$data['heading'] = $line[45];
+			}
+			// heading
+			elseif (isset($line[38])) {
+				$data['heading'] = $line[38];
+			}
+			// heading
 			$data['latitude'] = $line[5]; // lat
 	        	$data['longitude'] = $line[6]; // long
 	        	$data['verticalrate'] = ''; // vertical rate
@@ -550,7 +731,9 @@ 
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
 			$data['range'] = $line[19];
-			if (isset($line[35])) $data['info'] = $line[35];
+			if (isset($line[35])) {
+				$data['info'] = $line[35];
+			}
     			$data['id_source'] = $id_source;
 	    		//$data['arrival_airport_time'] = ;
 	    		if ($line[9] != '') {
@@ -564,24 +747,41 @@ 
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
 	    		$data['format_source'] = $value['format'];
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-    			if ($line[3] == 'PILOT') $SI->add($data);
-			elseif ($line[3] == 'ATC') {
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
+    			if ($line[3] == 'PILOT') {
+    				$SI->add($data);
+    			} elseif ($line[3] == 'ATC') {
 				//print_r($data);
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
 				$data['info'] = str_replace('&amp;sect;','',$data['info']);
 				$typec = substr($data['ident'],-3);
-				if ($typec == 'APP') $data['type'] = 'Approach';
-				elseif ($typec == 'TWR') $data['type'] = 'Tower';
-				elseif ($typec == 'OBS') $data['type'] = 'Observer';
-				elseif ($typec == 'GND') $data['type'] = 'Ground';
-				elseif ($typec == 'DEL') $data['type'] = 'Delivery';
-				elseif ($typec == 'DEP') $data['type'] = 'Departure';
-				elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
-				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
-				elseif ($data['type'] == '') $data['type'] = 'Observer';
-				if (!isset($data['source_name'])) $data['source_name'] = '';
-				if (isset($ATC)) echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
+				if ($typec == 'APP') {
+					$data['type'] = 'Approach';
+				} elseif ($typec == 'TWR') {
+					$data['type'] = 'Tower';
+				} elseif ($typec == 'OBS') {
+					$data['type'] = 'Observer';
+				} elseif ($typec == 'GND') {
+					$data['type'] = 'Ground';
+				} elseif ($typec == 'DEL') {
+					$data['type'] = 'Delivery';
+				} elseif ($typec == 'DEP') {
+					$data['type'] = 'Departure';
+				} elseif ($typec == 'FSS') {
+					$data['type'] = 'Flight Service Station';
+				} elseif ($typec == 'CTR') {
+					$data['type'] = 'Control Radar or Centre';
+				} elseif ($data['type'] == '') {
+					$data['type'] = 'Observer';
+				}
+				if (!isset($data['source_name'])) {
+					$data['source_name'] = '';
+				}
+				if (isset($ATC)) {
+					echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
+				}
 			}
     			unset($data);
     		    }
@@ -600,26 +800,55 @@ 
 		foreach ($all_data['acList'] as $line) {
 		    $data = array();
 		    $data['hex'] = $line['Icao']; // hex
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+		    if (isset($line['Call'])) {
+		    	$data['ident'] = $line['Call'];
+		    }
+		    // ident
+		    if (isset($line['Alt'])) {
+		    	$data['altitude'] = $line['Alt'];
+		    }
+		    // altitude
+		    if (isset($line['Spd'])) {
+		    	$data['speed'] = $line['Spd'];
+		    }
+		    // speed
+		    if (isset($line['Trak'])) {
+		    	$data['heading'] = $line['Trak'];
+		    }
+		    // heading
+		    if (isset($line['Lat'])) {
+		    	$data['latitude'] = $line['Lat'];
+		    }
+		    // lat
+		    if (isset($line['Long'])) {
+		    	$data['longitude'] = $line['Long'];
+		    }
+		    // long
 		    //$data['verticalrate'] = $line['']; // verticale rate
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+		    if (isset($line['Sqk'])) {
+		    	$data['squawk'] = $line['Sqk'];
+		    }
+		    // squawk
 		    $data['emergency'] = ''; // emergency
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
+		    if (isset($line['Reg'])) {
+		    	$data['registration'] = $line['Reg'];
+		    }
 		    /*
 		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
 		    else $data['datetime'] = date('Y-m-d H:i:s');
 		    */
 		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+		    if (isset($line['Type'])) {
+		    	$data['aircraft_icao'] = $line['Type'];
+		    }
 	    	    $data['format_source'] = 'aircraftlistjson';
 		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($data['datetime'])) $SI->add($data);
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
+		    if (isset($data['datetime'])) {
+		    	$SI->add($data);
+		    }
 		    unset($data);
 		}
 	    } else {
@@ -639,7 +868,9 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s');
 	    	    $data['format_source'] = 'aircraftlistjson';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -675,7 +906,9 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
 	    	    $data['format_source'] = 'planeupdatefaa';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -715,7 +948,9 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
-	    if (!empty($all_data)) $reset = 0;
+	    if (!empty($all_data)) {
+	    	$reset = 0;
+	    }
 	    foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
 		    $data = array();
@@ -736,7 +971,9 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
 	    	    $data['format_source'] = 'fr24json';
     		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -760,23 +997,39 @@ 
 		    if (isset($line['inf'])) {
 			$data = array();
 			$data['hex'] = $line['inf']['ia'];
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
+			if (isset($line['inf']['cs'])) {
+				$data['ident'] = $line['inf']['cs'];
+			}
+			//$line[13]
 	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
+	    		if (isset($line['inf']['gs'])) {
+	    			$data['speed'] = round($line['inf']['gs']*0.539957);
+	    		}
+	    		// speed
+	    		if (isset($line['inf']['tr'])) {
+	    			$data['heading'] = $line['inf']['tr'];
+	    		}
+	    		// heading
 	    		$data['latitude'] = $line['pt'][0]; // lat
 	    		$data['longitude'] = $line['pt'][1]; // long
 	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
+	    		if (isset($line['inf']['sq'])) {
+	    			$data['squawk'] = $line['inf']['sq'];
+	    		}
+	    		// squawk
 	    		//$data['aircraft_icao'] = $line[8];
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
+	    		if (isset($line['inf']['rc'])) {
+	    			$data['registration'] = $line['inf']['rc'];
+	    		}
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
 	    		//$data['emergency'] = ''; // emergency
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
 	    		$data['format_source'] = 'radarvirtueljson';
     			$data['id_source'] = $id_source;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
 			$SI->add($data);
 			unset($data);
 		    }
@@ -797,29 +1050,62 @@ 
 		    $data['id'] = $line['id'];
 		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
 		    $data['ident'] = $line['callsign']; // ident
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+		    if (isset($line['pilotid'])) {
+		    	$data['pilot_id'] = $line['pilotid'];
+		    }
+		    // pilot id
+		    if (isset($line['name'])) {
+		    	$data['pilot_name'] = $line['name'];
+		    }
+		    // pilot name
+		    if (isset($line['alt'])) {
+		    	$data['altitude'] = $line['alt'];
+		    }
+		    // altitude
+		    if (isset($line['gs'])) {
+		    	$data['speed'] = $line['gs'];
+		    }
+		    // speed
+		    if (isset($line['heading'])) {
+		    	$data['heading'] = $line['heading'];
+		    }
+		    // heading
+		    if (isset($line['route'])) {
+		    	$data['waypoints'] = $line['route'];
+		    }
+		    // route
 		    $data['latitude'] = $line['lat']; // lat
 		    $data['longitude'] = $line['lon']; // long
 		    //$data['verticalrate'] = $line['vrt']; // verticale rate
 		    //$data['squawk'] = $line['squawk']; // squawk
 		    //$data['emergency'] = ''; // emergency
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
+		    if (isset($line['depicao'])) {
+		    	$data['departure_airport_icao'] = $line['depicao'];
+		    }
+		    if (isset($line['deptime'])) {
+		    	$data['departure_airport_time'] = $line['deptime'];
+		    }
+		    if (isset($line['arricao'])) {
+		    	$data['arrival_airport_icao'] = $line['arricao'];
+		    }
 		    //$data['arrival_airport_time'] = $line['arrtime'];
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
-		    else $data['info'] = '';
+		    if (isset($line['aircraft'])) {
+		    	$data['aircraft_icao'] = $line['aircraft'];
+		    }
+		    if (isset($line['transponder'])) {
+		    	$data['squawk'] = $line['transponder'];
+		    }
+		    if (isset($line['atis'])) {
+		    	$data['info'] = $line['atis'];
+		    } else {
+		    	$data['info'] = '';
+		    }
 		    $data['format_source'] = 'pireps';
     		    $data['id_source'] = $id_source;
 		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    if ($line['icon'] == 'plane') {
 			$SI->add($data);
 		    //    print_r($data);
@@ -828,16 +1114,28 @@ 
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
 			$typec = substr($data['ident'],-3);
 			$data['type'] = '';
-			if ($typec == 'APP') $data['type'] = 'Approach';
-			elseif ($typec == 'TWR') $data['type'] = 'Tower';
-			elseif ($typec == 'OBS') $data['type'] = 'Observer';
-			elseif ($typec == 'GND') $data['type'] = 'Ground';
-			elseif ($typec == 'DEL') $data['type'] = 'Delivery';
-			elseif ($typec == 'DEP') $data['type'] = 'Departure';
-			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
-			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
-			else $data['type'] = 'Observer';
-			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
+			if ($typec == 'APP') {
+				$data['type'] = 'Approach';
+			} elseif ($typec == 'TWR') {
+				$data['type'] = 'Tower';
+			} elseif ($typec == 'OBS') {
+				$data['type'] = 'Observer';
+			} elseif ($typec == 'GND') {
+				$data['type'] = 'Ground';
+			} elseif ($typec == 'DEL') {
+				$data['type'] = 'Delivery';
+			} elseif ($typec == 'DEP') {
+				$data['type'] = 'Departure';
+			} elseif ($typec == 'FSS') {
+				$data['type'] = 'Flight Service Station';
+			} elseif ($typec == 'CTR') {
+				$data['type'] = 'Control Radar or Centre';
+			} else {
+				$data['type'] = 'Observer';
+			}
+			if (isset($ATC)) {
+				echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
+			}
 		    }
 		    unset($data);
 		}
@@ -847,7 +1145,9 @@ 
     	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
     	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
@@ -855,10 +1155,16 @@ 
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
+	    	    if (isset($line['pilotid'])) {
+	    	    	$data['id'] = $line['pilotid'].$line['flightnum'];
+	    	    }
 	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
+	    	    if (isset($line['pilotname'])) {
+	    	    	$data['pilot_name'] = $line['pilotname'];
+	    	    }
+	    	    if (isset($line['pilotid'])) {
+	    	    	$data['pilot_id'] = $line['pilotid'];
+	    	    }
 	    	    $data['ident'] = $line['flightnum']; // ident
 	    	    $data['altitude'] = $line['alt']; // altitude
 	    	    $data['speed'] = $line['gs']; // speed
@@ -876,27 +1182,41 @@ 
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
     		    $data['arrival_airport_time'] = $line['arrtime'];
     		    $data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+		    if (isset($line['route'])) {
+		    	$data['waypoints'] = $line['route'];
+		    }
+		    // route
 		    if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
 	    		$aircraft_data = explode('-',$line['aircraftname']);
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
-	    		else {
+	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) {
+	    			$data['aircraft_icao'] = $aircraft_data[0];
+	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) {
+	    			$data['aircraft_icao'] = $aircraft_data[1];
+	    		} else {
 	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
-	    		    else $data['aircraft_icao'] = $line['aircraftname'];
+	    		    if (isset($aircraft_data[1])) {
+	    		    	$data['aircraft_icao'] = $aircraft_data[1];
+	    		    } else {
+	    		    	$data['aircraft_icao'] = $line['aircraftname'];
+	    		    }
 	    		}
 	    	    }
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
+    		    if (isset($line['route'])) {
+    		    	$data['waypoints'] = $line['route'];
+    		    }
     		    $data['id_source'] = $id_source;
 	    	    $data['format_source'] = 'phpvmacars';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -904,7 +1224,9 @@ 
     	    $last_exec[$id]['last'] = time();
     	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
@@ -933,15 +1255,22 @@ 
 	    	    $data['arrival_airport_icao'] = $line['arrival'];
     		    //$data['arrival_airport_time'] = $line['arrival_time'];
     		    //$data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+		    if (isset($line['route'])) {
+		    	$data['waypoints'] = $line['route'];
+		    }
+		    // route
 	    	    $data['aircraft_icao'] = $line['plane_type'];
     		    $data['id_source'] = $id_source;
 	    	    $data['format_source'] = 'vam';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -949,7 +1278,9 @@ 
     	    $last_exec[$id]['last'] = time();
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais') {
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+	    if (function_exists('pcntl_fork')) {
+	    	pcntl_signal_dispatch();
+	    }
     	    //$last_exec[$id]['last'] = time();
 
 	    //$read = array( $sockets[$id] );
@@ -957,7 +1288,9 @@ 
 	    $write = NULL;
 	    $e = NULL;
 	    $n = socket_select($read, $write, $e, $timeout);
-	    if ($e != NULL) var_dump($e);
+	    if ($e != NULL) {
+	    	var_dump($e);
+	    }
 	    if ($n > 0) {
 		$reset = 0;
 		foreach ($read as $nb => $r) {
@@ -979,7 +1312,9 @@ 
 		    if ($buffer != '') {
 			$tt[$format] = 0;
 			if ($format == 'acarssbs3') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+                    	    if ($globalDebug) {
+                    	    	echo 'ACARS : '.$buffer."\n";
+                    	    }
 			    $ACARS->add(trim($buffer));
 			    $ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'raw') {
@@ -988,25 +1323,55 @@ 
 			    if (is_array($data)) {
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-                                if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
+					$data['source_name'] = $globalSources[$nb]['name'];
+				}
+    				if (isset($globalSources[$nb]['sourcestats'])) {
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				}
+                                if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+                                	$SI->add($data);
+                                }
                             }
                         } elseif ($format == 'ais') {
 			    $ais_data = $AIS->parse_line(trim($buffer));
 			    $data = array();
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+			    if (isset($ais_data['ident'])) {
+			    	$data['ident'] = $ais_data['ident'];
+			    }
+			    if (isset($ais_data['mmsi'])) {
+			    	$data['mmsi'] = $ais_data['mmsi'];
+			    }
+			    if (isset($ais_data['speed'])) {
+			    	$data['speed'] = $ais_data['speed'];
+			    }
+			    if (isset($ais_data['heading'])) {
+			    	$data['heading'] = $ais_data['heading'];
+			    }
+			    if (isset($ais_data['latitude'])) {
+			    	$data['latitude'] = $ais_data['latitude'];
+			    }
+			    if (isset($ais_data['longitude'])) {
+			    	$data['longitude'] = $ais_data['longitude'];
+			    }
+			    if (isset($ais_data['status'])) {
+			    	$data['status'] = $ais_data['status'];
+			    }
+			    if (isset($ais_data['type'])) {
+			    	$data['type'] = $ais_data['type'];
+			    }
+			    if (isset($ais_data['imo'])) {
+			    	$data['imo'] = $ais_data['imo'];
+			    }
+			    if (isset($ais_data['callsign'])) {
+			    	$data['callsign'] = $ais_data['callsign'];
+			    }
+			    if (isset($ais_data['destination'])) {
+			    	$data['arrival_code'] = $ais_data['destination'];
+			    }
+			    if (isset($ais_data['eta_ts'])) {
+			    	$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+			    }
 
 			    if (isset($ais_data['timestamp'])) {
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
@@ -1015,7 +1380,9 @@ 
 			    }
 			    $data['format_source'] = 'aisnmea';
     			    $data['id_source'] = $id_source;
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
+			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
+			    	$MI->add($data);
+			    }
 			    unset($data);
                         } elseif ($format == 'flightgearsp') {
                     	    //echo $buffer."\n";
@@ -1033,11 +1400,15 @@ 
 				$data['speed'] = round($line[5]*1.94384);
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'flightgearsp';
-				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+					$SI->add($data);
+				}
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
 			    }
                         } elseif ($format == 'acars') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+                    	    if ($globalDebug) {
+                    	    	echo 'ACARS : '.$buffer."\n";
+                    	    }
 			    $ACARS->add(trim($buffer));
 			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
 			    $ACARS->deleteLiveAcarsData();
@@ -1058,7 +1429,9 @@ 
 				    $aircraft_type = $line[10];
 				    $aircraft_type = preg_split(':/:',$aircraft_type);
 				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+				    	$SI->add($data);
+				    }
 				}
 			    }
 			} elseif ($format == 'beast') {
@@ -1074,21 +1447,43 @@ 
     				$data['hex'] = $lined['hexid'];
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
     				$data['datetime'] = date('Y-m-d H:i:s');;
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
+    				if (isset($lined['ident'])) {
+    					$data['ident'] = $lined['ident'];
+    				}
+    				if (isset($lined['lat'])) {
+    					$data['latitude'] = $lined['lat'];
+    				}
+    				if (isset($lined['lon'])) {
+    					$data['longitude'] = $lined['lon'];
+    				}
+    				if (isset($lined['speed'])) {
+    					$data['speed'] = $lined['speed'];
+    				}
+    				if (isset($lined['squawk'])) {
+    					$data['squawk'] = $lined['squawk'];
+    				}
+    				if (isset($lined['alt'])) {
+    					$data['altitude'] = $lined['alt'];
+    				}
+    				if (isset($lined['heading'])) {
+    					$data['heading'] = $lined['heading'];
+    				}
     				$data['id_source'] = $id_source;
     				$data['format_source'] = 'tsv';
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
+    					$data['source_name'] = $globalSources[$nb]['name'];
+    				}
+    				if (isset($globalSources[$nb]['sourcestats'])) {
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				}
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+    					$SI->add($data);
+    				}
     				unset($lined);
     				unset($data);
-    			    } else $error = true;
+    			    } else {
+    			    	$error = true;
+    			    }
 			} elseif ($format == 'aprs' && $use_aprs) {
 			    if ($aprs_connect == 0) {
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
@@ -1113,47 +1508,72 @@ 
 				    $aprs_last_tx = time();
 				    $data = array();
 				    //print_r($line);
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
-				    else $data['datetime'] = date('Y-m-d H:i:s');
+				    if (isset($line['address'])) {
+				    	$data['hex'] = $line['address'];
+				    }
+				    if (isset($line['timestamp'])) {
+				    	$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+				    } else {
+				    	$data['datetime'] = date('Y-m-d H:i:s');
+				    }
 				    //$data['datetime'] = date('Y-m-d H:i:s');
 				    $data['ident'] = $line['ident'];
 				    $data['latitude'] = $line['latitude'];
 				    $data['longitude'] = $line['longitude'];
 				    //$data['verticalrate'] = $line[16];
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
-				    else $data['speed'] = 0;
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
+				    if (isset($line['speed'])) {
+				    	$data['speed'] = $line['speed'];
+				    } else {
+				    	$data['speed'] = 0;
+				    }
+				    if (isset($line['altitude'])) {
+				    	$data['altitude'] = $line['altitude'];
+				    }
+				    if (isset($line['comment'])) {
+				    	$data['comment'] = $line['comment'];
+				    }
+				    if (isset($line['symbol'])) {
+				    	$data['type'] = $line['symbol'];
+				    }
+				    if (isset($line['heading'])) {
+				    	$data['heading'] = $line['heading'];
+				    }
 				    //else $data['heading'] = 0;
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
-				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
+				    if (isset($line['stealth'])) {
+				    	$data['aircraft_type'] = $line['stealth'];
+				    }
+				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) {
+				    	$data['noarchive'] = true;
+				    }
     				    $data['id_source'] = $id_source;
 				    $data['format_source'] = 'aprs';
 				    $data['source_name'] = $line['source'];
 				    $data['source_type'] = 'flarm';
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				    }
 				    $currentdate = date('Y-m-d H:i:s');
 				    $aprsdate = strtotime($data['datetime']);
 				    // Accept data if time <= system time + 20s
 				    if (isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
 					$send = $SI->add($data);
 				    } elseif (isset($line['stealth'])) {
-					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
-					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
+					if ($line['stealth'] != 0) {
+						echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
+					} else {
+						echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
+					}
 				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle' || $line['symbol'] == 'Police' || $line['symbol'] == 'Bike' || $line['symbol'] == 'Jogger' || $line['symbol'] == 'Bus' || $line['symbol'] == 'Jeep' || $line['symbol'] == 'Recreational Vehicle' || $line['symbol'] == 'Yacht (Sail)' || $line['symbol'] == 'Ship (Power Boat)' || $line['symbol'] == 'Firetruck' || $line['symbol'] == 'Balloon' || $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) {
 				    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
-					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
+					if (isset($globalTracker) && $globalTracker) {
+						$send = $TI->add($data);
+					}
 				    }
 				    unset($data);
-				} 
-				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
+				} elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
 					echo '!! Weather Station not yet supported'."\n";
-				}
-				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) {
+				} elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) {
 					echo '!! Car & Trucks not yet supported'."\n";
 				}
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
@@ -1186,25 +1606,42 @@ 
     				$data['ground'] = $line[21];
     				$data['emergency'] = $line[19];
     				$data['format_source'] = 'sbs';
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
+					$data['source_name'] = $globalSources[$nb]['name'];
+				}
+    				if (isset($globalSources[$nb]['sourcestats'])) {
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				}
     				$data['id_source'] = $id_source;
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
-    				else $error = true;
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+    					$send = $SI->add($data);
+    				} else {
+    					$error = true;
+    				}
     				unset($data);
-    			    } else $error = true;
+    			    } else {
+    			    	$error = true;
+    			    }
 			    if ($error) {
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
-					if ($globalDebug) echo "Not a message. Ignoring... \n";
+					if ($globalDebug) {
+						echo "Not a message. Ignoring... \n";
+					}
 				} else {
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
+					if ($globalDebug) {
+						echo "Wrong line format. Ignoring... \n";
+					}
 					if ($globalDebug) {
 						echo $buffer;
 						print_r($line);
 					}
 					//socket_close($r);
-					if ($globalDebug) echo "Reconnect after an error...\n";
-					if ($format == 'aprs') $aprs_connect = 0;
+					if ($globalDebug) {
+						echo "Reconnect after an error...\n";
+					}
+					if ($format == 'aprs') {
+						$aprs_connect = 0;
+					}
 					$sourceer[$nb] = $globalSources[$nb];
 					connect_all($sourceer);
 					$sourceer = array();
@@ -1212,10 +1649,14 @@ 
 			    }
 			}
 			// Sleep for xxx microseconds
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
+			if (isset($globalSBSSleep)) {
+				usleep($globalSBSSleep);
+			}
 		    } else {
 			if ($format == 'flightgearmp') {
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
+			    	if ($globalDebug) {
+			    		echo "Reconnect FlightGear MP...";
+			    	}
 				//@socket_close($r);
 				sleep($globalMinFetch);
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1224,10 +1665,15 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
+			    if (isset($tt[$format])) {
+			    	$tt[$format]++;
+			    } else {
+			    	$tt[$format] = 0;
+			    }
 			    if ($tt[$format] > 30) {
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
+				if ($globalDebug) {
+					echo "ERROR : Reconnect ".$format."...";
+				}
 				//@socket_close($r);
 				sleep(2);
 				$aprs_connect = 0;
@@ -1244,11 +1690,17 @@ 
 	    } else {
 		$error = socket_strerror(socket_last_error());
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
-			if (isset($globalDebug)) echo "Restarting...\n";
+			if ($globalDebug) {
+				echo "ERROR : socket_select give this error ".$error . "\n";
+			}
+			if (isset($globalDebug)) {
+				echo "Restarting...\n";
+			}
 			// Restart the script if possible
 			if (is_array($sockets)) {
-			    if ($globalDebug) echo "Shutdown all sockets...";
+			    if ($globalDebug) {
+			    	echo "Shutdown all sockets...";
+			    }
 			    
 			    foreach ($sockets as $sock) {
 				@socket_shutdown($sock,2);
@@ -1256,18 +1708,24 @@ 
 			    }
 			    
 			}
-			if ($globalDebug) echo "Restart all connections...";
+			if ($globalDebug) {
+				echo "Restart all connections...";
+			}
 			sleep(2);
 			$time = time();
 			//connect_all($hosts);
 			$aprs_connect = 0;
-			if ($reset > 40) exit('Too many attempts...');
+			if ($reset > 40) {
+				exit('Too many attempts...');
+			}
 			connect_all($globalSources);
 		}
 	    }
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Check all...'."\n";
+	    }
 	    $SI->checkAll();
 	}
     }

require/class.MarineLive.php

Braces +59 added lines, -20 removed lines

@@ -29,7 +29,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -76,8 +78,11 @@ 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -119,7 +124,9 @@ 
 			}
 		}
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate";
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query.$orderby_query;
@@ -144,7 +151,9 @@ 
 
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.mmsi, marine_live.ident, marine_live.type,marine_live.fammarine_id, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 			FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query." marine_live.latitude <> 0 AND marine_live.longitude <> 0";
@@ -178,7 +187,9 @@ 
 
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 			FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' 
@@ -211,7 +222,9 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT COUNT(DISTINCT marine_live.fammarine_id) as nb FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
 		} else {
@@ -239,7 +252,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -247,7 +262,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query;
 		} else {
@@ -411,11 +428,15 @@ 
 		//$query  = self::$global_query.' WHERE marine_live.fammarine_id = :id ORDER BY date';
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			if ($liveinterval) {
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			}
 			$query .= ' ORDER BY date';
 		} else {
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			if ($liveinterval) {
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			}
 			$query .= ' ORDER BY date';
 		}
 
@@ -510,7 +531,9 @@ 
 				$i++;
 				$j++;
 				if ($j == 30) {
-					if ($globalDebug) echo ".";
+					if ($globalDebug) {
+						echo ".";
+					}
 				    	try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
@@ -790,7 +813,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($longitude != '')
 		{
@@ -798,7 +823,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 
 		if ($heading != '')
@@ -807,7 +834,9 @@ 
 			{
 				return false;
 			}
-		} else $heading = 0;
+		} else {
+			$heading = 0;
+		}
 
 		if ($groundspeed != '')
 		{
@@ -815,9 +844,13 @@ 
 			{
 				return false;
 			}
-		} else $groundspeed = 0;
+		} else {
+			$groundspeed = 0;
+		}
 		date_default_timezone_set('UTC');
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
+		if ($date == '') {
+			$date = date("Y-m-d H:i:s", time());
+		}
 
         
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
@@ -838,9 +871,15 @@ 
 		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
 		
 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
-            	if ($arrival_date == '') $arrival_date = NULL;
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
+            		$groundspeed = 0;
+            	}
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
+            		$heading = 0;
+            	}
+            	if ($arrival_date == '') {
+            		$arrival_date = NULL;
+            	}
 		$query  = 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)';
 

require/class.Marine.php

Braces +145 added lines, -52 removed lines

@@ -31,7 +31,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -70,8 +72,11 @@ 
 				$filter_query_where .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'";
 			}
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -125,25 +130,40 @@ 
 				$temp_array['spotter_id'] = $row['spotter_archive_id'];
 			} elseif (isset($row['spotter_archive_output_id'])) {
 				$temp_array['spotter_id'] = $row['spotter_archive_output_id'];
-			*/} 
-			elseif (isset($row['marineid'])) {
+			*/} elseif (isset($row['marineid'])) {
 				$temp_array['marineid'] = $row['marineid'];
 			} else {
 				$temp_array['marineid'] = '';
 			}
-			if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id'];
-			if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi'];
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
+			if (isset($row['fammarine_id'])) {
+				$temp_array['fammarine_id'] = $row['fammarine_id'];
+			}
+			if (isset($row['mmsi'])) {
+				$temp_array['mmsi'] = $row['mmsi'];
+			}
+			if (isset($row['type'])) {
+				$temp_array['type'] = $row['type'];
+			}
 			$temp_array['ident'] = $row['ident'];
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
+			if (isset($row['latitude'])) {
+				$temp_array['latitude'] = $row['latitude'];
+			}
+			if (isset($row['longitude'])) {
+				$temp_array['longitude'] = $row['longitude'];
+			}
+			if (isset($row['format_source'])) {
+				$temp_array['format_source'] = $row['format_source'];
+			}
 			if (isset($row['heading'])) {
 				$temp_array['heading'] = $row['heading'];
 				$heading_direction = $this->parseDirection($row['heading']);
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				if (isset($heading_direction[0]['direction_fullname'])) {
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				}
+			}
+			if (isset($row['ground_speed'])) {
+				$temp_array['ground_speed'] = $row['ground_speed'];
 			}
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
 			
 			if (isset($row['date'])) {
 				$dateArray = $this->parseDateString($row['date']);
@@ -186,13 +206,21 @@ 
 			}
 			
 			$fromsource = NULL;
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
+			if (isset($row['source_name']) && $row['source_name'] != '') {
+				$temp_array['source_name'] = $row['source_name'];
+			}
+			if (isset($row['over_country']) && $row['over_country'] != '') {
+				$temp_array['over_country'] = $row['over_country'];
+			}
+			if (isset($row['distance']) && $row['distance'] != '') {
+				$temp_array['distance'] = $row['distance'];
+			}
 			$temp_array['query_number_rows'] = $num_rows;
 			$spotter_array[] = $temp_array;
 		}
-		if ($num_rows == 0) return array();
+		if ($num_rows == 0) {
+			return array();
+		}
 		$spotter_array[0]['query_number_rows'] = $num_rows;
 		return $spotter_array;
 	}	
@@ -223,8 +251,12 @@ 
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 		
 		if ($sort != "")
 		{
@@ -252,7 +284,9 @@ 
 		global $global_query;
 		
 		date_default_timezone_set('UTC');
-		if ($id == '') return array();
+		if ($id == '') {
+			return array();
+		}
 		$additional_query = "marine_output.fammarine_id = :id";
 		$query_values = array(':id' => $id);
 		$query  = $global_query." WHERE ".$additional_query." ";
@@ -395,8 +429,11 @@ 
 		$query .= " ORDER BY marine_output.source_name ASC";
 
 		$sth = $this->db->prepare($query);
-		if (!empty($query_values)) $sth->execute($query_values);
-		else $sth->execute();
+		if (!empty($query_values)) {
+			$sth->execute($query_values);
+		} else {
+			$sth->execute();
+		}
 
 		$source_array = array();
 		$temp_array = array();
@@ -451,8 +488,11 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':mmsi' => $mmsi));
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 
 	/*
@@ -468,7 +508,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
@@ -663,9 +705,15 @@ 
             		$latitude = 0;
             		$longitude = 0;
             	}
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                if ($arrival_date == '') $arrival_date = NULL;
+                if ($heading == '' || $Common->isInteger($heading) === false) {
+                	$heading = 0;
+                }
+                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
+                	$groundspeed = 0;
+                }
+                if ($arrival_date == '') {
+                	$arrival_date = NULL;
+                }
 		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)";
 
@@ -829,12 +877,18 @@ 
 		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
-			else $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			if ($globalDBdriver == 'mysql') {
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
+			} else {
+				$query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			}
 		}
 		if ($sincedate != '') {
-			if ($globalDBdriver == 'mysql') $query .= " AND marine_output.date > '".$sincedate."'";
-			else $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			if ($globalDBdriver == 'mysql') {
+				$query .= " AND marine_output.date > '".$sincedate."'";
+			} else {
+				$query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			}
 		}
 		$query_values = array();
 		if ($year != '') {
@@ -865,7 +919,9 @@ 
 			}
 		}
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -900,7 +956,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -950,7 +1008,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -996,7 +1056,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -1044,7 +1106,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
@@ -1093,7 +1157,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
@@ -1142,7 +1208,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		$orderby_sql = '';
 		if ($orderby == "hour")
@@ -1211,7 +1279,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1259,7 +1329,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1323,8 +1395,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1346,7 +1421,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1450,7 +1527,9 @@ 
 	*/
 	public function parseDirection($direction = 0)
 	{
-		if ($direction == '') $direction = 0;
+		if ($direction == '') {
+			$direction = 0;
+		}
 		$direction_array = array();
 		$temp_array = array();
 
@@ -1539,7 +1618,9 @@ 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			/*
@@ -1559,9 +1640,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1579,7 +1664,9 @@ 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
@@ -1591,9 +1678,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1611,7 +1702,9 @@ 
 	{
 		global $globalBitlyAccessToken;
 		
-		if ($globalBitlyAccessToken == '') return $url;
+		if ($globalBitlyAccessToken == '') {
+			return $url;
+		}
         
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
 		

require/class.MarineImport.php

Braces +149 added lines, -51 removed lines

@@ -44,7 +44,9 @@ 
 
     public function checkAll() {
 	global $globalDebug;
-	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";
@@ -57,12 +59,16 @@ 
     public function del() {
 	global $globalDebug;
 	// 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($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']);
@@ -72,7 +78,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']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			}
 			// Put in archive
 //			$Marine->db = null;
@@ -85,7 +93,9 @@ 
 
     public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
+		$globalCoordMinChange = '0.02';
+	}
 	date_default_timezone_set('UTC');
 	$dataFound = false;
 	$send = false;
@@ -109,8 +119,11 @@ 
 		*/
 		
 		$Common = new Common();
-	        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();
@@ -118,10 +131,16 @@ 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => ''));
 		    $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']) {
@@ -161,11 +180,17 @@ 
             		$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->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['speed']) && $line['speed'] != '') {
@@ -176,14 +201,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'])) {
@@ -191,20 +223,30 @@ 
 				$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);
 				$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;
@@ -213,8 +255,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;
@@ -232,7 +278,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'] != '') {
@@ -250,15 +298,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;
 
@@ -266,8 +320,11 @@ 
 		    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 '';
 		    }
 		} else {
@@ -281,22 +338,35 @@ 
 		    if ($this->all_tracked[$id]['addedMarine'] == 0) {
 		        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 ($globalDebug) echo "Check if aircraft is already in DB...";
+				if ($globalDebug) {
+					echo "Check if aircraft 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";
+				if ($globalDebug && $recent_ident == '') {
+					echo " Not in DB.\n";
+				} elseif ($globalDebug && $recent_ident != '') {
+					echo " Already in DB.\n";
+				}
 			    } else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
@@ -304,16 +374,24 @@ 
 			    //if there was no aircraft 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')));
+				    }
 				    $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]['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']);
 				    $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";
+				    }
 				    
 				    /*
 				    // Add source stat in DB
@@ -347,12 +425,16 @@ 
 				$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();
 				    $MarineLive = new MarineLive($this->db);
 				    $MarineLive->deleteLiveMarineData();
 				    $MarineLive->db=null;
-				    if ($globalDebug) echo " Done\n";
+				    if ($globalDebug) {
+				    	echo " Done\n";
+				    }
 				    $this->last_delete = time();
 				}
 			    } elseif ($recent_ident != '') {
@@ -375,13 +457,17 @@ 
 
 		    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 : ";
+				}
 				$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]['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']);
 				$MarineLive->db = null;
 				$this->all_tracked[$id]['putinarchive'] = false;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 
 				// Put statistics in $this->stats variable
 				/*
@@ -438,19 +524,29 @@ 
 				*/
 
 				$this->all_tracked[$id]['lastupdate'] = time();
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
-				if ($globalDebug) echo $result."\n";
-			} 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;
+				}
+				if ($globalDebug) {
+					echo $result."\n";
+				}
+			} 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 ($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();
 			}
 			
@@ -458,7 +554,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];
+		}
 	    }
 	}
     }

require/class.AIS.php

Braces +319 added lines, -139 removed lines

@@ -35,7 +35,9 @@ 
 			$temp += 1;
 			$flat = (float)($temp / (60.0 * 10000.0));
 			$flat *= -1.0;
-		} else $flat = (float)($temp / (60.0 * 10000.0));
+		} else {
+			$flat = (float)($temp / (60.0 * 10000.0));
+		}
 		return $flat; // float
 	}
 
@@ -47,7 +49,9 @@ 
 			$temp += 1;
 			$flon = (float)($temp / (60.0 * 10000.0));
 			$flon *= -1.0;
-		} else $flon = (float)($temp / (60.0 * 10000.0));
+		} else {
+			$flon = (float)($temp / (60.0 * 10000.0));
+		}
 		return $flon;
 	}
 
@@ -70,10 +74,8 @@ 
     */
 	private function asciidec_2_8bit($ascii) {
 		//only process in the following range: 48-87, 96-119
-		if ($ascii < 48) { }
-		else {
-			if($ascii>119) { }
-			else {
+		if ($ascii < 48) { } else {
+			if($ascii>119) { } else {
 				if ($ascii>87 && $ascii<96) ;
 				else {
 					$ascii=$ascii+40;
@@ -175,7 +177,9 @@ 
 			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,57,28)));
 			$ro->lat = $this->make_latf(bindec(substr($_aisdata,85,27)));
 			$ro->heading = bindec(substr($_aisdata,124,9));
-			if ($ro->heading == 511) $ro->heading = '';
+			if ($ro->heading == 511) {
+				$ro->heading = '';
+			}
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 19) {
 			$ro->cog = bindec(substr($_aisdata,112,12))/10;
@@ -185,7 +189,9 @@ 
 			$ro->name = $this->binchar($_aisdata,143,120);
 			$ro->cls = 2; // class B
 			$ro->heading = bindec(substr($_aisdata,124,9));
-			if ($ro->heading == 511) $ro->heading = '';
+			if ($ro->heading == 511) {
+				$ro->heading = '';
+			}
 			$ro->typeid = bindec(substr($_aisdata,263,8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,271,9));
@@ -216,9 +222,13 @@ 
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 27) {
 			$ro->cog = bindec(substr($_aisdata,85,9));
-			if ($ro->cog == 511) $ro->cog = 0.0;
+			if ($ro->cog == 511) {
+				$ro->cog = 0.0;
+			}
 			$ro->sog = bindec(substr($_aisdata,79,6));
-			if ($ro->sog == 63) $ro->sog = 0.0;
+			if ($ro->sog == 63) {
+				$ro->sog = 0.0;
+			}
 			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,44,18))*10);
 			$ro->lat = $this->make_latf(bindec(substr($_aisdata,62,17))*10);
 			$ro->cls = 1; // class A
@@ -267,88 +277,171 @@ 
 	}
 	
 	public function getShipType($code) {
-		if ($code == 0) return 'Not available (default)';
-		elseif ($code >= 1 && $code <= 19) return 'Reserved for future use';
-		elseif ($code == 20) return 'Wing in ground (WIG), all ships of this type';
-		elseif ($code == 21) return 'Wing in ground (WIG), Hazardous category A';
-		elseif ($code == 22) return 'Wing in ground (WIG), Hazardous category B';
-		elseif ($code == 23) return 'Wing in ground (WIG), Hazardous category C';
-		elseif ($code == 24) return 'Wing in ground (WIG), Hazardous category D';
-		elseif ($code == 25) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 26) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 27) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 28) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 29) return 'Wing in ground (WIG), Reserved for future use';
-		elseif ($code == 30) return 'Fishing';
-		elseif ($code == 31) return 'Towing';
-		elseif ($code == 32) return 'Towing: length exceeds 200m or breadth exceeds 25m';
-		elseif ($code == 33) return 'Dredging or underwater ops';
-		elseif ($code == 34) return 'Diving ops';
-		elseif ($code == 35) return 'Military ops';
-		elseif ($code == 36) return 'Sailing';
-		elseif ($code == 37) return 'Pleasure Craft';
-		elseif ($code == 38) return 'Reserved';
-		elseif ($code == 39) return 'Reserved';
-		elseif ($code == 40) return 'High speed craft (HSC), all ships of this type';
-		elseif ($code == 41) return 'High speed craft (HSC), Hazardous category A';
-		elseif ($code == 42) return 'High speed craft (HSC), Hazardous category B';
-		elseif ($code == 43) return 'High speed craft (HSC), Hazardous category C';
-		elseif ($code == 44) return 'High speed craft (HSC), Hazardous category D';
-		elseif ($code == 45) return 'High speed craft (HSC), Reserved for future use';
-		elseif ($code == 46) return 'High speed craft (HSC), Reserved for future use';
-		elseif ($code == 47) return 'High speed craft (HSC), Reserved for future use';
-		elseif ($code == 48) return 'High speed craft (HSC), Reserved for future use';
-		elseif ($code == 49) return 'High speed craft (HSC), No additional information';
-		elseif ($code == 50) return 'Pilot Vessel';
-		elseif ($code == 51) return 'Search and Rescue vessel';
-		elseif ($code == 52) return 'Tug';
-		elseif ($code == 53) return 'Port Tender';
-		elseif ($code == 54) return 'Anti-pollution equipment';
-		elseif ($code == 55) return 'Law Enforcement';
-		elseif ($code == 56) return 'Spare - Local Vessel';
-		elseif ($code == 57) return 'Spare - Local Vessel';
-		elseif ($code == 58) return 'Medical Transport';
-		elseif ($code == 59) return 'Noncombatant ship according to RR Resolution No. 18';
-		elseif ($code == 60) return 'Passenger, all ships of this type';
-		elseif ($code == 61) return 'Passenger, Hazardous category A';
-		elseif ($code == 62) return 'Passenger, Hazardous category B';
-		elseif ($code == 63) return 'Passenger, Hazardous category C';
-		elseif ($code == 64) return 'Passenger, Hazardous category D';
-		elseif ($code == 65) return 'Passenger, Reserved for future use';
-		elseif ($code == 66) return 'Passenger, Reserved for future use';
-		elseif ($code == 67) return 'Passenger, Reserved for future use';
-		elseif ($code == 68) return 'Passenger, Reserved for future use';
-		elseif ($code == 69) return 'Passenger, No additional information';
-		elseif ($code == 70) return 'Cargo, all ships of this type';
-		elseif ($code == 71) return 'Cargo, Hazardous category A';
-		elseif ($code == 72) return 'Cargo, Hazardous category B';
-		elseif ($code == 73) return 'Cargo, Hazardous category C';
-		elseif ($code == 74) return 'Cargo, Hazardous category D';
-		elseif ($code == 75) return 'Cargo, Reserved for future use';
-		elseif ($code == 76) return 'Cargo, Reserved for future use';
-		elseif ($code == 77) return 'Cargo, Reserved for future use';
-		elseif ($code == 78) return 'Cargo, Reserved for future use';
-		elseif ($code == 79) return 'Cargo, No additional information';
-		elseif ($code == 80) return 'Tanker, all ships of this type';
-		elseif ($code == 81) return 'Tanker, Hazardous category A';
-		elseif ($code == 82) return 'Tanker, Hazardous category B';
-		elseif ($code == 83) return 'Tanker, Hazardous category C';
-		elseif ($code == 84) return 'Tanker, Hazardous category D';
-		elseif ($code == 85) return 'Tanker, Reserved for future use';
-		elseif ($code == 86) return 'Tanker, Reserved for future use';
-		elseif ($code == 87) return 'Tanker, Reserved for future use';
-		elseif ($code == 88) return 'Tanker, Reserved for future use';
-		elseif ($code == 89) return 'Tanker, No additional information';
-		elseif ($code == 90) return 'Other Type, all ships of this type';
-		elseif ($code == 91) return 'Other Type, Hazardous category A';
-		elseif ($code == 92) return 'Other Type, Hazardous category B';
-		elseif ($code == 93) return 'Other Type, Hazardous category C';
-		elseif ($code == 94) return 'Other Type, Hazardous category D';
-		elseif ($code == 95) return 'Other Type, Reserved for future use';
-		elseif ($code == 96) return 'Other Type, Reserved for future use';
-		elseif ($code == 97) return 'Other Type, Reserved for future use';
-		elseif ($code == 98) return 'Other Type, Reserved for future use';
-		elseif ($code == 99) return 'Other Type, no additional information';
+		if ($code == 0) {
+			return 'Not available (default)';
+		} elseif ($code >= 1 && $code <= 19) {
+			return 'Reserved for future use';
+		} elseif ($code == 20) {
+			return 'Wing in ground (WIG), all ships of this type';
+		} elseif ($code == 21) {
+			return 'Wing in ground (WIG), Hazardous category A';
+		} elseif ($code == 22) {
+			return 'Wing in ground (WIG), Hazardous category B';
+		} elseif ($code == 23) {
+			return 'Wing in ground (WIG), Hazardous category C';
+		} elseif ($code == 24) {
+			return 'Wing in ground (WIG), Hazardous category D';
+		} elseif ($code == 25) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 26) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 27) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 28) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 29) {
+			return 'Wing in ground (WIG), Reserved for future use';
+		} elseif ($code == 30) {
+			return 'Fishing';
+		} elseif ($code == 31) {
+			return 'Towing';
+		} elseif ($code == 32) {
+			return 'Towing: length exceeds 200m or breadth exceeds 25m';
+		} elseif ($code == 33) {
+			return 'Dredging or underwater ops';
+		} elseif ($code == 34) {
+			return 'Diving ops';
+		} elseif ($code == 35) {
+			return 'Military ops';
+		} elseif ($code == 36) {
+			return 'Sailing';
+		} elseif ($code == 37) {
+			return 'Pleasure Craft';
+		} elseif ($code == 38) {
+			return 'Reserved';
+		} elseif ($code == 39) {
+			return 'Reserved';
+		} elseif ($code == 40) {
+			return 'High speed craft (HSC), all ships of this type';
+		} elseif ($code == 41) {
+			return 'High speed craft (HSC), Hazardous category A';
+		} elseif ($code == 42) {
+			return 'High speed craft (HSC), Hazardous category B';
+		} elseif ($code == 43) {
+			return 'High speed craft (HSC), Hazardous category C';
+		} elseif ($code == 44) {
+			return 'High speed craft (HSC), Hazardous category D';
+		} elseif ($code == 45) {
+			return 'High speed craft (HSC), Reserved for future use';
+		} elseif ($code == 46) {
+			return 'High speed craft (HSC), Reserved for future use';
+		} elseif ($code == 47) {
+			return 'High speed craft (HSC), Reserved for future use';
+		} elseif ($code == 48) {
+			return 'High speed craft (HSC), Reserved for future use';
+		} elseif ($code == 49) {
+			return 'High speed craft (HSC), No additional information';
+		} elseif ($code == 50) {
+			return 'Pilot Vessel';
+		} elseif ($code == 51) {
+			return 'Search and Rescue vessel';
+		} elseif ($code == 52) {
+			return 'Tug';
+		} elseif ($code == 53) {
+			return 'Port Tender';
+		} elseif ($code == 54) {
+			return 'Anti-pollution equipment';
+		} elseif ($code == 55) {
+			return 'Law Enforcement';
+		} elseif ($code == 56) {
+			return 'Spare - Local Vessel';
+		} elseif ($code == 57) {
+			return 'Spare - Local Vessel';
+		} elseif ($code == 58) {
+			return 'Medical Transport';
+		} elseif ($code == 59) {
+			return 'Noncombatant ship according to RR Resolution No. 18';
+		} elseif ($code == 60) {
+			return 'Passenger, all ships of this type';
+		} elseif ($code == 61) {
+			return 'Passenger, Hazardous category A';
+		} elseif ($code == 62) {
+			return 'Passenger, Hazardous category B';
+		} elseif ($code == 63) {
+			return 'Passenger, Hazardous category C';
+		} elseif ($code == 64) {
+			return 'Passenger, Hazardous category D';
+		} elseif ($code == 65) {
+			return 'Passenger, Reserved for future use';
+		} elseif ($code == 66) {
+			return 'Passenger, Reserved for future use';
+		} elseif ($code == 67) {
+			return 'Passenger, Reserved for future use';
+		} elseif ($code == 68) {
+			return 'Passenger, Reserved for future use';
+		} elseif ($code == 69) {
+			return 'Passenger, No additional information';
+		} elseif ($code == 70) {
+			return 'Cargo, all ships of this type';
+		} elseif ($code == 71) {
+			return 'Cargo, Hazardous category A';
+		} elseif ($code == 72) {
+			return 'Cargo, Hazardous category B';
+		} elseif ($code == 73) {
+			return 'Cargo, Hazardous category C';
+		} elseif ($code == 74) {
+			return 'Cargo, Hazardous category D';
+		} elseif ($code == 75) {
+			return 'Cargo, Reserved for future use';
+		} elseif ($code == 76) {
+			return 'Cargo, Reserved for future use';
+		} elseif ($code == 77) {
+			return 'Cargo, Reserved for future use';
+		} elseif ($code == 78) {
+			return 'Cargo, Reserved for future use';
+		} elseif ($code == 79) {
+			return 'Cargo, No additional information';
+		} elseif ($code == 80) {
+			return 'Tanker, all ships of this type';
+		} elseif ($code == 81) {
+			return 'Tanker, Hazardous category A';
+		} elseif ($code == 82) {
+			return 'Tanker, Hazardous category B';
+		} elseif ($code == 83) {
+			return 'Tanker, Hazardous category C';
+		} elseif ($code == 84) {
+			return 'Tanker, Hazardous category D';
+		} elseif ($code == 85) {
+			return 'Tanker, Reserved for future use';
+		} elseif ($code == 86) {
+			return 'Tanker, Reserved for future use';
+		} elseif ($code == 87) {
+			return 'Tanker, Reserved for future use';
+		} elseif ($code == 88) {
+			return 'Tanker, Reserved for future use';
+		} elseif ($code == 89) {
+			return 'Tanker, No additional information';
+		} elseif ($code == 90) {
+			return 'Other Type, all ships of this type';
+		} elseif ($code == 91) {
+			return 'Other Type, Hazardous category A';
+		} elseif ($code == 92) {
+			return 'Other Type, Hazardous category B';
+		} elseif ($code == 93) {
+			return 'Other Type, Hazardous category C';
+		} elseif ($code == 94) {
+			return 'Other Type, Hazardous category D';
+		} elseif ($code == 95) {
+			return 'Other Type, Reserved for future use';
+		} elseif ($code == 96) {
+			return 'Other Type, Reserved for future use';
+		} elseif ($code == 97) {
+			return 'Other Type, Reserved for future use';
+		} elseif ($code == 98) {
+			return 'Other Type, Reserved for future use';
+		} elseif ($code == 99) {
+			return 'Other Type, no additional information';
+		}
 	}
 
 	public function process_ais_itu($_itu, $_len, $_filler, $aux /*, $ais_ch*/) {
@@ -386,19 +479,34 @@ 
 		// assume 1st ! is valid
 		// find * ensure that it is at correct position
 		$end = strrpos ( $rawdata , '*' );
-		if ($end === FALSE) return -1; // check for NULLS!!!
+		if ($end === FALSE) {
+			return -1;
+		}
+		// check for NULLS!!!
 		$cs = substr( $rawdata, $end + 1 );
-		if ( strlen($cs) != 2 ) return -1; // correct cs length
+		if ( strlen($cs) != 2 ) {
+			return -1;
+		}
+		// correct cs length
 		$dcs = (int)hexdec( $cs );
-		for ( $alias=1; $alias<$end; $alias++) $chksum ^= ord( $rawdata[$alias] ); // perform XOR for NMEA checksum
+		for ( $alias=1; $alias<$end; $alias++) {
+			$chksum ^= ord( $rawdata[$alias] );
+		}
+		// perform XOR for NMEA checksum
 		if ( $chksum == $dcs ) { // NMEA checksum pass
 			$pcs = explode(',', $rawdata);
 			// !AI??? identifier
 			$num_seq = (int)$pcs[1]; // number of sequences
 			$seq = (int)$pcs[2]; // get sequence
 			// get msg sequence id
-			if ($pcs[3] == '') $msg_sid = -1; // non-multipart message, set to -1
-			else $msg_sid = (int)$pcs[3]; // multipart message
+			if ($pcs[3] == '') {
+				$msg_sid = -1;
+			}
+			// non-multipart message, set to -1
+			else {
+				$msg_sid = (int)$pcs[3];
+			}
+			// multipart message
 			$ais_ch = $pcs[4]; // get AIS channel
 			// message sequence checking
 			if ($num_seq < 1 || $num_seq > 9) {
@@ -459,10 +567,18 @@ 
 				//DEBUG echo "[$start $end $tst]\n";
 				$result = $this->process_ais_raw( $tst, "" );
 				$last_pos = $end + 1;
-			} else break;
+			} else {
+				break;
+			}
+		}
+		if ($last_pos > 0) {
+			$cbuf = substr($cbuf, $last_pos);
 		}
-		if ($last_pos > 0) $cbuf = substr($cbuf, $last_pos); // move...
-		if (strlen($cbuf) > 1024) $cbuf = ""; // prevent overflow simple mode...
+		// move...
+		if (strlen($cbuf) > 1024) {
+			$cbuf = "";
+		}
+		// prevent overflow simple mode...
 		return $result;
 	}
 
@@ -482,7 +598,9 @@ 
 		if ($lat<0.0) {
 			$lat = -$lat;
 			$neg=true;
-		} else $neg=false;
+		} else {
+			$neg=false;
+		}
 		$latd = 0x00000000;
 		$latd = intval ($lat * 600000.0);
 		if ($neg==true) {
@@ -498,7 +616,9 @@ 
 		if ($lon<0.0) {
 			$lon = -$lon;
 			$neg=true;
-		} else $neg=false;
+		} else {
+			$neg=false;
+		}
 		$lond = 0x00000000;
 		$lond = intval ($lon * 600000.0);
 		if ($neg==true) {
@@ -511,9 +631,14 @@ 
 
 	private function char2bin($name, $max_len) {
 		$len = strlen($name);
-		if ($len > $max_len) $name = substr($name,0,$max_len);
-		if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len) * 6);
-		else $pad = '';
+		if ($len > $max_len) {
+			$name = substr($name,0,$max_len);
+		}
+		if ($len < $max_len) {
+			$pad = str_repeat('0', ($max_len - $len) * 6);
+		} else {
+			$pad = '';
+		}
 		$rv = '';
 		$ais_chars = array(
 		    '@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9,
@@ -526,9 +651,12 @@ 
 		);
 		// "
 		$_a = str_split($name);
-		if ($_a) foreach ($_a as $_1) {
+		if ($_a) {
+			foreach ($_a as $_1) {
 			if (isset($ais_chars[$_1])) $dec = $ais_chars[$_1];
-			else $dec = 0;
+		} else {
+				$dec = 0;
+			}
 			$bin = str_pad(decbin( $dec ), 6, '0', STR_PAD_LEFT);
 			$rv .= $bin;
 			//echo "$_1 $dec ($bin)<br/>";
@@ -540,7 +668,9 @@ 
 		$len_bit = strlen($_enc);
 		$rem6 = $len_bit % 6;
 		$pad6_len = 0;
-		if ($rem6) $pad6_len = 6 - $rem6;
+		if ($rem6) {
+			$pad6_len = 6 - $rem6;
+		}
 		//echo  $pad6_len.'<br>';
 		$_enc .= str_repeat("0", $pad6_len); // pad the text...
 		$len_enc = strlen($_enc) / 6;
@@ -549,8 +679,11 @@ 
 		for ($i=0; $i<$len_enc; $i++) {
 			$offset = $i * 6;
 			$dec = bindec(substr($_enc,$offset,6));
-			if ($dec < 40) $dec += 48;
-			else $dec += 56;
+			if ($dec < 40) {
+				$dec += 48;
+			} else {
+				$dec += 56;
+			}
 			//echo chr($dec)." $dec<br/>";
 			$itu .= chr($dec);
 		}
@@ -563,25 +696,41 @@ 
 		}
 		$hex_arr = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
 		$lsb = $chksum & 0x0F;
-		if ($lsb >=0 && $lsb <= 15 ) $lsbc = $hex_arr[$lsb];
-		else $lsbc = '0';
+		if ($lsb >=0 && $lsb <= 15 ) {
+			$lsbc = $hex_arr[$lsb];
+		} else {
+			$lsbc = '0';
+		}
 		$msb = (($chksum & 0xF0) >> 4) & 0x0F;
-		if ($msb >=0 && $msb <= 15 ) $msbc = $hex_arr[$msb];
-		else $msbc = '0';
+		if ($msb >=0 && $msb <= 15 ) {
+			$msbc = $hex_arr[$msb];
+		} else {
+			$msbc = '0';
+		}
 		$itu = '!'.$itu."*{$msbc}{$lsbc}\r\n";
 		return $itu;
 	}
 
 	public function parse($buffer) {
 		$data = $this->process_ais_buf($buffer);
-		if (!is_object($data)) return array();
-		if ($data->lon != 0) $result['longitude'] = $data->lon;
-		if ($data->lat != 0) $result['latitude'] = $data->lat;
+		if (!is_object($data)) {
+			return array();
+		}
+		if ($data->lon != 0) {
+			$result['longitude'] = $data->lon;
+		}
+		if ($data->lat != 0) {
+			$result['latitude'] = $data->lat;
+		}
 		$result['ident'] = trim($data->name);
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if ($data->sog != -1.0) $result['speed'] = $data->sog;
-		if ($data->cog != 0) $result['heading'] = $data->cog;
+		if ($data->sog != -1.0) {
+			$result['speed'] = $data->sog;
+		}
+		if ($data->cog != 0) {
+			$result['heading'] = $data->cog;
+		}
 		/*
 		    $ro->cls = 0; // AIS class undefined, also indicate unparsed msg
 		    $ro->id = bindec(substr($_aisdata,0,6));
@@ -591,15 +740,25 @@ 
 
 	public function mmsitype($mmsi) {
 		if (strlen($mmsi) == 9) {
-			if (substr($mmsi,0,3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
-			elseif (substr($mmsi,0,3) == '972') return 'MOB (Man Overboard) device';
-			elseif (substr($mmsi,0,3) == '970') return 'AIS SART (Search and Rescue Transmitter)';
-			elseif (substr($mmsi,0,3) == '111') return 'SAR (Search and Rescue) aircraft';
-			elseif (substr($mmsi,0,2) == '98') return 'Auxiliary craft associated with a parent ship';
-			elseif (substr($mmsi,0,2) == '99') return 'Aids to Navigation';
-			elseif (substr($mmsi,0,2) == '00') return 'Coastal stations';
-			elseif (substr($mmsi,0,1) == '0') return 'Group of ships';
-			else return 'Ship';
+			if (substr($mmsi,0,3) == '974') {
+				return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
+			} elseif (substr($mmsi,0,3) == '972') {
+				return 'MOB (Man Overboard) device';
+			} elseif (substr($mmsi,0,3) == '970') {
+				return 'AIS SART (Search and Rescue Transmitter)';
+			} elseif (substr($mmsi,0,3) == '111') {
+				return 'SAR (Search and Rescue) aircraft';
+			} elseif (substr($mmsi,0,2) == '98') {
+				return 'Auxiliary craft associated with a parent ship';
+			} elseif (substr($mmsi,0,2) == '99') {
+				return 'Aids to Navigation';
+			} elseif (substr($mmsi,0,2) == '00') {
+				return 'Coastal stations';
+			} elseif (substr($mmsi,0,1) == '0') {
+				return 'Group of ships';
+			} else {
+				return 'Ship';
+			}
 		}
 
 	
@@ -616,24 +775,45 @@ 
 			//if ($globalDebug) echo '==== Line format not supported : '.$buffer."\n";
 			return array();
 		}
-		if ($data->lon != 0) $result['longitude'] = $data->lon;
-		if ($data->lat != 0) $result['latitude'] = $data->lat;
+		if ($data->lon != 0) {
+			$result['longitude'] = $data->lon;
+		}
+		if ($data->lat != 0) {
+			$result['latitude'] = $data->lat;
+		}
 		$result['ident'] = trim(str_replace('@','',$data->name));
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if (strlen($result['mmsi']) == 8 && susbtr($result['mmsi'],0,3) == '669') $result['mmsi'] = '3'.$result['mmsi'];
+		if (strlen($result['mmsi']) == 8 && susbtr($result['mmsi'],0,3) == '669') {
+			$result['mmsi'] = '3'.$result['mmsi'];
+		}
 		$result['mmsi_type'] = $this->mmsitype($result['mmsi']);
-		if ($data->sog != -1.0) $result['speed'] = $data->sog;
-		if ($data->heading != '') $result['heading'] = $data->heading;
-		elseif ($data->cog != 0) $result['heading'] = $data->cog;
-		if ($data->status != '') $result['status'] = $data->status;
-		if ($data->type != '') $result['type'] = $data->type;
-		if ($data->imo != '') $result['imo'] = $data->imo;
-		if ($data->callsign != '') $result['callsign'] = $data->callsign;
+		if ($data->sog != -1.0) {
+			$result['speed'] = $data->sog;
+		}
+		if ($data->heading != '') {
+			$result['heading'] = $data->heading;
+		} elseif ($data->cog != 0) {
+			$result['heading'] = $data->cog;
+		}
+		if ($data->status != '') {
+			$result['status'] = $data->status;
+		}
+		if ($data->type != '') {
+			$result['type'] = $data->type;
+		}
+		if ($data->imo != '') {
+			$result['imo'] = $data->imo;
+		}
+		if ($data->callsign != '') {
+			$result['callsign'] = $data->callsign;
+		}
 		if ($data->eta_month != '' && $data->eta_day != '' && $data->eta_hour != '' && $data->eta_minute != '') {
 			$result['eta_ts'] = strtotime(date('Y').'-'.$data->eta_month.'-'.$data->eta_day.' '.$data->eta_hour.':'.$data->eta_minute.':00');
 		}
-		if ($data->destination != '') $result['destination'] = $data->destination;
+		if ($data->destination != '') {
+			$result['destination'] = $data->destination;
+		}
 		$result['all'] = (array) $data;
 		/*
 		    $ro->cls = 0; // AIS class undefined, also indicate unparsed msg