Ysurac / FlightAirMap

install/class.update_db.php

Braces +1160 added lines, -402 removed lines

@@ -26,7 +26,9 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLOPT_TIMEOUT, 200);
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
+		if ($referer != '') {
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
+		}
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 		curl_setopt($ch, CURLOPT_FILE, $fp);
 		curl_exec($ch);
@@ -37,12 +39,16 @@ 
 	public static function gunzip($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
+		if ($out_file_name == '') {
+			$out_file_name = str_replace('.gz', '', $in_file);
+		}
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
-			else {
+			if (function_exists('gzopen')) {
+				$file = gzopen($in_file,'rb');
+			} elseif (function_exists('gzopen64')) {
+				$file = gzopen64($in_file,'rb');
+			} else {
 				echo 'gzopen not available';
 				die;
 			}
@@ -63,8 +69,12 @@ 
 			if ($res === TRUE) {
 				$zip->extractTo($path);
 				$zip->close();
-			} else return false;
-		} else return false;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 	
 	public static function connect_sqlite($database) {
@@ -79,7 +89,9 @@ 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -90,7 +102,9 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
     		update_db::connect_sqlite($database_file);
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
@@ -105,15 +119,21 @@ 
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
 		try {
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$sth_dest->execute($query_dest_values);
             		}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
-			if ($globalTransaction) $Connection->db->rollBack(); 
+			if ($globalTransaction) {
+				$Connection->db->rollBack();
+			}
 			return "error : ".$e->getMessage();
 		}
                 return '';
@@ -121,7 +141,9 @@ 
 	public static function retrieve_route_oneworld($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -132,14 +154,18 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
 		if ($fh = fopen($database_file,"r")) {
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (!feof($fh)) {
 				$line = fgetcsv($fh,9999,',');
 				if ($line[0] != '') {
@@ -148,13 +174,17 @@ 
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
 							$sth_dest->execute($query_dest_values);
 						} catch(PDOException $e) {
-							if ($globalTransaction) $Connection->db->rollBack(); 
+							if ($globalTransaction) {
+								$Connection->db->rollBack();
+							}
 							return "error : ".$e->getMessage();
 						}
 					}
 				}
 			}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
                 return '';
 	}
@@ -162,7 +192,9 @@ 
 	public static function retrieve_route_skyteam($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -173,7 +205,9 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
@@ -182,7 +216,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				while (!feof($fh)) {
 					$line = fgetcsv($fh,9999,',');
 					if ($line[0] != '') {
@@ -193,9 +229,13 @@ 
 						}
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
-				if ($globalTransaction) $Connection->db->rollBack(); 
+				if ($globalTransaction) {
+					$Connection->db->rollBack();
+				}
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -238,11 +278,16 @@ 
 		$sth_dest = $Connection->db->prepare($query_dest);
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
 		try {
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
-				if ($values['UserString4'] == 'M') $type = 'military';
-				else $type = null;
+				if ($values['UserString4'] == 'M') {
+					$type = 'military';
+				} else {
+					$type = null;
+				}
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
 				$sth_dest->execute($query_dest_values);
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
@@ -250,7 +295,9 @@ 
 				    $sth_dest_owner->execute($query_dest_owner_values);
 				}
             		}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
@@ -287,7 +334,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
             			while (!feof($fh)) {
             				$values = array();
             				$line = $Common->hex2str(fgets($fh,9999));
@@ -298,7 +347,9 @@ 
             				// Check if we can find ICAO, else set it to GLID
             				$aircraft_name_split = explode(' ',$aircraft_name);
             				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				}
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
             				$sth_search = $Connection->db->prepare($query_search);
 					try {
@@ -311,7 +362,9 @@ 
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
+					if (!isset($values['ICAOTypeCode'])) {
+						$values['ICAOTypeCode'] = 'GLID';
+					}
 					// Add data to db
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
@@ -320,7 +373,9 @@ 
 						$sth_dest->execute($query_dest_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -356,7 +411,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				$tmp = fgetcsv($fh,9999,',',"'");
             			while (!feof($fh)) {
             				$line = fgetcsv($fh,9999,',',"'");
@@ -370,13 +427,17 @@ 
             				// Check if we can find ICAO, else set it to GLID
             				$aircraft_name_split = explode(' ',$aircraft_name);
             				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				}
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
             				$sth_search = $Connection->db->prepare($query_search);
 					try {
                                     		$sth_search->execute();
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
+	            				if (isset($result['icao']) && $result['icao'] != '') {
+	            					$values['ICAOTypeCode'] = $result['icao'];
+	            				}
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -389,7 +450,9 @@ 
 						$sth_dest->execute($query_dest_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -428,7 +491,9 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			$sth_modes = $Connection->db->prepare($query_modes);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				$tmp = fgetcsv($fh,9999,',','"');
             			while (!feof($fh)) {
             				$line = fgetcsv($fh,9999,',','"');
@@ -438,16 +503,22 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = $line[4];
             				    $values['owner'] = $line[5];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+            				    if ($line[6] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    }
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'EI') {
 					    // TODO : add modeS & reg to aircraft_modes
             				    $values['registration'] = $line[0];
             				    $values['base'] = $line[3];
             				    $values['owner'] = $line[2];
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+            				    if ($line[1] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+					    }
 					    $values['cancel'] = '';
 					    $values['modes'] = $line[7];
 					    $values['icao'] = $line[8];
@@ -466,16 +537,22 @@ 
             				    $values['registration'] = $line[3];
             				    $values['base'] = null;
             				    $values['owner'] = $line[5];
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+            				    if ($line[18] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'VH') {
 					    // TODO : add modeS & reg to aircraft_modes
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[12];
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+            				    if ($line[28] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+					    }
 
 					    $values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
@@ -494,29 +571,41 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[8];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+            				    if ($line[7] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'PP') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+            				    if ($line[6] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    }
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'E7') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+            				    if ($line[5] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == '8Q') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[3];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+            				    if ($line[7] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'ZK') {
             				    $values['registration'] = $line[0];
@@ -561,7 +650,9 @@ 
 						$sth_modes->execute($query_modes_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -697,25 +788,45 @@ 
 		    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
-		if ($globalTransaction) $Connection->db->beginTransaction();
+		if ($globalTransaction) {
+			$Connection->db->beginTransaction();
+		}
   
 		$i = 0;
 		while($row = sparql_fetch_array($result))
 		{
 			if ($i >= 1) {
 			//print_r($row);
-			if (!isset($row['iata'])) $row['iata'] = '';
-			if (!isset($row['icao'])) $row['icao'] = '';
-			if (!isset($row['type'])) $row['type'] = '';
-			if (!isset($row['altitude'])) $row['altitude'] = '';
+			if (!isset($row['iata'])) {
+				$row['iata'] = '';
+			}
+			if (!isset($row['icao'])) {
+				$row['icao'] = '';
+			}
+			if (!isset($row['type'])) {
+				$row['type'] = '';
+			}
+			if (!isset($row['altitude'])) {
+				$row['altitude'] = '';
+			}
 			if (isset($row['city_bis'])) {
 				$row['city'] = $row['city_bis'];
 			}
-			if (!isset($row['city'])) $row['city'] = '';
-			if (!isset($row['country'])) $row['country'] = '';
-			if (!isset($row['homepage'])) $row['homepage'] = '';
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
-			if (!isset($row['name'])) continue;
+			if (!isset($row['city'])) {
+				$row['city'] = '';
+			}
+			if (!isset($row['country'])) {
+				$row['country'] = '';
+			}
+			if (!isset($row['homepage'])) {
+				$row['homepage'] = '';
+			}
+			if (!isset($row['wikipedia_page'])) {
+				$row['wikipedia_page'] = '';
+			}
+			if (!isset($row['name'])) {
+				continue;
+			}
 			if (!isset($row['image'])) {
 				$row['image'] = '';
 				$row['image_thumb'] = '';
@@ -771,7 +882,9 @@ 
 
 			$i++;
 		}
-		if ($globalTransaction) $Connection->db->commit();
+		if ($globalTransaction) {
+			$Connection->db->commit();
+		}
 		/*
 		echo "Delete duplicate rows...\n";
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
@@ -814,7 +927,9 @@ 
 		$delimiter = ',';
 		$out_file = $tmp_dir.'airports.csv';
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
+		if (!file_exists($out_file) || !is_readable($out_file)) {
+			return FALSE;
+		}
 		echo "Add data from ourairports.com...\n";
 
 		$header = NULL;
@@ -824,8 +939,9 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
-				else {
+				if(!$header) {
+					$header = $row;
+				} else {
 					$data = array();
 					$data = array_combine($header, $row);
 					try {
@@ -866,7 +982,9 @@ 
 		echo "Download data from another free database...\n";
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
+		if (!file_exists($out_file) || !is_readable($out_file)) {
+			return FALSE;
+		}
 		update_db::unzip($out_file);
 		$header = NULL;
 		echo "Add data from another free database...\n";
@@ -877,8 +995,9 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
-				else {
+				if(!$header) {
+					$header = $row;
+				} else {
 					$data = $row;
 
 					$query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao';
@@ -1047,7 +1166,9 @@ 
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1060,7 +1181,9 @@ 
 					}
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
 					if (!empty($result_search)) {
-						if ($globalDebug) echo '.';
+						if ($globalDebug) {
+							echo '.';
+						}
 							//if ($globalDBdriver == 'mysql') {
 							//	$queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao';
 							//} else {
@@ -1082,8 +1205,12 @@ 
 						}
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
 						if (!empty($result_search_mfr)) {
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
+								$data[16] = $data[23];
+							}
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
+								$data[16] = $data[15];
+							}
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
 							try {
 								$sthf = $Connection->db->prepare($queryf);
@@ -1094,7 +1221,9 @@ 
 						}
 					}
 					if (strtotime($data[29]) > time()) {
-						if ($globalDebug) echo 'i';
+						if ($globalDebug) {
+							echo 'i';
+						}
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 						try {
 							$sth = $Connection->db->prepare($query);
@@ -1105,13 +1234,19 @@ 
 					}
 				}
 				if ($i % 90 == 0) {
-					if ($globalTransaction) $Connection->db->commit();
-					if ($globalTransaction) $Connection->db->beginTransaction();
+					if ($globalTransaction) {
+						$Connection->db->commit();
+					}
+					if ($globalTransaction) {
+						$Connection->db->beginTransaction();
+					}
 				}
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1131,11 +1266,15 @@ 
 		if (($handle = fopen($tmp_dir.'modes.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
-					if ($data[1] == 'NULL') $data[1] = $data[0];
+					if ($data[1] == 'NULL') {
+						$data[1] = $data[0];
+					}
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -1147,7 +1286,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1179,11 +1320,15 @@ 
 		if (($handle = fopen($tmp_dir.'airlines.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
-					if ($data[1] == 'NULL') $data[1] = $data[0];
+					if ($data[1] == 'NULL') {
+						$data[1] = $data[0];
+					}
 					$query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -1195,7 +1340,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		/*
 		$query = "UNLOCK TABLES";
@@ -1225,7 +1372,9 @@ 
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1241,7 +1390,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1261,7 +1412,9 @@ 
 		if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1271,19 +1424,25 @@ 
 						$sth = $Connection->db->prepare($query);
 						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
 					} catch(PDOException $e) {
-						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
+						if ($globalDebug) {
+							echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
+						}
 						die();
 					}
 				}
 				if ($globalTransaction && $i % 2000 == 0) {
 					$Connection->db->commit();
-					if ($globalDebug) echo '.';
+					if ($globalDebug) {
+						echo '.';
+					}
 					$Connection->db->beginTransaction();
 				}
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1308,7 +1467,9 @@ 
 			$i = 0;
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
 			//$Connection->db->beginTransaction();
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1324,7 +1485,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1344,7 +1507,9 @@ 
 		if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1361,7 +1526,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1380,7 +1547,9 @@ 
 		$Connection = new Connection();
 		if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE)
 		{
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000)) !== FALSE)
 			{
 				$query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL';
@@ -1395,7 +1564,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1471,9 +1642,14 @@ 
 				if ($i > 0 && $data[0] != '') {
 					$sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]);
 					$period = str_replace(',','',$data[14]);
-					if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60;
-					if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18]));
-					else $launch_date = NULL;
+					if (!empty($period) && strpos($period,'days')) {
+						$period = str_replace(' days','',$period)*24*60;
+					}
+					if ($data[18] != '') {
+						$launch_date = date('Y-m-d',strtotime($data[18]));
+					} else {
+						$launch_date = NULL;
+					}
 					$data = array_map(function($value) {
 						return trim($value) === '' ? null : $value;
 					}, $data);
@@ -1836,7 +2012,9 @@ 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				$i++;
@@ -1864,7 +2042,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1907,7 +2087,9 @@ 
 		$Connection = new Connection();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if(count($row) > 1) {
@@ -1921,7 +2103,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1941,8 +2125,9 @@ 
 	        }
 
 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
-		else {
+		if ($globalDBdriver == 'mysql') {
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
+		} else {
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
 			$query = "CREATE EXTENSION postgis";
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
@@ -1961,7 +2146,9 @@ 
 		global $tmp_dir, $globalDebug;
 		include_once('class.create_db.php');
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "NOTAM from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5');
 		$error = '';
 		if (file_exists($tmp_dir.'notam.txt.gz.md5')) {
@@ -1971,20 +2158,34 @@ 
 				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
 				if (file_exists($tmp_dir.'notam.txt.gz')) {
 					if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'notam.txt.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						//$error = create_db::import_file($tmp_dir.'notam.sql');
 						$NOTAM = new NOTAM();
 						$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
 						update_db::insert_notam_version($notam_md5);
-					} else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
-			} elseif ($globalDebug) echo "No new version.";
-		} else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
+				}
+			} elseif ($globalDebug) {
+				echo "No new version.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2039,68 +2240,114 @@ 
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
 		if (extension_loaded('zip')) {
 			if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
-				if ($globalDebug) echo "Unzip...";
+				if ($globalDebug) {
+					echo "Unzip...";
+				}
 				update_db::unzip($tmp_dir.'ivae_feb2013.zip');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
-				if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
+				if ($globalDebug) {
+					echo "Copy airlines logos to airlines images directory...";
+				}
 				if (is_writable(dirname(__FILE__).'/../images/airlines')) {
-					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
-				} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
-			} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
-		} else $error = "ZIP module not loaded but required for IVAO.";
+					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
+						$error = "Failed to copy airlines logo.";
+					}
+				} else {
+					$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
+				}
+			} else {
+				$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
+			}
+		} else {
+			$error = "ZIP module not loaded but required for IVAO.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_routes() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Routes : Download...";
+		if ($globalDebug) {
+			echo "Routes : Download...";
+		}
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_oneworld() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
+		if ($globalDebug) {
+			echo "Schedules Oneworld : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_skyteam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
+		if ($globalDebug) {
+			echo "Schedules Skyteam : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_ModeS() {
@@ -2117,340 +2364,590 @@ 
 			exit;
 		} elseif ($globalDebug) echo "Done\n";
 */
-		if ($globalDebug) echo "Modes : Download...";
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
+		if ($globalDebug) {
+			echo "Modes : Download...";
+		}
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
 		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
-			if ($globalDebug) echo "Unzip...";
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_faa() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes FAA: Download...";
+		if ($globalDebug) {
+			echo "Modes FAA: Download...";
+		}
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
-			if ($globalDebug) echo "Unzip...";
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::modes_faa();
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_flarm() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
+		if ($globalDebug) {
+			echo "Modes Flarmnet: Download...";
+		}
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
 		if (file_exists($tmp_dir.'data.fln')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_ogn() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes OGN: Download...";
+		if ($globalDebug) {
+			echo "Modes OGN: Download...";
+		}
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
 		if (file_exists($tmp_dir.'ogn.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_owner() {
 		global $tmp_dir, $globalDebug, $globalMasterSource;
 		
-		if ($globalDebug) echo "Owner France: Download...";
+		if ($globalDebug) {
+			echo "Owner France: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
 		if (file_exists($tmp_dir.'owner_f.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		
-		if ($globalDebug) echo "Owner Ireland: Download...";
+		if ($globalDebug) {
+			echo "Owner Ireland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Switzerland: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Switzerland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Czech Republic: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Australia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Australia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Austria: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Austria: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Chile: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Chile: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Colombia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Colombia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Bosnia Herzegobina: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Brazil: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Brazil: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Cayman Islands: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Croatia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Croatia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Luxembourg: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Maldives: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Maldives: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner New Zealand: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner New Zealand: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Papua New Guinea: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Slovakia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Slovakia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
 		if (file_exists($tmp_dir.'owner_om.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Ecuador: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Ecuador: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Iceland: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Iceland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Isle of Man: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Isle of Man: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
 		if (file_exists($tmp_dir.'owner_m.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
-		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		if ($globalMasterSource) {
-			if ($globalDebug) echo "ModeS Netherlands: Download...";
+			if ($globalDebug) {
+				echo "ModeS Netherlands: Download...";
+			}
 			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
-			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				return $error;
-			} elseif ($globalDebug) echo "Done\n";
-			if ($globalDebug) echo "ModeS Denmark: Download...";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
+			if ($globalDebug) {
+				echo "ModeS Denmark: Download...";
+			}
 			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
-			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				return $error;
-			} elseif ($globalDebug) echo "Done\n";
-		} elseif ($globalDebug) echo "Done\n";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_translation() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Translation : Download...";
+		if ($globalDebug) {
+			echo "Translation : Download...";
+		}
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
 		if (file_exists($tmp_dir.'translation.zip')) {
-			if ($globalDebug) echo "Unzip...";
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
 			update_db::unzip($tmp_dir.'translation.zip');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::translation();
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_translation_fam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Translation from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5');
 		if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) {
 			$translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
 			$translation_md5 = $translation_md5_file[0];
 			if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'translation.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::translation_fam();
-			} else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_ModeS_fam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "ModeS from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5');
 		if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) {
 			$modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
 			$modes_md5 = $modes_md5_file[0];
 			if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'modes.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::modes_fam();
-			} else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_airlines_fam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Airlines from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Airlines from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5');
 		if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) {
 			$airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
@@ -2459,26 +2956,42 @@ 
 				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
 				if (file_exists($tmp_dir.'airlines.tsv.gz')) {
 					if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'airlines.tsv.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$error = update_db::airlines_fam();
 						update_db::insert_airlines_version($airlines_md5);
-					} else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
-			    } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
-			} elseif ($globalDebug) echo "No update.";
-		} else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
+					}
+			    } else {
+			    	$error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
+			    }
+			} elseif ($globalDebug) {
+				echo "No update.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
 		} else {
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 		return '';
 	}
 
 	public static function update_owner_fam() {
 		global $tmp_dir, $globalDebug, $globalOwner;
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "owner from FlightAirMap website : Download...";
+		}
 		$error = '';
 		if ($globalOwner === TRUE) {
 			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
@@ -2491,35 +3004,57 @@ 
 			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
 			$owners_md5 = $owners_md5_file[0];
 			if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'owners.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::owner_fam();
-			} else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_routes_fam() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Routes from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5');
 		if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) {
 			$routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
 			$routes_md5 = $routes_md5_file[0];
 			if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'routes.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::routes_fam();
-			} else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_marine_identity_fam() {
@@ -2529,21 +3064,33 @@ 
 			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
 			$marine_identity_md5 = $marine_identity_md5_file[0];
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
-				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
+				if ($globalDebug) {
+					echo "Marine identity from FlightAirMap website : Download...";
+				}
 				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
 					if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'marine_identity.tsv.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$error = update_db::marine_identity_fam();
-					} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
+				}
 				if ($error != '') {
 					return $error;
 				} else {
 					update_db::insert_marine_identity_version($marine_identity_md5);
-					if ($globalDebug) echo "Done\n";
+					if ($globalDebug) {
+						echo "Done\n";
+					}
 				}
 			}
 		}
@@ -2557,21 +3104,33 @@ 
 			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
 			$satellite_md5 = $satellite_md5_file[0];
 			if (!update_db::check_satellite_version($satellite_md5)) {
-				if ($globalDebug) echo "Satellite from FlightAirMap website : Download...";
+				if ($globalDebug) {
+					echo "Satellite from FlightAirMap website : Download...";
+				}
 				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
 				if (file_exists($tmp_dir.'satellite.tsv.gz')) {
 					if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'satellite.tsv.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$error = update_db::satellite_fam();
-					} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
+				}
 				if ($error != '') {
 					return $error;
 				} else {
 					update_db::insert_satellite_version($satellite_md5);
-					if ($globalDebug) echo "Done\n";
+					if ($globalDebug) {
+						echo "Done\n";
+					}
 				}
 			}
 		}
@@ -2579,17 +3138,25 @@ 
 	}
 	public static function update_banned_fam() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Banned airlines in Europe from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
 			//if ($globalDebug) echo "Gunzip...";
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::banned_fam();
-		} else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2597,7 +3164,9 @@ 
 		global $tmp_dir, $globalDebug, $globalDBdriver;
 		include_once('class.create_db.php');
 		$error = '';
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Airspace from FlightAirMap website : Download...";
+		}
 		if ($globalDBdriver == 'mysql') {
 			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
 		} else {
@@ -2614,9 +3183,13 @@ 
 				}
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'airspace.sql.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$Connection = new Connection();
 						if ($Connection->tableExists('airspace')) {
 							$query = 'DROP TABLE airspace';
@@ -2629,20 +3202,30 @@ 
 						}
 						$error = create_db::import_file($tmp_dir.'airspace.sql');
 						update_db::insert_airspace_version($airspace_md5);
-					} else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
+				}
 			}
-		} else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_geoid_fam() {
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
 		$error = '';
-		if ($globalDebug) echo "Geoid from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Geoid from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
 		if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) {
 			$geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
@@ -2651,76 +3234,120 @@ 
 				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
 				if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) {
 					if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
 						if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) {
 							update_db::insert_geoid_version($geoid_md5);
-						} else $error = "File data/".$globalGeoidSource.'.pgm'." doesn't exist. Gunzip failed.";
-					} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
-			} elseif ($globalDebug) echo 'No new version'."\n";
-		} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
+						} else {
+							$error = "File data/".$globalGeoidSource.'.pgm'." doesn't exist. Gunzip failed.";
+						}
+					} else {
+						$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
+				}
+			} elseif ($globalDebug) {
+				echo 'No new version'."\n";
+			}
+		} else {
+			$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_tle() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download TLE : Download...";
+		if ($globalDebug) {
+			echo "Download TLE : Download...";
+		}
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt');
 		foreach ($alltle as $filename) {
-			if ($globalDebug) echo "downloading ".$filename.'...';
+			if ($globalDebug) {
+				echo "downloading ".$filename.'...';
+			}
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
 			if (file_exists($tmp_dir.$filename)) {
-				if ($globalDebug) echo "Add to DB ".$filename."...";
+				if ($globalDebug) {
+					echo "Add to DB ".$filename."...";
+				}
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				echo $error."\n";
-			} elseif ($globalDebug) echo "Done\n";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 		return '';
 	}
 
 	public static function update_ucsdb() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download UCS DB : Download...";
+		if ($globalDebug) {
+			echo "Download UCS DB : Download...";
+		}
 		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
-		} else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			echo $error."\n";
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_celestrak() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download Celestrak DB : Download...";
+		if ($globalDebug) {
+			echo "Download Celestrak DB : Download...";
+		}
 		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
 		if (file_exists($tmp_dir.'satcat.txt')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
-		} else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			echo $error."\n";
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
 		if (file_exists($tmp_dir.'models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2739,19 +3366,29 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "glTF 2.0 Models from FlightAirMap website : Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "glTF 2.0 Models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',$tmp_dir.'modelsgltf2.md5sum');
 		if (file_exists($tmp_dir.'modelsgltf2.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2770,25 +3407,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key,dirname(__FILE__).'/../models/gltf2/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum');
-		} else $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_liveries() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Liveries from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Liveries from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',$tmp_dir.'liveries.md5sum');
 		if (file_exists($tmp_dir.'liveries.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2807,25 +3454,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading liveries '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading liveries '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key,dirname(__FILE__).'/../models/gltf2/liveries/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_space_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Space models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2844,25 +3501,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading space model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_vehicules_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Vehicules models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2881,15 +3548,21 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading vehicules model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2962,7 +3635,9 @@ 
                 }
 
 		$error = '';
-		if ($globalDebug) echo "Notam : Download...";
+		if ($globalDebug) {
+			echo "Notam : Download...";
+		}
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
 		if (file_exists($tmp_dir.'notam.rss')) {
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
@@ -2977,14 +3652,30 @@ 
 				$data['fir'] = $q[0];
 				$data['code'] = $q[1];
 				$ifrvfr = $q[2];
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
+				if ($ifrvfr == 'IV') {
+					$data['rules'] = 'IFR/VFR';
+				}
+				if ($ifrvfr == 'I') {
+					$data['rules'] = 'IFR';
+				}
+				if ($ifrvfr == 'V') {
+					$data['rules'] = 'VFR';
+				}
+				if ($q[4] == 'A') {
+					$data['scope'] = 'Airport warning';
+				}
+				if ($q[4] == 'E') {
+					$data['scope'] = 'Enroute warning';
+				}
+				if ($q[4] == 'W') {
+					$data['scope'] = 'Navigation warning';
+				}
+				if ($q[4] == 'AE') {
+					$data['scope'] = 'Airport/Enroute warning';
+				}
+				if ($q[4] == 'AW') {
+					$data['scope'] = 'Airport/Navigation warning';
+				}
 				//$data['scope'] = $q[4];
 				$data['lower_limit'] = $q[5];
 				$data['upper_limit'] = $q[6];
@@ -2992,8 +3683,12 @@ 
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
 				$latitude = $Common->convertDec($las,'latitude');
 				$longitude = $Common->convertDec($lns,'longitude');
-				if ($lac == 'S') $latitude = '-'.$latitude;
-				if ($lnc == 'W') $longitude = '-'.$longitude;
+				if ($lac == 'S') {
+					$latitude = '-'.$latitude;
+				}
+				if ($lnc == 'W') {
+					$longitude = '-'.$longitude;
+				}
 				$data['center_latitude'] = $latitude;
 				$data['center_longitude'] = $longitude;
 				$data['radius'] = intval($radius);
@@ -3023,10 +3718,14 @@ 
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
 				unset($data);
 			} 
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	
@@ -3051,7 +3750,9 @@ 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
 		$airspace_json = json_decode($airspace_lst,true);
 		foreach ($airspace_json['records'] as $airspace) {
-			if ($globalDebug) echo $airspace['name']."...\n";
+			if ($globalDebug) {
+				echo $airspace['name']."...\n";
+			}
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
 			if (file_exists($tmp_dir.$airspace['name'])) {
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
@@ -3095,8 +3796,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_update() {
@@ -3121,8 +3825,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+                if ($row['nb'] > 0) {
+                	return true;
+                } else {
+                	return false;
+                }
 	}
 
 	public static function check_geoid_version($version) {
@@ -3135,8 +3842,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+                if ($row['nb'] > 0) {
+                	return true;
+                } else {
+                	return false;
+                }
 	}
 
 	public static function check_marine_identity_version($version) {
@@ -3149,8 +3859,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function check_satellite_version($version) {
@@ -3163,8 +3876,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function check_airlines_version($version) {
@@ -3177,8 +3893,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function check_notam_version($version) {
@@ -3191,8 +3910,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function insert_airlines_version($version) {
@@ -3282,8 +4004,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_notam_update() {
@@ -3313,8 +4038,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_airspace_update() {
@@ -3344,8 +4072,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_geoid_update() {
@@ -3375,8 +4106,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_owner_update() {
@@ -3406,8 +4140,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_fires_update() {
@@ -3437,8 +4174,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_airlines_update() {
@@ -3468,8 +4208,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_schedules_update() {
@@ -3499,8 +4242,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_tle_update() {
@@ -3530,8 +4276,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_ucsdb_update() {
@@ -3561,8 +4310,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_celestrak_update() {
@@ -3592,8 +4344,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function check_last_satellite_update() {
@@ -3611,8 +4366,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_marine_identity_update() {