Ysurac / FlightAirMap

install/class.update_db.php

Indentation +386 added lines, -386 removed lines

@@ -75,38 +75,38 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		if ($globalDebug) echo " - Add routes to DB -";
-    		update_db::connect_sqlite($database_file);
+			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";
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,ToAirport_ICAO,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					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();
 		} catch(PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack(); 
 			return "error : ".$e->getMessage();
 		}
-                return '';
+				return '';
 	}
 	public static function retrieve_route_oneworld($database_file) {
 		global $globalDebug, $globalTransaction;
@@ -117,12 +117,12 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'oneworld'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'oneworld'));
+				} catch(PDOException $e) {
+						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")) {
@@ -146,7 +146,7 @@ 
 			}
 			if ($globalTransaction) $Connection->db->commit();
 		}
-                return '';
+				return '';
 	}
 	
 	public static function retrieve_route_skyteam($database_file) {
@@ -158,12 +158,12 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'skyteam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'skyteam'));
+				} catch(PDOException $e) {
+						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();
@@ -189,7 +189,7 @@ 
 				return "error : ".$e->getMessage();
 			}
 		}
-                return '';
+				return '';
 	}
 	public static function retrieve_modes_sqlite_to_dest($database_file) {
 		global $globalTransaction;
@@ -198,27 +198,27 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		update_db::connect_sqlite($database_file);
+			update_db::connect_sqlite($database_file);
 		$query = 'select * from Aircraft';
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 		$query_dest = 'INSERT INTO aircraft_modes (LastModified, ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type,:source)';
 		
@@ -229,17 +229,17 @@ 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					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;
 				$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') {
-				    $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
-				    $sth_dest_owner->execute($query_dest_owner_values);
+					$query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
+					$sth_dest_owner->execute($query_dest_owner_values);
 				}
-            		}
+					}
 			if ($globalTransaction) $Connection->db->commit();
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
@@ -249,10 +249,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -264,10 +264,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -277,26 +277,26 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-            			while (!feof($fh)) {
-            				$values = array();
-            				$line = $Common->hex2str(fgets($fh,9999));
+						while (!feof($fh)) {
+							$values = array();
+							$line = $Common->hex2str(fgets($fh,9999));
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
-            				$values['ModeS'] = substr($line,0,6);
-            				$values['Registration'] = trim(substr($line,69,6));
-            				$aircraft_name = trim(substr($line,48,6));
-            				// 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]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = substr($line,0,6);
+							$values['Registration'] = trim(substr($line,69,6));
+							$aircraft_name = trim(substr($line,48,6));
+							// 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]."%'";
+							$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 (count($result) > 0) {
-	            				if (isset($result['icao']) && $result['icao'] != '') {
-	            				    $values['ICAOTypeCode'] = $result['icao'];
-	            				} 
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								//if (count($result) > 0) {
+								if (isset($result['icao']) && $result['icao'] != '') {
+									$values['ICAOTypeCode'] = $result['icao'];
+								} 
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -319,10 +319,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -333,10 +333,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -347,24 +347,24 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',',"'");
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',',"'");
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',',"'");
             				
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
 					//print_r($line);
-            				$values['ModeS'] = $line[1];
-            				$values['Registration'] = $line[3];
-            				$aircraft_name = $line[2];
-            				// 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]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = $line[1];
+							$values['Registration'] = $line[3];
+							$aircraft_name = $line[2];
+							// 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]."%'";
+							$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'];
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -387,10 +387,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -401,10 +401,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -415,95 +415,95 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',','"');
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',','"');
-            				$values = array();
-            				//print_r($line);
-            				if ($country == 'F') {
-            				    $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]));
-					    $values['cancel'] = $line[7];
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',','"');
+							$values = array();
+							//print_r($line);
+							if ($country == 'F') {
+								$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]));
+						$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]));
-					    $values['cancel'] = '';
+						// 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]));
+						$values['cancel'] = '';
 					} elseif ($country == 'HB') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[5];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[5];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'OK') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $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]));
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$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]));
+						$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]));
-
-					    $values['cancel'] = $line[39];
+						// 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]));
+
+						$values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'CC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[6];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[6];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'HJ') {
-            				    $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]));
-					    $values['cancel'] = '';
+								$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]));
+						$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]));
-					    $values['cancel'] = $line[7];
+								$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]));
+						$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]));
-					    $values['cancel'] = '';
+								$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]));
+						$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]));
-					    $values['cancel'] = '';
+								$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]));
+						$values['cancel'] = '';
 					} elseif ($country == 'ZK' || $country == 'OM' || $country == 'TF') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[3];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[3];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					}
 					if ($values['cancel'] == '' && $values['registration'] != null) {
 						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
@@ -625,20 +625,20 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		$query = 'ALTER TABLE airport DROP INDEX icaoidx';
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$query_dest = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image_thumb`,`image`)
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
@@ -704,10 +704,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		if ($globalDebug) echo "Insert Not available Airport...\n";
@@ -717,10 +717,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$i++;
 /*
 		$query = 'DELETE FROM airport WHERE airport_id IN (SELECT * FROM (SELECT min(a.airport_id) FROM airport a GROUP BY a.icao) x)';
@@ -834,7 +834,7 @@ 
 
 
 
-                return "success";
+				return "success";
 	}
 	
 	public static function translation() {
@@ -850,10 +850,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'translation.csv'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'translation.csv'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -872,21 +872,21 @@ 
 					$data = $row;
 					$operator = $data[2];
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
-                                                //echo substr($operator, 0, 2)."\n";;
-                                                if (count($airline_array) > 0) {
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
+												//echo substr($operator, 0, 2)."\n";;
+												if (count($airline_array) > 0) {
 							//print_r($airline_array);
 							$operator = $airline_array[0]['icao'].substr($operator,2);
-                                                }
-                                        }
+												}
+										}
 					
 					$operator_correct = $data[3];
 					if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
-                                                if (count($airline_array) > 0) {
-                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
-                                            	}
-                                        }
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
+												if (count($airline_array) > 0) {
+													$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
+												}
+										}
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -900,7 +900,7 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function translation_fam() {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -910,10 +910,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -942,7 +942,7 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function modes_fam() {
 		global $tmp_dir, $globalTransaction;
@@ -950,10 +950,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -982,7 +982,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function routes_fam() {
 		global $tmp_dir, $globalTransaction;
@@ -990,10 +990,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -1022,7 +1022,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function tle($filename,$tletype) {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -1033,10 +1033,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $filename));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $filename));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		$Connection = new Connection();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
@@ -1071,54 +1071,54 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	/**
-        * Convert a HTML table to an array
-        * @param String $data HTML page
-        * @return Array array of the tables in HTML page
-        */
-        private static function table2array($data) {
-                $html = str_get_html($data);
-                $tabledata=array();
-                foreach($html->find('tr') as $element)
-                {
-                        $td = array();
-                        foreach( $element->find('th') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                        }
-                        $td=array_filter($td);
-                        $tabledata[] = $td;
-
-                        $td = array();
-                        $tdi = array();
-                        foreach( $element->find('td') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                                $tdi [] = trim($row->innertext);
-                        }
-                        $td=array_filter($td);
-                        $tdi=array_filter($tdi);
-                    //    $tabledata[]=array_merge($td,$tdi);
-                        $tabledata[]=$td;
-                }
-                return(array_filter($tabledata));
-        }
-
-       /**
-        * Get data from form result
-        * @param String $url form URL
-        * @return String the result
-        */
-        private static function getData($url) {
-                $ch = curl_init();
-                curl_setopt($ch, CURLOPT_URL, $url);
-                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-                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');
-                return curl_exec($ch);
-        }
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
+		private static function table2array($data) {
+				$html = str_get_html($data);
+				$tabledata=array();
+				foreach($html->find('tr') as $element)
+				{
+						$td = array();
+						foreach( $element->find('th') as $row)
+						{
+								$td [] = trim($row->plaintext);
+						}
+						$td=array_filter($td);
+						$tabledata[] = $td;
+
+						$td = array();
+						$tdi = array();
+						foreach( $element->find('td') as $row)
+						{
+								$td [] = trim($row->plaintext);
+								$tdi [] = trim($row->innertext);
+						}
+						$td=array_filter($td);
+						$tdi=array_filter($tdi);
+					//    $tabledata[]=array_merge($td,$tdi);
+						$tabledata[]=$td;
+				}
+				return(array_filter($tabledata));
+		}
+
+	   /**
+	    * Get data from form result
+	    * @param String $url form URL
+	    * @return String the result
+	    */
+		private static function getData($url) {
+				$ch = curl_init();
+				curl_setopt($ch, CURLOPT_URL, $url);
+				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+				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');
+				return curl_exec($ch);
+		}
 /*
 	public static function waypoints() {
 		$data = update_db::getData('http://www.fallingrain.com/world/FR/waypoints.html');
@@ -1201,7 +1201,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function ivao_airlines($filename) {
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -1211,10 +1211,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$header = NULL;
 		$delimiter = ':';
@@ -1238,7 +1238,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function update_airspace() {
 		global $tmp_dir, $globalDBdriver;
@@ -1248,11 +1248,11 @@ 
 			$query = 'DROP TABLE airspace';
 			try {
 				$sth = $Connection->db->prepare($query);
-                    		$sth->execute();
-	                } catch(PDOException $e) {
+							$sth->execute();
+					} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
-	                }
-	        }
+					}
+			}
 
 
 		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
@@ -1307,10 +1307,10 @@ 
 			$query = 'DROP TABLE countries';
 			try {
 				$sth = $Connection->db->prepare($query);
-            	        	$sth->execute();
-	                } catch(PDOException $e) {
-    	                	echo "error : ".$e->getMessage();
-	                }
+							$sth->execute();
+					} catch(PDOException $e) {
+							echo "error : ".$e->getMessage();
+					}
 		}
 		if ($globalDBdriver == 'mysql') {
 			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
@@ -1735,11 +1735,11 @@ 
 						$query = 'DROP TABLE airspace';
 						try {
 							$sth = $Connection->db->prepare($query);
-    	    	    					$sth->execute();
-			            		} catch(PDOException $e) {
+										$sth->execute();
+								} catch(PDOException $e) {
 							return "error : ".$e->getMessage();
-		            			}
-		    			}
+								}
+						}
 					$error = create_db::import_file($tmp_dir.'airspace.sql');
 					update_db::insert_airspace_version($airspace_md5);
 				} else $error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
@@ -1859,12 +1859,12 @@ 
 		echo $data;
 		*/
 		if (file_exists($tmp_dir.'aircrafts.html')) {
-		    //var_dump(file_get_html($tmp_dir.'aircrafts.html'));
-		    $fh = fopen($tmp_dir.'aircrafts.html',"r");
-		    $result = fread($fh,100000000);
-		    //echo $result;
-		    //var_dump(str_get_html($result));
-		    //print_r(self::table2array($result));
+			//var_dump(file_get_html($tmp_dir.'aircrafts.html'));
+			$fh = fopen($tmp_dir.'aircrafts.html',"r");
+			$result = fread($fh,100000000);
+			//echo $result;
+			//var_dump(str_get_html($result));
+			//print_r(self::table2array($result));
 		}
 
 	}
@@ -1878,10 +1878,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$error = '';
 		if ($globalDebug) echo "Notam : Download...";
@@ -1937,8 +1937,8 @@ 
 					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
 					$data['permanent'] = 0;
 				} else {
-				    $data['date_end'] = NULL;
-				    $data['permanent'] = 1;
+					$data['date_end'] = NULL;
+					$data['permanent'] = 1;
 				}
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
 				$NOTAM = new NOTAM();
@@ -1997,13 +1997,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_update() {
@@ -2012,10 +2012,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_airspace_version($version) {
@@ -2023,13 +2023,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+						$sth->execute(array(':version' => $version));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return true;
+				else return false;
 	}
 
 
@@ -2039,10 +2039,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':version' => $version));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_notam_update() {
@@ -2055,13 +2055,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_notam_update() {
@@ -2070,10 +2070,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function check_last_airspace_update() {
 		global $globalDBdriver;
@@ -2085,13 +2085,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_airspace_update() {
@@ -2100,10 +2100,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_owner_update() {
@@ -2116,13 +2116,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_owner_update() {
@@ -2131,10 +2131,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function check_last_schedules_update() {
 		global $globalDBdriver;
@@ -2146,13 +2146,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_schedules_update() {
@@ -2161,10 +2161,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function check_last_tle_update() {
 		global $globalDBdriver;
@@ -2176,13 +2176,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_tle_update() {
@@ -2191,10 +2191,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function delete_duplicatemodes() {
 		global $globalDBdriver;
@@ -2206,10 +2206,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	
 	public static function update_all() {