Ysurac / FlightAirMap

install/class.update_db.php

Spacing +426 added lines, -426 removed lines

@@ -26,7 +26,7 @@ 
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -44,20 +44,20 @@ 
 		fclose($fp);
 	}
 
-	public static function gunzip($in_file,$out_file_name = '') {
+	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 ($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');
+			if (function_exists('gzopen')) $file = gzopen($in_file, 'rb');
+			elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb');
 			else {
 				echo 'gzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!gzeof($file)) {
+			while (!gzeof($file)) {
 				fwrite($out_file, gzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -81,7 +81,7 @@ 
 		try {
 			self::$db_sqlite = new PDO('sqlite:'.$database);
 			self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -96,7 +96,7 @@ 
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -107,7 +107,7 @@ 
 		try {
                         $sth = update_db::$db_sqlite->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } 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)';
@@ -118,11 +118,11 @@ 
 			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);
+				$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) {
+		} catch (PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack(); 
 			return "error : ".$e->getMessage();
 		}
@@ -138,26 +138,26 @@ 
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'oneworld'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
     		if ($globalDebug) echo " - Add routes to DB -";
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
-		if ($fh = fopen($database_file,"r")) {
+		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();
 			while (!feof($fh)) {
-				$line = fgetcsv($fh,9999,',');
+				$line = fgetcsv($fh, 9999, ',');
 				if ($line[0] != '') {
 					if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) {
 						try {
-							$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');
+							$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) {
+						} catch (PDOException $e) {
 							if ($globalTransaction) $Connection->db->rollBack(); 
 							return "error : ".$e->getMessage();
 						}
@@ -179,7 +179,7 @@ 
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'skyteam'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -187,24 +187,24 @@ 
 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
-		if ($fh = fopen($database_file,"r")) {
+		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);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				while (!feof($fh)) {
-					$line = fgetcsv($fh,9999,',');
+					$line = fgetcsv($fh, 9999, ',');
 					if ($line[0] != '') {
-						$datebe = explode('  -  ',$line[2]);
+						$datebe = explode('  -  ', $line[2]);
 						if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) {
-							$query_dest_values = array(':CallSign' => str_replace('*','',$line[6]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[4],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[5],':routestop' => '',':source' => 'skyteam');
+							$query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam');
 							$sth_dest->execute($query_dest_values);
 						}
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				if ($globalTransaction) $Connection->db->rollBack(); 
 				return "error : ".$e->getMessage();
 			}
@@ -219,7 +219,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
@@ -227,7 +227,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -236,7 +236,7 @@ 
 		try {
                         $sth = update_db::$db_sqlite->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } 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)';
@@ -253,15 +253,15 @@ 
 			//$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);
+				$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']);
+				    $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) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 
@@ -271,7 +271,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		return '';
@@ -286,11 +286,11 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
-		if ($fh = fopen($database_file,"r")) {
+		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)';
 			$query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)';
 		
@@ -300,13 +300,13 @@ 
 				if ($globalTransaction) $Connection->db->beginTransaction();
             			while (!feof($fh)) {
             				$values = array();
-            				$line = $Common->hex2str(fgets($fh,9999));
+            				$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));
+            				$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);
+            				$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;
@@ -318,20 +318,20 @@ 
 	            				if (isset($result['icao']) && $result['icao'] != '') {
 	            				    $values['ICAOTypeCode'] = $result['icao'];
 	            				} 
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					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']);
-						$query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm');
+						$query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm');
 						//print_r($query_dest_values);
 						$sth_dest->execute($query_dest_values);
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -341,7 +341,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		return '';
@@ -355,11 +355,11 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
-		if ($fh = fopen($database_file,"r")) {
+		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)';
 			$query_dest = 'INSERT INTO aircraft_modes (LastModified,ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:lastmodified,:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)';
 		
@@ -367,9 +367,9 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-				$tmp = fgetcsv($fh,9999,',',"'");
+				$tmp = fgetcsv($fh, 9999, ',', "'");
             			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',',"'");
+            				$line = fgetcsv($fh, 9999, ',', "'");
             				
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
 					//print_r($line);
@@ -378,7 +378,7 @@ 
             				$values['ICAOTypeCode'] = '';
             				$aircraft_name = $line[2];
             				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
+            				$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;
@@ -387,20 +387,20 @@ 
                                     		$sth_search->execute();
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
 	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					//if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
 					// Add data to db
 					if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') {
 						//$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']);
-						$query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'),':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm');
+						$query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'), ':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm');
 						//print_r($query_dest_values);
 						$sth_dest->execute($query_dest_values);
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -410,13 +410,13 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		return '';
 	}
 
-	public static function retrieve_owner($database_file,$country = 'F') {
+	public static function retrieve_owner($database_file, $country = 'F') {
 		global $globalTransaction, $globalMasterSource;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source; DELETE FROM aircraft_modes WHERE Source = :source;";
@@ -424,12 +424,12 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
-		if ($fh = fopen($database_file,"r")) {
+		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)';
 			$query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 		        $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)';
@@ -439,9 +439,9 @@ 
 			$sth_modes = $Connection->db->prepare($query_modes);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-				$tmp = fgetcsv($fh,9999,',','"');
+				$tmp = fgetcsv($fh, 9999, ',', '"');
             			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',','"');
+            				$line = fgetcsv($fh, 9999, ',', '"');
             				$values = array();
             				//print_r($line);
             				if ($country == 'F') {
@@ -449,7 +449,7 @@ 
             				    $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]));
+					    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
@@ -457,7 +457,7 @@ 
             				    $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]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1]));
 					    $values['cancel'] = '';
 					    $values['modes'] = $line[7];
 					    $values['icao'] = $line[8];
@@ -477,7 +477,7 @@ 
             				    $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]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18]));
 					    $values['cancel'] = '';
 					} elseif ($country == 'VH') {
 					    // TODO : add modeS & reg to aircraft_modes
@@ -485,7 +485,7 @@ 
             				    $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]));
+					    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') {
@@ -505,28 +505,28 @@ 
             				    $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]));
+					    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]));
+					    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]));
+					    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]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7]));
 					    $values['cancel'] = '';
 					} elseif ($country == 'ZK') {
             				    $values['registration'] = $line[0];
@@ -540,18 +540,18 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[6];
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
-					    $values['cancel'] = date("Y-m-d",strtotime($line[8]));
+            				    $values['date_first_reg'] = date("Y-m-d", strtotime($line[5]));
+					    $values['cancel'] = date("Y-m-d", strtotime($line[8]));
 					    $values['modes'] = $line[4];
 					    $values['icao'] = $line[10];
 					} elseif ($country == 'OY') {
             				    $values['registration'] = $line[0];
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[4]));
+            				    $values['date_first_reg'] = date("Y-m-d", strtotime($line[4]));
 					    $values['modes'] = $line[5];
 					    $values['icao'] = $line[6];
 					} elseif ($country == 'PH') {
             				    $values['registration'] = $line[0];
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[3]));
+            				    $values['date_first_reg'] = date("Y-m-d", strtotime($line[3]));
 					    $values['modes'] = $line[4];
 					    $values['icao'] = $line[5];
 					} elseif ($country == 'OM' || $country == 'TF') {
@@ -562,17 +562,17 @@ 
 					    $values['cancel'] = '';
 					}
 					if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) {
-						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
+						$query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file);
 						$sth_dest->execute($query_dest_values);
 					}
 					if ($globalMasterSource && $values['registration'] != null && isset($values['modes']) && $values['modes'] != '') {
 						$modescountry = $Spotter->countryFromAircraftRegistration($values['registration']);
-						$query_modes_values = array(':registration' => $values['registration'],':modes' => $values['modes'],':modescountry' => $modescountry,':icaotypecode' => $values['icao'],':source' => $database_file);
+						$query_modes_values = array(':registration' => $values['registration'], ':modes' => $values['modes'], ':modescountry' => $modescountry, ':icaotypecode' => $values['icao'], ':source' => $database_file);
 						$sth_modes->execute($query_modes_values);
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -710,7 +710,7 @@ 
 		if ($globalTransaction) $Connection->db->beginTransaction();
   
 		$i = 0;
-		while($row = sparql_fetch_array($result))
+		while ($row = sparql_fetch_array($result))
 		{
 			if ($i >= 1) {
 			//print_r($row);
@@ -730,33 +730,33 @@ 
 				$row['image'] = '';
 				$row['image_thumb'] = '';
 			} else {
-				$image = str_replace(' ','_',$row['image']);
+				$image = str_replace(' ', '_', $row['image']);
 				$digest = md5($image);
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image;
-				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder;
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image;
-				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder;
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image;
+				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder;
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image;
+				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder;
 			}
 			
-			$country = explode('-',$row['country']);
+			$country = explode('-', $row['country']);
 			$row['country'] = $country[0];
 			
 			$row['type'] = trim($row['type']);
-			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i',$row['name'])) {
+			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i', $row['name'])) {
 				$row['type'] = 'military';
 			} elseif ($row['type'] == 'http://dbpedia.org/resource/Airport' || $row['type'] == 'Civil' || $row['type'] == 'Public use' || $row['type'] == 'Public' || $row['type'] == 'http://dbpedia.org/resource/Civilian' || $row['type'] == 'Public, Civilian' || $row['type'] == 'Public / Military' || $row['type'] == 'Private & Civilian' || $row['type'] == 'Civilian and Military' || $row['type'] == 'Public/military' || $row['type'] == 'Active With Few Facilities' || $row['type'] == '?ivilian' || $row['type'] == 'Civil/Military' || $row['type'] == 'NA' || $row['type'] == 'Public/Military') {
 				$row['type'] = 'small_airport';
 			}
 			
-			$row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city'])));
-			$query_dest_values = array(':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => round($row['altitude']),':type' => $row['type'],':city' => $row['city'],':country' => $row['country'],':home_link' => $row['homepage'],':wikipedia_link' => $row['wikipedia_page'],':image' => $row['image'],':image_thumb' => $row['image_thumb']);
+			$row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city'])));
+			$query_dest_values = array(':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => round($row['altitude']), ':type' => $row['type'], ':city' => $row['city'], ':country' => $row['country'], ':home_link' => $row['homepage'], ':wikipedia_link' => $row['wikipedia_page'], ':image' => $row['image'], ':image_thumb' => $row['image_thumb']);
 			//print_r($query_dest_values);
 			
 			if ($row['icao'] != '') {
 				try {
 					$sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao');
 					$sth->execute(array(':icao' => $row['icao']));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 					if ($sth->fetchColumn() > 0) {
@@ -764,15 +764,15 @@ 
 						$query = 'UPDATE airport SET type = :type WHERE icao = :icao';
 						try {
 							$sth = $Connection->db->prepare($query);
-							$sth->execute(array(':icao' => $row['icao'],':type' => $row['type']));
-						} catch(PDOException $e) {
+							$sth->execute(array(':icao' => $row['icao'], ':type' => $row['type']));
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 						echo $row['icao'].' : '.$row['type']."\n";
 					} else {
 						try {
 							$sth_dest->execute($query_dest_values);
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 					}
@@ -823,7 +823,7 @@ 
 		echo "Download data from ourairports.com...\n";
 		$delimiter = ',';
 		$out_file = $tmp_dir.'airports.csv';
-		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
+		update_db::download('http://ourairports.com/data/airports.csv', $out_file);
 		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
 		echo "Add data from ourairports.com...\n";
 
@@ -834,33 +834,33 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
+				if (!$header) $header = $row;
 				else {
 					$data = array();
 					$data = array_combine($header, $row);
 					try {
 						$sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao');
 						$sth->execute(array(':icao' => $data['ident']));
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					if ($sth->fetchColumn() > 0) {
 						$query = 'UPDATE airport SET type = :type WHERE icao = :icao';
 						try {
 							$sth = $Connection->db->prepare($query);
-							$sth->execute(array(':icao' => $data['ident'],':type' => $data['type']));
-						} catch(PDOException $e) {
+							$sth->execute(array(':icao' => $data['ident'], ':type' => $data['type']));
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 					} else {
 						if ($data['gps_code'] == $data['ident']) {
 						$query = "INSERT INTO airport (name,city,country,iata,icao,latitude,longitude,altitude,type,home_link,wikipedia_link)
 						    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)";
-						$query_values = array(':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => round($data['elevation_ft']),':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']);
+						$query_values = array(':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => round($data['elevation_ft']), ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']);
 						try {
 							$sth = $Connection->db->prepare($query);
 							$sth->execute($query_values);
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 						$i++;
@@ -875,7 +875,7 @@ 
 		
 		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);
+		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file);
 		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
 		update_db::unzip($out_file);
 		$header = NULL;
@@ -887,15 +887,15 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
+				if (!$header) $header = $row;
 				else {
 					$data = $row;
 
 					$query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4]))));
-					} catch(PDOException $e) {
+						$sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4]))));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -909,15 +909,15 @@ 
 		try {
 			$sth = $Connection->db->prepare("SELECT icao FROM airport WHERE name LIKE '%Air Base%'");
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$query2 = 'UPDATE airport SET type = :type WHERE icao = :icao';
 			try {
 				$sth2 = $Connection->db->prepare($query2);
-				$sth2->execute(array(':icao' => $row['icao'],':type' => 'military'));
-			} catch(PDOException $e) {
+				$sth2->execute(array(':icao' => $row['icao'], ':type' => 'military'));
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -938,7 +938,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'translation.csv'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -955,7 +955,7 @@ 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				$i++;
-				if($i > 12) {
+				if ($i > 12) {
 					$data = $row;
 					$operator = $data[2];
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
@@ -963,7 +963,7 @@ 
                                                 //echo substr($operator, 0, 2)."\n";;
                                                 if (count($airline_array) > 0) {
 							//print_r($airline_array);
-							$operator = $airline_array[0]['icao'].substr($operator,2);
+							$operator = $airline_array[0]['icao'].substr($operator, 2);
                                                 }
                                         }
 					
@@ -971,14 +971,14 @@ 
 					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);
+                                            		$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);
-						$sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv'));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -996,7 +996,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':source' => 'website_fam'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		//update_db::unzip($out_file);
@@ -1014,8 +1014,8 @@ 
 					$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);
-						$sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1038,11 +1038,11 @@ 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				$query = 'UPDATE airport SET diagram_pdf = :diagrampdf, diagram_png = :diagrampng WHERE icao = :icao';
-				$icao = str_replace('.pdf','',$data[2]);
+				$icao = str_replace('.pdf', '', $data[2]);
 				try {
 					$sth = $Connection->db->prepare($query);
-					$sth->execute(array(':icao' => $icao,':diagrampdf' => 'https://data.flightairmap.com/data/diagrams/'.$icao.'.pdf',':diagrampng' => 'https://data.flightairmap.com/data/diagrams/'.$icao.'.png'));
-				} catch(PDOException $e) {
+					$sth->execute(array(':icao' => $icao, ':diagrampdf' => 'https://data.flightairmap.com/data/diagrams/'.$icao.'.pdf', ':diagrampng' => 'https://data.flightairmap.com/data/diagrams/'.$icao.'.png'));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 					return "error : ".$e->getMessage();
 				}
@@ -1064,7 +1064,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1073,7 +1073,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1090,8 +1090,8 @@ 
 					$query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1';
 					try {
 						$sths = $Connection->db->prepare($query_search);
-						$sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa'));
-					} catch(PDOException $e) {
+						$sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa'));
+					} catch (PDOException $e) {
 						return "error s : ".$e->getMessage();
 					}
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
@@ -1104,8 +1104,8 @@ 
 							//}
 						try {
 							$sthi = $Connection->db->prepare($queryi);
-							$sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode']));
-						} catch(PDOException $e) {
+							$sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode']));
+						} catch (PDOException $e) {
 							return "error u : ".$e->getMessage();
 						}
 					} else {
@@ -1113,7 +1113,7 @@ 
 						try {
 							$sthsm = $Connection->db->prepare($query_search_mfr);
 							$sthsm->execute(array(':mfr' => $data[2]));
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error mfr : ".$e->getMessage();
 						}
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
@@ -1123,8 +1123,8 @@ 
 							$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);
-								$sthf->execute(array(':FirstCreated' => $data[16],':LastModified' => $data[15],':ModeS' => $data[33],':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0],':ICAOTypeCode' => $result_search_mfr[0]['icao'],':source' => 'website_faa'));
-							} catch(PDOException $e) {
+								$sthf->execute(array(':FirstCreated' => $data[16], ':LastModified' => $data[15], ':ModeS' => $data[33], ':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0], ':ICAOTypeCode' => $result_search_mfr[0]['icao'], ':source' => 'website_faa'));
+							} catch (PDOException $e) {
 								return "error f : ".$e->getMessage();
 							}
 						}
@@ -1134,13 +1134,13 @@ 
 						$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);
-							$sth->execute(array(':registration' => 'N'.$data[0],':base' => $data[9],':owner' => ucwords(strtolower($data[6])),':date_first_reg' => date('Y-m-d',strtotime($data[23])), ':source' => 'website_faa'));
-						} catch(PDOException $e) {
+							$sth->execute(array(':registration' => 'N'.$data[0], ':base' => $data[9], ':owner' => ucwords(strtolower($data[6])), ':date_first_reg' => date('Y-m-d', strtotime($data[23])), ':source' => 'website_faa'));
+						} catch (PDOException $e) {
 							return "error i : ".$e->getMessage();
 						}
 					}
 				}
-				if ($i % 90 == 0) {
+				if ($i%90 == 0) {
 					if ($globalTransaction) $Connection->db->commit();
 					if ($globalTransaction) $Connection->db->beginTransaction();
 				}
@@ -1159,7 +1159,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':source' => 'website_fam'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$delimiter = "\t";
@@ -1175,8 +1175,8 @@ 
 					$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);
-						$sth->execute(array(':FirstCreated' => $data[0],':LastModified' => $data[1],':ModeS' => $data[2],':ModeSCountry' => $data[3], ':Registration' => $data[4],':ICAOTypeCode' => $data[5],':type_flight' => $data[6],':source' => 'website_fam'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':FirstCreated' => $data[0], ':LastModified' => $data[1], ':ModeS' => $data[2], ':ModeSCountry' => $data[3], ':Registration' => $data[4], ':ICAOTypeCode' => $data[5], ':type_flight' => $data[6], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1208,7 +1208,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$delimiter = "\t";
@@ -1223,8 +1223,8 @@ 
 					$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);
-						$sth->execute(array(':name' => $data[0],':alias' => $data[1],':iata' => $data[2],':icao' => $data[3], ':callsign' => $data[4],':country' => $data[5],':active' => $data[6],':type' => $data[7],':home' => $data[8],':wikipedia_link' => $data[9],':alliance' => $data[10],':ban_eu' => $data[11]));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $data[0], ':alias' => $data[1], ':iata' => $data[2], ':icao' => $data[3], ':callsign' => $data[4], ':country' => $data[5], ':active' => $data[6], ':type' => $data[7], ':home' => $data[8], ':wikipedia_link' => $data[9], ':alliance' => $data[10], ':ban_eu' => $data[11]));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1252,7 +1252,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1268,8 +1268,8 @@ 
 					$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
 						//print_r($data);
 						return "error : ".$e->getMessage();
 					}
@@ -1289,7 +1289,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':source' => 'website_fam'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$delimiter = "\t";
@@ -1305,13 +1305,13 @@ 
 					$query = '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)';
 					try {
 						$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);
+						$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);
 						die();
 					}
 				}
-				if ($globalTransaction && $i % 2000 == 0) {
+				if ($globalTransaction && $i%2000 == 0) {
 					$Connection->db->commit();
 					if ($globalDebug) echo '.';
 					$Connection->db->beginTransaction();
@@ -1331,7 +1331,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':source' => 'website_fam'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$Connection = new Connection();
@@ -1344,12 +1344,12 @@ 
 				$query = 'INSERT INTO aircraft_block (callSign,Source) VALUES (:callSign,:source)';
 				try {
 					$sth = $Connection->db->prepare($query);
-					$sth->execute(array(':callSign' => trim($data),':source' => 'website_fam'));
-				} catch(PDOException $e) {
+					$sth->execute(array(':callSign' => trim($data), ':source' => 'website_fam'));
+				} catch (PDOException $e) {
 					if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".$data;
 					die();
 				}
-				if ($globalTransaction && $i % 2000 == 0) {
+				if ($globalTransaction && $i%2000 == 0) {
 					$Connection->db->commit();
 					if ($globalDebug) echo '.';
 					$Connection->db->beginTransaction();
@@ -1369,7 +1369,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1390,8 +1390,8 @@ 
 					$query = 'INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,length,gross_tonnage,dead_weight,width,country,engine_power,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:length,:gross_tonnage,:dead_weight,:width,:country,:engine_power,:type)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':mmsi' => $data[0],':imo' => $data[1],':call_sign' => $data[2],':ship_name' => $data[3], ':length' => $data[4],':gross_tonnage' => $data[5],':dead_weight' => $data[6],':width' => $data[7],':country' => $data[8],':engine_power' => $data[9],':type' => $data[10]));
-					} catch(PDOException $e) {
+						$sth->execute(array(':mmsi' => $data[0], ':imo' => $data[1], ':call_sign' => $data[2], ':ship_name' => $data[3], ':length' => $data[4], ':gross_tonnage' => $data[5], ':dead_weight' => $data[6], ':width' => $data[7], ':country' => $data[8], ':engine_power' => $data[9], ':type' => $data[10]));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1410,7 +1410,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$delimiter = "\t";
@@ -1427,8 +1427,8 @@ 
 					    VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21],':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29]));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21], ':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29]));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1447,7 +1447,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 
@@ -1463,7 +1463,7 @@ 
 					try {
 						$sth = $Connection->db->prepare($query);
 						$sth->execute(array(':icao' => $icao));
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1474,7 +1474,7 @@ 
 		return '';
         }
 
-	public static function tle($filename,$tletype) {
+	public static function tle($filename, $tletype) {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		global $tmp_dir, $globalTransaction;
 		//$Spotter = new Spotter();
@@ -1484,7 +1484,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $filename));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
@@ -1509,8 +1509,8 @@ 
 					$query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 
@@ -1531,7 +1531,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':source' => $filename));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		
@@ -1542,13 +1542,13 @@ 
 			$i = 0;
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
 			//$Connection->db->beginTransaction();
-			while (($data = fgetcsv($handle, 1000,"\t")) !== FALSE)
+			while (($data = fgetcsv($handle, 1000, "\t")) !== FALSE)
 			{
 				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]));
+					$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;
 					$data = array_map(function($value) {
 						return trim($value) === '' ? null : $value;
@@ -1558,8 +1558,8 @@ 
 					    VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',','',$data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',','',$data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+',','),'',$data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',','-1900',' (BOL)',' (EOL)'),'',$data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',',' (BOL)',' (EOL)'),'',$data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20],':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',', '', $data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',', '', $data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+', ','), '', $data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',', '-1900', ' (BOL)', ' (EOL)'), '', $data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',', ' (BOL)', ' (EOL)'), '', $data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20], ':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1599,7 +1599,7 @@ 
 			'EGYP' => array('country' => 'Egypt', 'owner' => ''),
 			'ESA' => array('country' => 'Multinational', 'owner' => 'European Space Agency'),
 			'ESRO' => array('country' => 'Multinational', 'owner' => 'European Space Research Organization'),
-			'EST' => array('country' => 'Estonia','owner' => ''),
+			'EST' => array('country' => 'Estonia', 'owner' => ''),
 			'EUME' => array('country' => 'Multinational', 'owner' => 'EUMETSAT (European Organization for the Exploitation of Meteorological Satellites)'),
 			'EUTE' => array('country' => 'Multinational', 'owner' => 'European Telecommunications Satellite Consortium (EUTELSAT)'),
 			'FGER' => array('country' => 'France/Germany', 'owner' => ''),
@@ -1723,10 +1723,10 @@ 
 			{
 				if ($data != '') {
 				$result = array();
-				$result['cospar'] = trim(substr($data,0,11));
-				$result['norad'] = trim(substr($data,13,6));
-				$result['operational'] = trim(substr($data,21,1));
-				$result['name'] = trim(substr($data,23,24));
+				$result['cospar'] = trim(substr($data, 0, 11));
+				$result['norad'] = trim(substr($data, 13, 6));
+				$result['operational'] = trim(substr($data, 21, 1));
+				$result['name'] = trim(substr($data, 23, 24));
 				/*
 				    * R/B(1) = Rocket body, first stage
 				    * R/B(2) = Rocket body, second stage
@@ -1738,28 +1738,28 @@ 
 				    * An ampersand (&) indicates two or more objects are attached
 				*/
 				
-				$owner_code = trim(substr($data,49,5));
+				$owner_code = trim(substr($data, 49, 5));
 				
 				if (!isset($satcat_sources[$owner_code]) && $satcat_sources[$owner_code] != 'TBD') {
 					if ($globalDebug) echo $data.'owner_code: '.$owner_code."\n";
 				}
-				if (!isset($satcat_launch_site[trim(substr($data,68,5))])) {
-					if ($globalDebug) echo 'launch_site_code: '.trim(substr($data,68,5))."\n";
+				if (!isset($satcat_launch_site[trim(substr($data, 68, 5))])) {
+					if ($globalDebug) echo 'launch_site_code: '.trim(substr($data, 68, 5))."\n";
 				}
 				
-				if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data,68,5))])) {
+				if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data, 68, 5))])) {
 					$result['country_owner'] = $satcat_sources[$owner_code]['country'];
 					$result['owner'] = $satcat_sources[$owner_code]['owner'];
-					$result['launch_date'] = trim(substr($data,56,10));
-					$launch_site_code = trim(substr($data,68,5));
+					$result['launch_date'] = trim(substr($data, 56, 10));
+					$launch_site_code = trim(substr($data, 68, 5));
 					$result['launch_site'] = $satcat_launch_site[$launch_site_code];
-					$result['lifetime'] = trim(substr($data,75,10));
-					$result['period'] = trim(substr($data,87,7));
-					$result['inclination'] = trim(substr($data,96,5));
-					$result['apogee'] = trim(substr($data,103,6));
-					$result['perigee'] = trim(substr($data,111,6));
+					$result['lifetime'] = trim(substr($data, 75, 10));
+					$result['period'] = trim(substr($data, 87, 7));
+					$result['inclination'] = trim(substr($data, 96, 5));
+					$result['apogee'] = trim(substr($data, 103, 6));
+					$result['perigee'] = trim(substr($data, 111, 6));
 					//$result['radarcross'] = trim(substr($data,119,8));
-					$result['status'] = trim(substr($data,129,3));
+					$result['status'] = trim(substr($data, 129, 3));
 					//print_r($result);
 					$result = array_map(function($value) {
 						return trim($value) === '' ? null : $value;
@@ -1772,7 +1772,7 @@ 
 							$sth = $Connection->db->prepare($query);
 							$sth->execute(array(':cospar' => $result['cospar']));
 							$exist = $sth->fetchAll(PDO::FETCH_ASSOC);
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 						if (empty($exist)) {
@@ -1784,10 +1784,10 @@ 
 								    ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'],
 								    ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'],
 								    ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], 
-								    ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => ''
+								    ':contractor' => '', ':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => ''
 								    )
 								);
-							} catch(PDOException $e) {
+							} catch (PDOException $e) {
 								return "error : ".$e->getMessage();
 							}
 						} elseif ($exist[0]['name'] != $result['name'] && $exist[0]['name_alternate'] != $result['name']) {
@@ -1795,8 +1795,8 @@ 
 							try {
 								$Connection = new Connection();
 								$sth = $Connection->db->prepare($query);
-								$sth->execute(array(':name_alternate' => $result['name'],':cospar' => $result['cospar']));
-							} catch(PDOException $e) {
+								$sth->execute(array(':name_alternate' => $result['name'], ':cospar' => $result['cospar']));
+							} catch (PDOException $e) {
 								return "error : ".$e->getMessage();
 							}
 						}
@@ -1915,13 +1915,13 @@ 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				$i++;
-				if($i > 3 && count($row) > 2) {
+				if ($i > 3 && count($row) > 2) {
 					$data = array_values(array_filter($row));
 					$cntdata = count($data);
 					if ($cntdata > 10) {
 						$value = $data[9];
 						
-						for ($i =10;$i < $cntdata;$i++) {
+						for ($i = 10; $i < $cntdata; $i++) {
 							$value .= ' '.$data[$i];
 						}
 						$data[9] = $value;
@@ -1931,8 +1931,8 @@ 
 						$query = 'INSERT INTO waypoints (name_begin,latitude_begin,longitude_begin,name_end,latitude_end,longitude_end,high,base,top,segment_name) VALUES (:name_begin, :latitude_begin, :longitude_begin, :name_end, :latitude_end, :longitude_end, :high, :base, :top, :segment_name)';
 						try {
 							$sth = $Connection->db->prepare($query);
-							$sth->execute(array(':name_begin' => $data[0],':latitude_begin' => $data[1],':longitude_begin' => $data[2],':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9]));
-						} catch(PDOException $e) {
+							$sth->execute(array(':name_begin' => $data[0], ':latitude_begin' => $data[1], ':longitude_begin' => $data[2], ':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9]));
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 					}
@@ -1949,22 +1949,22 @@ 
 		require_once(dirname(__FILE__).'/../require/class.Source.php');
 		$delimiter = ',';
 		$Common = new Common();
-		$Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv',$tmp_dir.'fires.csv');
+		$Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv', $tmp_dir.'fires.csv');
 		$Connection = new Connection();
 		$Source = new Source();
 		$Source->deleteLocationByType('fires');
 		$i = 0;
-		if (($handle = fopen($tmp_dir.'fires.csv','r')) !== false) {
+		if (($handle = fopen($tmp_dir.'fires.csv', 'r')) !== false) {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-			while (($row = fgetcsv($handle,1000)) !== false) {
+			while (($row = fgetcsv($handle, 1000)) !== false) {
 				if ($i > 0 && $row[0] != '' && $row[8] != 'low') {
-					$description = array('bright_t14' => $row[2],'scan' => $row[3],'track' => $row[4],'sat' => $row[7],'confidence' => $row[8],'version' => $row[9],'bright_t15' => $row[10],'frp' => $row[11],'daynight' => $row[12]);
+					$description = array('bright_t14' => $row[2], 'scan' => $row[3], 'track' => $row[4], 'sat' => $row[7], 'confidence' => $row[8], 'version' => $row[9], 'bright_t15' => $row[10], 'frp' => $row[11], 'daynight' => $row[12]);
 					$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
-					$query_values = array(':name' => '',':latitude' => $row[0], ':longitude' => $row[1],':altitude' => null,':city' => '',':country' => '',':logo' => 'fire.png',':source' => 'NASA',':type' => 'fires',':source_id' => 0,':last_seen' => $row[5].' '.substr($row[6],0,2).':'.substr($row[6],2,2),':location_id' => 0,':description' => json_encode($description));
+					$query_values = array(':name' => '', ':latitude' => $row[0], ':longitude' => $row[1], ':altitude' => null, ':city' => '', ':country' => '', ':logo' => 'fire.png', ':source' => 'NASA', ':type' => 'fires', ':source_id' => 0, ':last_seen' => $row[5].' '.substr($row[6], 0, 2).':'.substr($row[6], 2, 2), ':location_id' => 0, ':description' => json_encode($description));
 					try {
 						$sth = $Connection->db->prepare($query);
 						$sth->execute($query_values);
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						echo "error : ".$e->getMessage();
 					}
 				}
@@ -1983,7 +1983,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$header = NULL;
@@ -1994,12 +1994,12 @@ 
 			if ($globalTransaction) $Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(count($row) > 1) {
+				if (count($row) > 1) {
 					$query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')";
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':name' => $row[1],':icao' => $row[0]));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $row[1], ':icao' => $row[0]));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -2019,21 +2019,21 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
                     		$sth->execute();
-	                } catch(PDOException $e) {
+	                } catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 	                }
 	        }
 
 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
+		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');
+			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']);
+			$Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']);
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -2046,13 +2046,13 @@ 
 		include_once('class.create_db.php');
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
 		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');
+		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')) {
-			$notam_md5_file = explode(' ',file_get_contents($tmp_dir.'notam.txt.gz.md5'));
+			$notam_md5_file = explode(' ', file_get_contents($tmp_dir.'notam.txt.gz.md5'));
 			$notam_md5 = $notam_md5_file[0];
 			if (!update_db::check_notam_version($notam_md5)) {
-				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
+				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...";
@@ -2088,14 +2088,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
             	        	$sth->execute();
-	                } catch(PDOException $e) {
+	                } catch (PDOException $e) {
     	                	echo "error : ".$e->getMessage();
 	                }
 		}
 		if ($globalDBdriver == 'mysql') {
-			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
+			update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql');
 		} else {
-			update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql');
+			update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql');
 		}
 		$error = create_db::import_file($tmp_dir.'countries.sql');
 		return $error;
@@ -2108,7 +2108,7 @@ 
 //		update_db::unzip($tmp_dir.'AptNav.zip');
 //		update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz');
 //		update_db::download('http://sourceforge.net/p/flightgear/fgdata/ci/next/tree/Navaids/awy.dat.gz?format=raw',$tmp_dir.'awy.dat.gz','http://sourceforge.net');
-		update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz',$tmp_dir.'awy.dat.gz','http://sourceforge.net');
+		update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz', $tmp_dir.'awy.dat.gz', 'http://sourceforge.net');
 		update_db::gunzip($tmp_dir.'awy.dat.gz');
 		$error = update_db::waypoints($tmp_dir.'awy.dat');
 		return $error;
@@ -2129,7 +2129,7 @@ 
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
 				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.";
+					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.";
@@ -2143,7 +2143,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Routes : Download...";
-		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
+		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...";
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
@@ -2159,7 +2159,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Schedules Oneworld : Download...";
-		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
+		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...";
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
@@ -2175,7 +2175,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Schedules Skyteam : Download...";
-		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
+		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...";
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
@@ -2203,7 +2203,7 @@ 
 */
 		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');
+		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')) {
@@ -2223,7 +2223,7 @@ 
 	public static function update_ModeS_faa() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Modes FAA: Download...";
-		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
+		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...";
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
@@ -2239,7 +2239,7 @@ 
 	public static function update_ModeS_flarm() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Modes Flarmnet: Download...";
-		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
+		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...";
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
@@ -2253,7 +2253,7 @@ 
 	public static function update_ModeS_ogn() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Modes OGN: Download...";
-		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
+		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...";
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
@@ -2268,201 +2268,201 @@ 
 		global $tmp_dir, $globalDebug, $globalMasterSource;
 		
 		if ($globalDebug) echo "Owner France: Download...";
-		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F');
 		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		
 		if ($globalDebug) echo "Owner Ireland: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF');
 		} 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...";
-		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
+		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...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M');
 		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalMasterSource) {
 			if ($globalDebug) echo "ModeS Netherlands: Download...";
-			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
+			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...";
-				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
+				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH');
 			} 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...";
-			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
+			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...";
-				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
+				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY');
 			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
 			if ($error != '') {
 				return $error;
@@ -2475,7 +2475,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Translation : Download...";
-		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
+		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...";
 			update_db::unzip($tmp_dir.'translation.zip');
@@ -2492,10 +2492,10 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		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');
+		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_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...";
@@ -2513,10 +2513,10 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		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');
+		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_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...";
@@ -2535,12 +2535,12 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		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');
+		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'));
+			$airlines_md5_file = explode(' ', file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
 			$airlines_md5 = $airlines_md5_file[0];
 			if (!update_db::check_airlines_version($airlines_md5)) {
-				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
+				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...";
@@ -2565,14 +2565,14 @@ 
 		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');
-			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5');
+			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz');
+			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5');
 		} else {
-			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz');
-			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5');
+			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz');
+			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5');
 		}
 		if (file_exists($tmp_dir.'owners.tsv.gz') && file_exists($tmp_dir.'owners.tsv.gz.md5')) {
-			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
+			$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...";
@@ -2589,10 +2589,10 @@ 
 	public static function update_routes_fam() {
 		global $tmp_dir, $globalDebug;
 		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');
+		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_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...";
@@ -2609,10 +2609,10 @@ 
 	public static function update_block_fam() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Blocked aircraft from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/block.tsv.gz',$tmp_dir.'block.tsv.gz');
-		update_db::download('http://data.flightairmap.com/data/block.tsv.gz.md5',$tmp_dir.'block.tsv.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/block.tsv.gz', $tmp_dir.'block.tsv.gz');
+		update_db::download('http://data.flightairmap.com/data/block.tsv.gz.md5', $tmp_dir.'block.tsv.gz.md5');
 		if (file_exists($tmp_dir.'block.tsv.gz') && file_exists($tmp_dir.'block.tsv.gz.md5')) {
-			$block_md5_file = explode(' ',file_get_contents($tmp_dir.'block.tsv.gz.md5'));
+			$block_md5_file = explode(' ', file_get_contents($tmp_dir.'block.tsv.gz.md5'));
 			$block_md5 = $block_md5_file[0];
 			if (md5_file($tmp_dir.'block.tsv.gz') == $block_md5) {
 				if ($globalDebug) echo "Gunzip...";
@@ -2628,13 +2628,13 @@ 
 	}
 	public static function update_marine_identity_fam() {
 		global $tmp_dir, $globalDebug;
-		update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5');
 		if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) {
-			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
+			$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...";
-				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
+				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...";
@@ -2656,13 +2656,13 @@ 
 
 	public static function update_satellite_fam() {
 		global $tmp_dir, $globalDebug;
-		update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5',$tmp_dir.'satellite.tsv.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5', $tmp_dir.'satellite.tsv.gz.md5');
 		if (file_exists($tmp_dir.'satellite.tsv.gz.md5')) {
-			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
+			$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...";
-				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
+				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...";
@@ -2683,13 +2683,13 @@ 
 	}
 	public static function update_diagrams_fam() {
 		global $tmp_dir, $globalDebug;
-		update_db::download('http://data.flightairmap.com/data/diagrams/diagramspdf.md5',$tmp_dir.'diagramspdf.md5');
+		update_db::download('http://data.flightairmap.com/data/diagrams/diagramspdf.md5', $tmp_dir.'diagramspdf.md5');
 		if (file_exists($tmp_dir.'diagramspdf.md5')) {
-			$diagrams_md5_file = explode(' ',file_get_contents($tmp_dir.'diagramspdf.md5'));
+			$diagrams_md5_file = explode(' ', file_get_contents($tmp_dir.'diagramspdf.md5'));
 			$diagrams_md5 = $diagrams_md5_file[0];
 			if (!update_db::check_diagrams_version($diagrams_md5)) {
 				if ($globalDebug) echo "Airports diagrams from FlightAirMap website : Download...";
-				update_db::download('http://data.flightairmap.com/data/diagrams/diagramspdf',$tmp_dir.'diagramspdf');
+				update_db::download('http://data.flightairmap.com/data/diagrams/diagramspdf', $tmp_dir.'diagramspdf');
 				if (file_exists($tmp_dir.'diagramspdf')) {
 					if (md5_file($tmp_dir.'diagramspdf') == $diagrams_md5) {
 						if ($globalDebug) echo "Add to DB...";
@@ -2709,7 +2709,7 @@ 
 	public static function update_banned_fam() {
 		global $tmp_dir, $globalDebug;
 		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');
+		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');
@@ -2728,18 +2728,18 @@ 
 		$error = '';
 		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');
+			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
 		} else {
-			update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
+			update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
 		}
 		if (file_exists($tmp_dir.'airspace.sql.gz.md5')) {
-			$airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
+			$airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
 			$airspace_md5 = $airspace_md5_file[0];
 			if (!update_db::check_airspace_version($airspace_md5)) {
 				if ($globalDBdriver == 'mysql') {
-					update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz');
+					update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz');
 				} else {
-					update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
+					update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz');
 				}
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
@@ -2752,7 +2752,7 @@ 
 							try {
 								$sth = $Connection->db->prepare($query);
 								$sth->execute();
-							} catch(PDOException $e) {
+							} catch (PDOException $e) {
 								return "error : ".$e->getMessage();
 							}
 						}
@@ -2772,16 +2772,16 @@ 
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
 		$error = '';
 		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');
+		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'));
+			$geoid_md5_file = explode(' ', file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
 			$geoid_md5 = $geoid_md5_file[0];
 			if (!update_db::check_geoid_version($geoid_md5)) {
-				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
+				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...";
-						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
+						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.";
@@ -2798,15 +2798,15 @@ 
 	public static function update_tle() {
 		global $tmp_dir, $globalDebug;
 		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');
+		$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.'...';
-			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$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."...";
-				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
+				$error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename));
 			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
 			if ($error != '') {
 				echo $error."\n";
@@ -2818,7 +2818,7 @@ 
 	public static function update_ucsdb() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Download UCS DB : Download...";
-		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/9-1-17-update/UCS_Satellite_Database_officialname_9-1-2017.txt',$tmp_dir.'UCS_Satellite_Database_officialname_9-1-2017.txt');
+		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/9-1-17-update/UCS_Satellite_Database_officialname_9-1-2017.txt', $tmp_dir.'UCS_Satellite_Database_officialname_9-1-2017.txt');
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
 			if ($globalDebug) echo "Add to DB...";
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_9-1-2017.txt');
@@ -2832,7 +2832,7 @@ 
 	public static function update_celestrak() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Download Celestrak DB : Download...";
-		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
+		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...";
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
@@ -2851,62 +2851,62 @@ 
 			if ($globalDebug) echo dirname(__FILE__).'/../models'.' is not writable !';
 			return '';
 		}
-		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
+		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";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				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/'.$key, dirname(__FILE__).'/../models/'.$key);
 			}
-			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
+			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.";
 		if ($error != '') {
 			return $error;
 		} 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');
+		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";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/gltf2/models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				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/'.$key, dirname(__FILE__).'/../models/gltf2/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum');
+			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.";
 		if ($error != '') {
 			return $error;
@@ -2922,32 +2922,32 @@ 
 			return '';
 		}
 		if ($globalDebug) echo "Weather Models from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/models/gltf2/weather/models.md5sum',$tmp_dir.'modelsweather.md5sum');
+		update_db::download('http://data.flightairmap.com/data/models/gltf2/weather/models.md5sum', $tmp_dir.'modelsweather.md5sum');
 		if (file_exists($tmp_dir.'modelsweather.md5sum')) {
 			if ($globalDebug) echo "Check files...\n";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'modelsweather.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'modelsweather.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/gltf2/weather/models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/weather/models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/weather/models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
-				update_db::download('http://data.flightairmap.com/data/models/gltf2/weather/'.$key,dirname(__FILE__).'/../models/gltf2/weather/'.$key);
+				update_db::download('http://data.flightairmap.com/data/models/gltf2/weather/'.$key, dirname(__FILE__).'/../models/gltf2/weather/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.com/data/models/gltf2/weather/models.md5sum',dirname(__FILE__).'/../models/gltf2/weather/models.md5sum');
+			update_db::download('http://data.flightairmap.com/data/models/gltf2/weather/models.md5sum', dirname(__FILE__).'/../models/gltf2/weather/models.md5sum');
 		} else $error = "File ".$tmp_dir.'modelsweather.md5sum'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
@@ -2959,32 +2959,32 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		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');
+		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";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'liveries.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				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/'.$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');
+			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.";
 		if ($error != '') {
 			return $error;
@@ -3000,32 +3000,32 @@ 
 			return '';
 		}
 		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');
+		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";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				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/'.$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');
+			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.";
 		if ($error != '') {
 			return $error;
@@ -3041,32 +3041,32 @@ 
 			return '';
 		}
 		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');
+		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";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				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/'.$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');
+			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.";
 		if ($error != '') {
 			return $error;
@@ -3078,8 +3078,8 @@ 
 		global $tmp_dir, $globalDebug;
 		date_default_timezone_set('UTC');
 		$Common = new Common();
-		$data = $Common->getData('https://www4.icao.int/doc8643/External/AircraftTypes','post',array('X-Requested-With: XMLHttpRequest','Accept: application/json, text/javascript, */*; q=0.01','Host: www4.icao.int','Origin: https://www.icao.int','Content-Length: 0'),'','','https://www.icao.int/publications/DOC8643/Pages/Search.aspx',60);
-		$all = json_decode($data,true);
+		$data = $Common->getData('https://www4.icao.int/doc8643/External/AircraftTypes', 'post', array('X-Requested-With: XMLHttpRequest', 'Accept: application/json, text/javascript, */*; q=0.01', 'Host: www4.icao.int', 'Origin: https://www.icao.int', 'Content-Length: 0'), '', '', 'https://www.icao.int/publications/DOC8643/Pages/Search.aspx', 60);
+		$all = json_decode($data, true);
 		$Connection = new Connection();
 		$querychk = "SELECT COUNT(1) as nb FROM aircraft WHERE icao = :icao";
 		$sth = $Connection->db->prepare($querychk);
@@ -3091,8 +3091,8 @@ 
 		foreach ($all as $model) {
 			$icao = $model['Designator'];
 			if (!isset($allicao[$icao])) {
-				$aircraft_shadow = 'generic_'.substr($model['EngineType'],0,1).$model['EngineCount'].$model['WTC'].'.png';
-				$allicao[$icao] = array(':icao' => $icao,':type' => $model['ModelFullName'],':manufacturer' => $model['ManufacturerCode'],':aircraft_shadow' => $aircraft_shadow,':aircraft_description' => $model['AircraftDescription'],':engine_type' => $model['EngineType'],':engine_count' => $model['EngineCount'],':wake_category' => $model['WTC']);
+				$aircraft_shadow = 'generic_'.substr($model['EngineType'], 0, 1).$model['EngineCount'].$model['WTC'].'.png';
+				$allicao[$icao] = array(':icao' => $icao, ':type' => $model['ModelFullName'], ':manufacturer' => $model['ManufacturerCode'], ':aircraft_shadow' => $aircraft_shadow, ':aircraft_description' => $model['AircraftDescription'], ':engine_type' => $model['EngineType'], ':engine_count' => $model['EngineCount'], ':wake_category' => $model['WTC']);
 			} else {
 				$allicao[$icao][':type'] = $allicao[$icao][':type'].'/'.$model['ModelFullName'];
 			}
@@ -3104,9 +3104,9 @@ 
 				if ($exist[0]['nb'] == 0) {
 					$sthins->execute($airdata);
 				} else {
-					$sthup->execute(array(':type' => $airdata[':type'],':icao' => $icao));
+					$sthup->execute(array(':type' => $airdata[':type'], ':icao' => $icao));
 				}
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -3138,23 +3138,23 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
 		$error = '';
 		if ($globalDebug) echo "Notam : Download...";
-		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
+		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);
+			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true);
 			foreach ($notams['channel']['item'] as $notam) {
-				$title = explode(':',$notam['title']);
+				$title = explode(':', $notam['title']);
 				$data['ref'] = trim($title[0]);
 				unset($title[0]);
-				$data['title'] = trim(implode(':',$title));
-				$description = strip_tags($notam['description'],'<pre>');
-				preg_match(':^(.*?)<pre>:',$description,$match);
-				$q = explode('/',$match[1]);
+				$data['title'] = trim(implode(':', $title));
+				$description = strip_tags($notam['description'], '<pre>');
+				preg_match(':^(.*?)<pre>:', $description, $match);
+				$q = explode('/', $match[1]);
 				$data['fir'] = $q[0];
 				$data['code'] = $q[1];
 				$ifrvfr = $q[2];
@@ -3170,30 +3170,30 @@ 
 				$data['lower_limit'] = $q[5];
 				$data['upper_limit'] = $q[6];
 				$latlonrad = $q[7];
-				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
-				$latitude = $Common->convertDec($las,'latitude');
-				$longitude = $Common->convertDec($lns,'longitude');
+				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;
 				$data['center_latitude'] = $latitude;
 				$data['center_longitude'] = $longitude;
 				$data['radius'] = intval($radius);
 				
-				preg_match(':<pre>(.*?)</pre>:',$description,$match);
+				preg_match(':<pre>(.*?)</pre>:', $description, $match);
 				$data['text'] = $match[1];
-				preg_match(':</pre>(.*?)$:',$description,$match);
+				preg_match(':</pre>(.*?)$:', $description, $match);
 				$fromto = $match[1];
-				preg_match('#FROM:(.*?)TO:#',$fromto,$match);
+				preg_match('#FROM:(.*?)TO:#', $fromto, $match);
 				$fromall = trim($match[1]);
-				preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match);
+				preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match);
 				$from = trim($match[1]);
-				$data['date_begin'] = date("Y-m-d H:i:s",strtotime($from));
-				preg_match('#TO:(.*?)$#',$fromto,$match);
+				$data['date_begin'] = date("Y-m-d H:i:s", strtotime($from));
+				preg_match('#TO:(.*?)$#', $fromto, $match);
 				$toall = trim($match[1]);
-				if (!preg_match(':Permanent:',$toall)) {
-					preg_match('#^(.*?) \((.*?)\)#',$toall,$match);
+				if (!preg_match(':Permanent:', $toall)) {
+					preg_match('#^(.*?) \((.*?)\)#', $toall, $match);
 					$to = trim($match[1]);
-					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
+					$data['date_end'] = date("Y-m-d H:i:s", strtotime($to));
 					$data['permanent'] = 0;
 				} else {
 				    $data['date_end'] = NULL;
@@ -3201,7 +3201,7 @@ 
 				}
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
 				$NOTAM = new NOTAM();
-				$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']);
+				$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.";
@@ -3224,16 +3224,16 @@ 
 				$Connection = new Connection();
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
 		$Common = new Common();
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
-		$airspace_json = json_decode($airspace_lst,true);
+		$airspace_json = json_decode($airspace_lst, true);
 		foreach ($airspace_json['records'] as $airspace) {
 			if ($globalDebug) echo $airspace['name']."...\n";
-			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
+			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'])));
 				//system('recode l9..utf8 '.$tmp_dir.$airspace['name']);
@@ -3255,7 +3255,7 @@ 
 				$Connection = new Connection();
 				$sth = $Connection->db->prepare($query);
 				$sth->execute(array(':new' => $new, ':old' => $old));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -3272,7 +3272,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3287,7 +3287,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3298,7 +3298,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3312,7 +3312,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3326,7 +3326,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3340,7 +3340,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3353,7 +3353,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3367,7 +3367,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3381,7 +3381,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3396,7 +3396,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3408,7 +3408,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3420,7 +3420,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3432,7 +3432,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3444,7 +3444,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3456,7 +3456,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3467,7 +3467,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3483,7 +3483,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3498,7 +3498,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3514,7 +3514,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3529,7 +3529,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3545,7 +3545,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3560,7 +3560,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3576,7 +3576,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3591,7 +3591,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3607,7 +3607,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3622,7 +3622,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3638,7 +3638,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3653,7 +3653,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3669,7 +3669,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3684,7 +3684,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3700,7 +3700,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3715,7 +3715,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3731,7 +3731,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3746,7 +3746,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3762,7 +3762,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3777,7 +3777,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3793,7 +3793,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3812,7 +3812,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3827,7 +3827,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3839,7 +3839,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3855,7 +3855,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3870,7 +3870,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}

airport-detailed.php

Spacing +16 added lines, -16 removed lines

@@ -5,17 +5,17 @@ 
 require_once('require/class.Stats.php');
 require_once('require/class.METAR.php');
 
-if (!isset($_GET['airport'])){
+if (!isset($_GET['airport'])) {
 	header('Location: '.$globalURL.'/airport');
 } else {
 	$Spotter = new Spotter();
 	//calculation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -28,18 +28,18 @@ 
 	$limit_next = $limit_end + $absolute_difference;
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
-	$airport_icao = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
+	$airport_icao = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
 	$airport = $airport_icao;
 	$page_url = $globalURL.'/airport/'.$airport_icao;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	$airport_array = $Spotter->getAllAirportInfo($airport_icao);
 	if (!empty($airport_array))
 	{
 		if ($sort != '') {
-			$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao, $limit_start.",".$absolute_difference, $sort);
 		} else {
-			$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao,$limit_start.",".$absolute_difference, '');
+			$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao, $limit_start.",".$absolute_difference, '');
 		}
 		
 		if (isset($globalMETAR) && $globalMETAR) {
@@ -50,7 +50,7 @@ 
             		//print_r($metar_parse);
 		}
 		
-		$title = sprintf(_("Detailed View for %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+		$title = sprintf(_("Detailed View for %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 
 		require_once('header.php');
 		
@@ -62,9 +62,9 @@ 
 		$airport_names = $Stats->getAllAirportNames();
 		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
 		ksort($airport_names);
-		foreach($airport_names as $airport_name)
+		foreach ($airport_names as $airport_name)
 		{
-			if($airport_icao == $airport_name['airport_icao'])
+			if ($airport_icao == $airport_name['airport_icao'])
 			{
 				print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 			} else {
@@ -114,15 +114,15 @@ 
 				$date_data = '';
 				$departure_data = '';
 				$arrival_data = '';
-				foreach($all_data as $data)
+				foreach ($all_data as $data)
 				{
 					$date_data .= '"'.$data['date'].'",';
 					$departure_data .= $data['departure'].',';
 					$arrival_data .= $data['arrival'].',';
 				}
-				$date_data = "['x',".substr($date_data,0,-1)."]";
-				$departure_data = "['departure',".substr($departure_data,0,-1)."]";
-				$arrival_data = "['arrival',".substr($arrival_data,0,-1)."]";
+				$date_data = "['x',".substr($date_data, 0, -1)."]";
+				$departure_data = "['departure',".substr($departure_data, 0, -1)."]";
+				$arrival_data = "['arrival',".substr($arrival_data, 0, -1)."]";
 				print 'c3.generate({
 				    bindto: "#chart",
 				    data: {
@@ -179,7 +179,7 @@ 
 					print _("Dew point:").' '.$metar_parse['dew'].' °C'." - ";
 				}
 				if (isset($metar_parse['temperature']) && isset($metar_parse['dew'])) {
-					$humidity = round(100 * pow((112 - (0.1 * $metar_parse['temperature']) + $metar_parse['dew']) / (112 + (0.9 * $metar_parse['temperature'])), 8),1);
+					$humidity = round(100*pow((112 - (0.1*$metar_parse['temperature']) + $metar_parse['dew'])/(112 + (0.9*$metar_parse['temperature'])), 8), 1);
 					print _("Humidity:").' '.$humidity.'%'." - ";
 				}
 				if (isset($metar_parse['QNH'])) {
@@ -196,7 +196,7 @@ 
 			print '<div class="table column">';
 			if ($airport_array[0]['iata'] != "NA")
 			{
-				print '<p>'.sprintf(_("The table below shows the detailed information of all flights to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
+				print '<p>'.sprintf(_("The table below shows the detailed information of all flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 			}
 			include('table-output.php');  
 			print '<div class="pagination">';