Ysurac / FlightAirMap

install/class.update_schema.php

Braces +394 added lines, -146 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;
+				}
 			}
 		}
 
@@ -1608,41 +1674,65 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tracker_output')) {
 				$error .= create_db::import_file('../db/tracker_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('tracker_live')) {
 				$error .= create_db::import_file('../db/tracker_live.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_output')) {
 				$error .= create_db::import_file('../db/marine_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_live')) {
 				$error .= create_db::import_file('../db/marine_live.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_identity')) {
 				$error .= create_db::import_file('../db/marine_identity.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_mid')) {
 				$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 {
@@ -1661,39 +1751,61 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('marine_image')) {
 				$error .= create_db::import_file('../db/marine_image.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_archive')) {
 				$error .= create_db::import_file('../db/marine_archive.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_archive_output')) {
 				$error .= create_db::import_file('../db/marine_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('tracker_archive')) {
 				$error .= create_db::import_file('../db/tracker_archive.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('tracker_archive_output')) {
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_archive_output')) {
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/marine_image.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_archive.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_archive_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/tracker_archive.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
@@ -2064,7 +2176,9 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tracker_archive_output')) {
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			$query = "ALTER TABLE tracker_live MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;";
 		} else {
@@ -2095,8 +2209,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";
@@ -2110,178 +2227,309 @@ 
     		    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);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '37') {
     			    $error = self::update_from_37();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '38') {
     			    $error = self::update_from_38();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '39') {
     			    $error = self::update_from_39();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '40') {
     			    $error = self::update_from_40();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '41') {
     			    $error = self::update_from_41();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '42') {
     			    $error = self::update_from_42();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '43') {
     			    $error = self::update_from_43();
-    			    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;
+	    }
     	}
     	
 }

require/class.TrackerImport.php

Braces +190 added lines, -65 removed lines

@@ -42,7 +42,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";
@@ -55,12 +57,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";
+            		}
 			/*
 			$TrackerLive = new TrackerLive();
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
@@ -70,7 +76,9 @@ 
             		$Tracker = new Tracker($this->db);
             		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			}
 			// Put in archive
 //			$Tracker->db = null;
@@ -83,7 +91,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;
@@ -97,19 +107,29 @@ 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
 		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+		    if (isset($line['source_name'])) {
+		    	$source = $line['source_name'];
+		    } else {
+		    	$source = '';
+		    }
+		    if ($source == '' || $line['format_source'] == 'aprs') {
+		    	$source = $line['format_source'];
+		    }
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    } else {
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    }
 		}
 		
 		
 		$Common = new Common();
-	        if (!isset($line['id'])) $id = trim($line['ident']);
-	        else $id = trim($line['id']);
+	        if (!isset($line['id'])) {
+	        	$id = trim($line['ident']);
+	        } else {
+	        	$id = trim($line['id']);
+	        }
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
@@ -117,31 +137,46 @@ 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
 		    $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['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
 		    } else {
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\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]['ident']." - 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]['ident']." - format : ".$line['format_source']."\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]['ident']." - format : ".$line['format_source']."\n";
+				}
 				return '';
 		    }
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
 		} else {
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		}
 		
@@ -153,11 +188,17 @@ 
             		$Tracker = new Tracker($this->db);
             		$fromsource = NULL;
             		$result = $Tracker->updateIdentTrackerData($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";
+			}
 			$Tracker->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'] != '') {
@@ -168,14 +209,21 @@ 
 		    if ($distance > 100 && $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]['ident']." : ".$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]['ident']." : ".$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 > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			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'])) {
@@ -183,20 +231,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);
 				$Tracker = new Tracker($this->db);
 				$all_country = $Tracker->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'];
+				}
 				$Tracker->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;
@@ -205,8 +263,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;
@@ -224,7 +286,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'] != '') {
@@ -244,7 +308,9 @@ 
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
+			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) {
+				$this->all_tracked[$id]['putinarchive'] = true;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
@@ -256,15 +322,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;
 
@@ -273,20 +345,31 @@ 
 		    if ($this->all_tracked[$id]['addedTracker'] == 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);
 				$TrackerLive = new TrackerLive($this->db);
 				if (isset($line['id'])) {
 				    $recent_ident = $TrackerLive->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]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 				    $recent_ident = $TrackerLive->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 = '';
+				}
 				$TrackerLive->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));
@@ -294,27 +377,41 @@ 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
 			    if($recent_ident == "")
 			    {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." 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]['ident'].'-'.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]['ident'].'-'.date('YmdHi')));
+				    }
 				    $timeelapsed = microtime(true);
 				    $Tracker = new Tracker($this->db);
 				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
 				    $Tracker->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
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
-					if ($globalDebug) echo 'Add source stats : ';
+					if ($globalDebug) {
+						echo 'Add source stats : ';
+					}
 				        foreach($this->stats as $date => $data) {
 					    foreach($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        if (isset($sourced['polar'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
+				    	        }
+				    	        if (isset($sourced['hist'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        }
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -327,7 +424,9 @@ 
 			    			unset($this->stats[$date]);
 			    		    }
 				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
+				    	if ($globalDebug) {
+				    		echo 'Done'."\n";
+				    	}
 
 				    }
 				    $Stats->db = null;
@@ -337,12 +436,16 @@ 
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
+				    if ($globalDebug) {
+				    	echo "---- Deleting Live Tracker data older than 9 hours...";
+				    }
 				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
 				    $TrackerLive = new TrackerLive($this->db);
 				    $TrackerLive->deleteLiveTrackerData();
 				    $TrackerLive->db=null;
-				    if ($globalDebug) echo " Done\n";
+				    if ($globalDebug) {
+				    	echo " Done\n";
+				    }
 				    $this->last_delete = time();
 				}
 			    } else {
@@ -365,19 +468,25 @@ 
 
 		    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);
 				$TrackerLive = new TrackerLive($this->db);
 				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
 				$TrackerLive->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
 				
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					$source = $this->all_tracked[$id]['source_name'];
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
+					if ($source == '') {
+						$source = $this->all_tracked[$id]['format_source'];
+					}
 					if (!isset($this->source_location[$source])) {
 						$Location = new Source();
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -398,7 +507,9 @@ 
 					$stats_heading = round($stats_heading/22.5);
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
-					if ($stats_heading == 16) $stats_heading = 0;
+					if ($stats_heading == 16) {
+						$stats_heading = 0;
+					}
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -416,7 +527,9 @@ 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
-						} else $mini = 0;
+						} else {
+							$mini = 0;
+						}
 						for ($i=$mini;$i<=$distance;$i+=10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
@@ -427,19 +540,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 Tracker data Not updated since 2 hour...";
+			    if ($globalDebug) {
+			    	echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+			    }
 			    $TrackerLive = new TrackerLive($this->db);
 			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
 			    $TrackerLive->db = null;
 			    //TrackerLive->deleteLiveTrackerData();
-			    if ($globalDebug) echo " Done\n";
+			    if ($globalDebug) {
+			    	echo " Done\n";
+			    }
 			    $this->last_delete_hourly = time();
 			}
 			
@@ -447,7 +570,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];
+		}
 	    }
 	}
     }