Ysurac / FlightAirMap

install/class.update_db.php

Spacing +244 added lines, -244 removed lines

@@ -24,20 +24,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);
@@ -61,7 +61,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();
 		}
 	}
@@ -76,7 +76,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();
                 }
 
@@ -87,7 +87,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)';
@@ -98,11 +98,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();
 		}
@@ -118,26 +118,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();
 						}
@@ -159,7 +159,7 @@ 
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'skyteam'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -167,24 +167,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]);
 						//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();
 			}
@@ -199,7 +199,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";
@@ -207,7 +207,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();
                 }
 
@@ -216,7 +216,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)';
@@ -233,15 +233,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();
 		}
 
@@ -250,7 +250,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 '';
@@ -265,11 +265,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) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source)';
 		
@@ -279,13 +279,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;
@@ -297,20 +297,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['ModeS'] != '' && $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);
+						$query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file);
 						//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();
 			}
 		}
@@ -320,7 +320,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 '';
@@ -334,11 +334,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) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source)';
 		
@@ -346,9 +346,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);
@@ -356,7 +356,7 @@ 
             				$values['Registration'] = $line[3];
             				$aircraft_name = $line[2];
             				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
+            				$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;
@@ -365,20 +365,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['ModeS'] != '' && $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(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file);
+						$query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file);
 						//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();
 			}
 		}
@@ -388,13 +388,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;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
@@ -402,11 +402,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_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 		
@@ -414,9 +414,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, ',', '"');
             				$values = array();
             				//print_r($line);
             				if ($country == 'F') {
@@ -424,7 +424,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
@@ -432,7 +432,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'] = '';
 					} elseif ($country == 'HB') {
 					    // TODO : add modeS & reg to aircraft_modes
@@ -447,7 +447,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
@@ -455,7 +455,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') {
@@ -475,28 +475,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' || $country == 'OM' || $country == 'TF') {
             				    $values['registration'] = $line[0];
@@ -506,12 +506,12 @@ 
 					    $values['cancel'] = '';
 					}
 					if ($values['cancel'] == '' && $values['registration'] != null) {
-						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
+						$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 ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -626,7 +626,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -636,7 +636,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -647,7 +647,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);
@@ -667,31 +667,31 @@ 
 				$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(':airport_id' => $i, ':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => $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(':airport_id' => $i, ':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => $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);
 			
 			try {
 				$sth_dest->execute($query_dest_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			}
@@ -705,7 +705,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -713,12 +713,12 @@ 
 		if ($globalDebug) echo "Insert Not available Airport...\n";
 		$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image`,`image_thumb`)
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image, :image_thumb)";
-		$query_values = array(':airport_id' => $i, ':name' => 'Not available',':iata' => 'NA',':icao' => 'NA',':latitude' => '0',':longitude' => '0',':altitude' => '0',':type' => 'NA',':city' => 'N/A',':country' => 'N/A',':home_link' => '',':wikipedia_link' => '',':image' => '',':image_thumb' => '');
+		$query_values = array(':airport_id' => $i, ':name' => 'Not available', ':iata' => 'NA', ':icao' => 'NA', ':latitude' => '0', ':longitude' => '0', ':altitude' => '0', ':type' => 'NA', ':city' => 'N/A', ':country' => 'N/A', ':home_link' => '', ':wikipedia_link' => '', ':image' => '', ':image_thumb' => '');
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		$i++;
@@ -736,7 +736,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";
 
@@ -747,32 +747,32 @@ 
 			//$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['gps_code']));
-					} 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['gps_code'],':type' => $data['type']));
-						} catch(PDOException $e) {
+							$sth->execute(array(':icao' => $data['gps_code'], ':type' => $data['type']));
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 					} else {
 						$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`)
 						    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)";
-						$query_values = array(':airport_id' => $i, ':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => $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(':airport_id' => $i, ':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => $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++;
@@ -785,7 +785,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;
@@ -797,15 +797,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();
 					}
 				}
@@ -819,15 +819,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();
 			}
 		}
@@ -851,7 +851,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();
                 }
 
@@ -868,7 +868,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))) {
@@ -876,7 +876,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);
                                                 }
                                         }
 					
@@ -884,14 +884,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();
 					}
 				}
@@ -911,7 +911,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();
                 }
 
@@ -931,8 +931,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();
 					}
 				}
@@ -944,7 +944,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();
@@ -954,7 +954,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $filename));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
@@ -979,8 +979,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();
 					}
 
@@ -1000,28 +1000,28 @@ 
         */
         private static function table2array($data) {
                 $html = str_get_html($data);
-                $tabledata=array();
-                foreach($html->find('tr') as $element)
+                $tabledata = array();
+                foreach ($html->find('tr') as $element)
                 {
                         $td = array();
-                        foreach( $element->find('th') as $row)
+                        foreach ($element->find('th') as $row)
                         {
                                 $td [] = trim($row->plaintext);
                         }
-                        $td=array_filter($td);
+                        $td = array_filter($td);
                         $tabledata[] = $td;
 
                         $td = array();
                         $tdi = array();
-                        foreach( $element->find('td') as $row)
+                        foreach ($element->find('td') as $row)
                         {
                                 $td [] = trim($row->plaintext);
                                 $tdi [] = trim($row->innertext);
                         }
-                        $td=array_filter($td);
-                        $tdi=array_filter($tdi);
+                        $td = array_filter($td);
+                        $tdi = array_filter($tdi);
                     //    $tabledata[]=array_merge($td,$tdi);
-                        $tabledata[]=$td;
+                        $tabledata[] = $td;
                 }
                 return(array_filter($tabledata));
         }
@@ -1094,13 +1094,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;
@@ -1110,8 +1110,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();
 						}
 					}
@@ -1132,7 +1132,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1144,12 +1144,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();
 					}
 				}
@@ -1169,21 +1169,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();
 			}
 		}
@@ -1196,7 +1196,7 @@ 
 		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.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
+		update_db::download('http://data.flightairmap.fr/data/notam.txt.gz', $tmp_dir.'notam.txt.gz');
 		$error = '';
 		if (file_exists($tmp_dir.'notam.txt.gz')) {
 			if ($globalDebug) echo "Gunzip...";
@@ -1228,14 +1228,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;
@@ -1248,7 +1248,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;
@@ -1268,7 +1268,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.";
 		if ($error != '') {
@@ -1281,7 +1281,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');
@@ -1297,7 +1297,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Schedules Oneworld : Download...";
-		update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
+		update_db::download('http://data.flightairmap.fr/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');
@@ -1313,7 +1313,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Schedules Skyteam : Download...";
-		update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
+		update_db::download('http://data.flightairmap.fr/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');
@@ -1340,7 +1340,7 @@ 
 		} elseif ($globalDebug) echo "Done\n";
 */
 		if ($globalDebug) echo "Modes : Download...";
-		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
+		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip', $tmp_dir.'basestation_latest.zip', 'http://planebase.biz/bstnsqb');
 		if (file_exists($tmp_dir.'basestation_latest.zip')) {
 			if ($globalDebug) echo "Unzip...";
 			update_db::unzip($tmp_dir.'basestation_latest.zip');
@@ -1356,7 +1356,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');
@@ -1370,7 +1370,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');
@@ -1385,173 +1385,173 @@ 
 		global $tmp_dir, $globalDebug;
 		
 		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;
@@ -1563,7 +1563,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');
@@ -1579,7 +1579,7 @@ 
 	public static function update_translation_fam() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
+		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz');
 		if (file_exists($tmp_dir.'translation.tsv.gz')) {
 			if ($globalDebug) echo "Gunzip...";
 			update_db::gunzip($tmp_dir.'translation.tsv.gz');
@@ -1597,18 +1597,18 @@ 
 		include_once('class.create_db.php');
 		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
 		if ($globalDBdriver == 'mysql') {
-			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
+			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
 		} else {
-			update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
+			update_db::download('http://data.flightairmap.fr/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.fr/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz');
+					update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz');
 				} else {
-					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
+					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz');
 				}
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
 					if ($globalDebug) echo "Gunzip...";
@@ -1620,7 +1620,7 @@ 
 						try {
 							$sth = $Connection->db->prepare($query);
     	    	    					$sth->execute();
-			            		} catch(PDOException $e) {
+			            		} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 		            			}
 		    			}
@@ -1638,15 +1638,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');
+		$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');
 		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";
@@ -1659,32 +1659,32 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum');
+		update_db::download('http://data.flightairmap.fr/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.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
+				update_db::download('http://data.flightairmap.fr/data/models/'.$key, dirname(__FILE__).'/../models/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
+			update_db::download('http://data.flightairmap.fr/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;
@@ -1696,32 +1696,32 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
+		update_db::download('http://data.flightairmap.fr/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.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
+				update_db::download('http://data.flightairmap.fr/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
+			update_db::download('http://data.flightairmap.fr/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;
@@ -1744,8 +1744,8 @@ 
 		*/
 		if (file_exists($tmp_dir.'aircrafts.html')) {
 		    //var_dump(file_get_html($tmp_dir.'aircrafts.html'));
-		    $fh = fopen($tmp_dir.'aircrafts.html',"r");
-		    $result = fread($fh,100000000);
+		    $fh = fopen($tmp_dir.'aircrafts.html', "r");
+		    $result = fread($fh, 100000000);
 		    //echo $result;
 		    //var_dump(str_get_html($result));
 		    //print_r(self::table2array($result));
@@ -1763,23 +1763,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];
@@ -1795,30 +1795,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;
@@ -1826,7 +1826,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.";
@@ -1849,16 +1849,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']);
@@ -1882,7 +1882,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);
@@ -1897,7 +1897,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -1908,7 +1908,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);
@@ -1924,7 +1924,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -1940,7 +1940,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);
@@ -1955,7 +1955,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -1970,7 +1970,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);
@@ -1985,7 +1985,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2001,7 +2001,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);
@@ -2016,7 +2016,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2031,7 +2031,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);
@@ -2046,7 +2046,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -2061,7 +2061,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);
@@ -2076,7 +2076,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}

require/class.ACARS.php

Spacing +255 added lines, -255 removed lines

@@ -22,14 +22,14 @@ 
 	* @return String the icao
 	*/
 	public function ident2icao($ident) {
-		if (substr($ident,0,2) == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+		if (substr($ident, 0, 2) == 'AF') {
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
 		} else {
 			$Spotter = new Spotter($this->db);
-			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2));
 			if (isset($identicao[0])) {
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
 			} else $icao = $ident;
 		}
 		return $icao;
@@ -53,7 +53,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";
@@ -77,7 +77,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";
@@ -102,13 +102,13 @@ 
 		$ident = '';
 		$message = '';
 		$result = array();
-		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		$n = sscanf($data, '(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0) $n = sscanf($data, 'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
 		if ($n != 0) {
-			$registration = str_replace('.','',$registration);
-			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
+			$registration = str_replace('.', '', $registration);
+			$result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message);
 			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
 		} else $message = $data;
 		$decode = array();
@@ -128,14 +128,14 @@ 
 				$temp = '';
 				$n = sscanf($message, "FST01%4c%4c%c%06d%c%07d%03d%*8[0-9a-zA-Z ]-%02dC", $dair, $darr, $lac, $la, $lnc, $ln, $alt, $temp);
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
-					$latitude = $la / 10000.0;
-					$longitude = $ln / 10000.0;
+					$latitude = $la/10000.0;
+					$longitude = $ln/10000.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 					// Temp not always available
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt);
+					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C');
 
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -147,19 +147,19 @@ 
 				$dhour = '';
 				$darr = '';
 				$ahour = '';
-				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
+				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour);
 				if ($n == 4 && strlen($darr) == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
+					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n";
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
 					$found = true;
 				}
-				elseif ($n == 2 || $n  == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+				elseif ($n == 2 || $n == 4) {
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
 					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
@@ -217,11 +217,11 @@ 
 				$ahour = '';
 				$aair = '';
 				$apiste = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao, $aident, $dair, $darr, $ddate, $dhour, $ahour, $aair, $apiste);
 				if ($n > 8) {
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					if ($globalDebug) echo 'airicao : '.$airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '.$darr.' - date depart : '.$ddate.' - departure hour : '.$dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
 					$icao = trim($aident);
 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
@@ -246,8 +246,8 @@ 
 				if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
 					$las = $las.'.'.$lass;
 					$lns = $lns.'.'.$lns;
-					$latitude = $las / 1000.0;
-					$longitude = $lns / 1000.0;
+					$latitude = $las/1000.0;
+					$longitude = $lns/1000.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
@@ -342,17 +342,17 @@ 
 				$alt = '';
 				$fuel = '';
 				$speed = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
 				if ($n == 9) {
 					//if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					$icao = trim($aident);
 					$decode['icao'] = $icao;
-					$latitude = $las / 100.0;
-					$longitude = $lns / 100.0;
+					$latitude = $las/100.0;
+					$longitude = $lns/100.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed);
 					$found = true;
 				}
 			}
@@ -371,7 +371,7 @@ 
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
 					$found = true;
 				}
 			}
@@ -404,7 +404,7 @@ 
 				$dair = '';
 				$darr = '';
 				$aident = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
 				if ($n == 8) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					$icao = trim($aident);
@@ -437,7 +437,7 @@ 
 				*/
 				$dair = '';
 				$darr = '';
-				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
+				$n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr);
 				if ($n == 3) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					//$icao = $Translation->checkTranslation($ident);
@@ -453,7 +453,7 @@ 
 				*/
 				$dair = '';
 				$darr = '';
-				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
+				$n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr);
 				if ($n == 3) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					//$icao = $Translation->checkTranslation($ident);
@@ -464,7 +464,7 @@ 
 				}
 			}
 			if (!$found) {
-				$n = sscanf($message,'MET01%4c',$airport);
+				$n = sscanf($message, 'MET01%4c', $airport);
 				if ($n == 1) {
 					if ($globalDebug) echo 'airport name : '.$airport;
 					$decode = array('Airport/Waypoint name' => $airport);
@@ -473,241 +473,241 @@ 
 			}
 
 			if ($label == 'H1') {
-				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
+				if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Equipment failure'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
+				elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Take off performance data'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
+				elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
+				elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather observation'), $decode);
 				}
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
+				elseif (preg_match(':^#DFB/PIREP:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pilot Report'), $decode);
 				}
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
+				elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Data'), $decode);
 				}
-				elseif (preg_match(':^#M1AAEP:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
+				elseif (preg_match(':^#M1AAEP:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode);
 				}
-				elseif (preg_match(':^#M2APWD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
+				elseif (preg_match(':^#M2APWD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode);
 				}
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
+				elseif (preg_match(':^#M1BREQPWI:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode);
 				}
-				elseif (preg_match(':^#CF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
+				elseif (preg_match(':^#CF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode);
 				}
-				elseif (preg_match(':^#DF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
+				elseif (preg_match(':^#DF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode);
 				}
-				elseif (preg_match(':^#EC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
+				elseif (preg_match(':^#EC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Display System'), $decode);
 				}
-				elseif (preg_match(':^#EI:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
+				elseif (preg_match(':^#EI:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Report'), $decode);
 				}
-				elseif (preg_match(':^#H1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
+				elseif (preg_match(':^#H1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode);
 				}
-				elseif (preg_match(':^#H2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
+				elseif (preg_match(':^#H2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode);
 				}
-				elseif (preg_match(':^#HD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
+				elseif (preg_match(':^#HD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode);
 				}
-				elseif (preg_match(':^#M1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
+				elseif (preg_match(':^#M1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode);
 				}
-				elseif (preg_match(':^#M2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
+				elseif (preg_match(':^#M2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode);
 				}
-				elseif (preg_match(':^#M3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
+				elseif (preg_match(':^#M3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode);
 				}
-				elseif (preg_match(':^#MD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
+				elseif (preg_match(':^#MD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode);
 				}
-				elseif (preg_match(':^#PS:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
+				elseif (preg_match(':^#PS:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode);
 				}
-				elseif (preg_match(':^#S1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
+				elseif (preg_match(':^#S1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Left'), $decode);
 				}
-				elseif (preg_match(':^#S2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
+				elseif (preg_match(':^#S2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Right'), $decode);
 				}
-				elseif (preg_match(':^#SD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
+				elseif (preg_match(':^#SD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode);
 				}
-				elseif (preg_match(':^#T[0-8]:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
+				elseif (preg_match(':^#T[0-8]:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode);
 				}
-				elseif (preg_match(':^#WO:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
+				elseif (preg_match(':^#WO:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode);
 				}
-				elseif (preg_match(':^#A1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
+				elseif (preg_match(':^#A1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode);
 				}
-				elseif (preg_match(':^#A3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
+				elseif (preg_match(':^#A3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode);
 				}
-				elseif (preg_match(':^#A4:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
+				elseif (preg_match(':^#A4:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode);
 				}
-				elseif (preg_match(':^#A6:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
+				elseif (preg_match(':^#A6:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode);
 				}
-				elseif (preg_match(':^#A8:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
+				elseif (preg_match(':^#A8:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode);
 				}
-				elseif (preg_match(':^#A9:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
+				elseif (preg_match(':^#A9:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATIS report'), $decode);
 				}
-				elseif (preg_match(':^#A0:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
+				elseif (preg_match(':^#A0:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode);
 				}
-				elseif (preg_match(':^#AA:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
+				elseif (preg_match(':^#AA:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
 				}
-				elseif (preg_match(':^#AB:',$message)) {
-					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
+				elseif (preg_match(':^#AB:', $message)) {
+					$decode = array_merge(array('Message nature' => 'TWIP Report'), $decode);
 				}
-				elseif (preg_match(':^#AC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
+				elseif (preg_match(':^#AC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode);
 				}
-				elseif (preg_match(':^#AD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
+				elseif (preg_match(':^#AD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode);
 				}
-				elseif (preg_match(':^#AF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
+				elseif (preg_match(':^#AF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode);
 				}
-				elseif (preg_match(':^#B1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
+				elseif (preg_match(':^#B1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode);
 				}
-				elseif (preg_match(':^#B2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
+				elseif (preg_match(':^#B2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode);
 				}
-				elseif (preg_match(':^#B3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
+				elseif (preg_match(':^#B3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode);
 				}
-				elseif (preg_match(':^#B4:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
+				elseif (preg_match(':^#B4:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode);
 				}
-				elseif (preg_match(':^#B6:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
+				elseif (preg_match(':^#B6:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode);
 				}
-				elseif (preg_match(':^#B8:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
+				elseif (preg_match(':^#B8:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode);
 				}
-				elseif (preg_match(':^#B9:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
+				elseif (preg_match(':^#B9:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode);
 				}
-				elseif (preg_match(':^#B0:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
+				elseif (preg_match(':^#B0:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode);
 				}
-				elseif (preg_match(':^#BA:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
+				elseif (preg_match(':^#BA:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
 				}
-				elseif (preg_match(':^#BB:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
+				elseif (preg_match(':^#BB:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode);
 				}
-				elseif (preg_match(':^#BC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
+				elseif (preg_match(':^#BC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode);
 				}
-				elseif (preg_match(':^#BD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
+				elseif (preg_match(':^#BD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode);
 				}
-				elseif (preg_match(':^#BE:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
+				elseif (preg_match(':^#BE:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode);
 				}
-				elseif (preg_match(':^#BF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
+				elseif (preg_match(':^#BF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode);
 				}
-				elseif (preg_match(':^#H3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
+				elseif (preg_match(':^#H3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Icing Report'), $decode);
 				}
 			}
 			if ($label == '10') {
-				if (preg_match(':^DTO01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
+				if (preg_match(':^DTO01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode);
 				}
-				elseif (preg_match(':^AIS01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
+				elseif (preg_match(':^AIS01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'AIS Request'), $decode);
 				}
-				elseif (preg_match(':^FTX01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
+				elseif (preg_match(':^FTX01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode);
 				}
-				elseif (preg_match(':^FPL01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
+				elseif (preg_match(':^FPL01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode);
 				}
-				elseif (preg_match(':^WAB01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
+				elseif (preg_match(':^WAB01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode);
 				}
-				elseif (preg_match(':^MET01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
+				elseif (preg_match(':^MET01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode);
 				}
-				elseif (preg_match(':^WAB02:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
+				elseif (preg_match(':^WAB02:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode);
 				}
 			}
 			if ($label == '15') {
-				if (preg_match(':^FST01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode);
+				if (preg_match(':^FST01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode);
 				}
 			}
 			if (!$found && $label == 'SA') {
-				$n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at);
+				$n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at);
 				if ($n == 4) {
 					$vsta = array('Version' => $version);
 					if ($state == 'E') {
-						$vsta = array_merge($vsta,array('Link state' => 'Established'));
+						$vsta = array_merge($vsta, array('Link state' => 'Established'));
 					}
 					elseif ($state == 'L') {
-						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
+						$vsta = array_merge($vsta, array('Link state' => 'Lost'));
 					}
 					else {
-						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
+						$vsta = array_merge($vsta, array('Link state' => 'Unknown'));
 					}
 					if ($type == 'V') {
-						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
+						$vsta = array_merge($vsta, array('Link type' => 'VHF ACARS'));
 					}
 					elseif ($type == 'S') {
-						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM'));
 					}
 					elseif ($type == 'H') {
-						$vsta = array_merge($vsta,array('Link type' => 'HF'));
+						$vsta = array_merge($vsta, array('Link type' => 'HF'));
 					}
 					elseif ($type == 'G') {
-						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM'));
 					}
 					elseif ($type == 'C') {
-						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM'));
 					}
 					elseif ($type == '2') {
-						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
+						$vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2'));
 					}
 					elseif ($type == 'X') {
-						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
+						$vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero'));
 					}
 					elseif ($type == 'I') {
-						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM'));
 					}
 					else {
-						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
+						$vsta = array_merge($vsta, array('Link type' => 'Unknown'));
 					}
-					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
-					$decode = array_merge($vsta,$decode);
+					$vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2))));
+					$decode = array_merge($vsta, $decode);
 				}
 			}
 
 			$title = $this->getTitlefromLabel($label);
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
+			if ($title != '') $decode = array_merge(array('Message title' => $title), $decode);
 
 			/*
 			// Business jets always use GS0001
@@ -740,13 +740,13 @@ 
 		$message = $this->parse($data);
 		if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') {
 		
-			$ident = (string)$message['ident'];
+			$ident = (string) $message['ident'];
 			$label = $message['label'];
 			$block_id = $message['block_id'];
 			$msg_no = $message['msg_no'];
 			$msg = $message['message'];
 			$decode = $message['decode'];
-			$registration = (string)$message['registration'];
+			$registration = (string) $message['registration'];
 		
 			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
 			else $latitude = '';
@@ -763,23 +763,23 @@ 
 			}
 		
 			// Business jets always use GS0001
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
+			if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude);
 			if ($globalDebug && isset($info) && $info != '') echo $info;
 
 			if (count($decode) > 0) $decode_json = json_encode($decode);
 			else $decode_json = '';
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
-				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
+				$Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS');
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
-				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
+				$Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS');
 			}
 
-			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			$result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
+			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F');
+			if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
 
 			if ($globalDebug && count($decode) > 0) {
-				echo "Human readable data : ".implode(' - ',$decode)."\n";
+				echo "Human readable data : ".implode(' - ', $decode)."\n";
 			}
 		}
 	}
@@ -794,7 +794,7 @@ 
 	* @param String $msg_no Number of the ACARS message
 	* @param String $message ACARS message
 	*/
-	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
+	public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
@@ -803,22 +803,22 @@ 
 
 			if ($globalDebug) echo "Test if not already in Live ACARS table...";
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
-			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
+			$query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message);
 			try {
 				$stht = $this->db->prepare($query_test);
 				$stht->execute($query_test_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			if ($stht->fetchColumn() == 0) {
 				if ($globalDebug) echo "Add Live ACARS data...";
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
-				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
+				$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode, ':date' => date("Y-m-d H:i:s"));
 				try {
 
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			} else {
@@ -840,10 +840,10 @@ 
 	* @param String $msg_no Number of the ACARS message
 	* @param String $message ACARS message
 	*/
-	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
+	public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
-		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/',$message) === 0 && preg_match('/^ARR0/',$message) === 0 && preg_match('/^ETA/',$message) === 0 && preg_match('/^WXR/',$message) === 0 && preg_match('/^FTX01.FIC/',$message) === 0) {
+		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/', $message) === 0 && preg_match('/^ARR0/', $message) === 0 && preg_match('/^ETA/', $message) === 0 && preg_match('/^WXR/', $message) === 0 && preg_match('/^FTX01.FIC/', $message) === 0) {
 			/*
 				    if ($globalDebug) echo "Test if not already in Archive ACARS table...";
 			    	    $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message";
@@ -859,12 +859,12 @@ 
 			*/
 			if ($globalDebug) echo "Add Live ACARS data...";
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
-			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
+			$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
 			try {
 
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 //    	    }
@@ -887,7 +887,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			die;
 		}
@@ -908,7 +908,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			die;
 		}
@@ -930,7 +930,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			die;
 		}
@@ -944,7 +944,7 @@ 
 	*
 	* @return Array Return ACARS data in array
 	*/
-	public function getLatestAcarsData($limit = '',$label = '') {
+	public function getLatestAcarsData($limit = '', $label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
@@ -956,8 +956,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -979,48 +979,48 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$i = 0;
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$data = array();
 			if ($row['registration'] != '') {
-				$row['registration'] = str_replace('.','',$row['registration']);
+				$row['registration'] = str_replace('.', '', $row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
 
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
-			$icao = $Translation->checkTranslation($icao,false);
+			$icao = $Translation->checkTranslation($icao, false);
 
-			$decode = json_decode($row['decode'],true);
+			$decode = json_decode($row['decode'], true);
 			$found = false;
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 					$found = true;
 				}
 			}
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 					$found = true;
 				}
 			}
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1028,7 +1028,7 @@ 
 				}
 			}
 			if ($found) $row['decode'] = json_encode($decode);
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
 		}
@@ -1044,7 +1044,7 @@ 
 	*
 	* @return Array Return ACARS data in array
 	*/
-	public function getArchiveAcarsData($limit = '',$label = '') {
+	public function getArchiveAcarsData($limit = '', $label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
@@ -1056,8 +1056,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -1087,45 +1087,45 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
-		$i=0;
+		$i = 0;
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$data = array();
 			if ($row['registration'] != '') {
-				$row['registration'] = str_replace('.','',$row['registration']);
+				$row['registration'] = str_replace('.', '', $row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
+			} else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			$icao = '';
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
 			$icao = $Translation->checkTranslation($icao);
 
 
-			$decode = json_decode($row['decode'],true);
+			$decode = json_decode($row['decode'], true);
 			$found = false;
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
 				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 				$found = true;
 			}
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
 				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 				$found = true;
 			}
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1134,7 +1134,7 @@ 
 			}
 			if ($found) $row['decode'] = json_encode($decode);
 
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
 		}
@@ -1152,7 +1152,7 @@ 
 	* @param String $icao
 	* @param String $ICAOTypeCode
 	*/
-	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
+	public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') {
 		global $globalDebug, $globalDBdriver;
 		$ident = trim($ident);
 		$Translation = new Translation($this->db);
@@ -1166,7 +1166,7 @@ 
 			return '';
 		}
 
-		$registration = str_replace('.','',$registration);
+		$registration = str_replace('.', '', $registration);
 		$ident = $Translation->ident2icao($ident);
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
 		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
@@ -1176,7 +1176,7 @@ 
 
 			$sthsi = $this->db->prepare($querysi);
 			$sthsi->execute($querysi_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalDebug) echo $e->getMessage();
 			return "error : ".$e->getMessage();
 		}
@@ -1187,8 +1187,8 @@ 
 			$Translation = new Translation($this->db);
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
 			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS');
+			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS');
 		} else {
 			if ($registration != '' && $latitude != '' && $longitude != '') {
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1196,7 +1196,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}
@@ -1204,7 +1204,7 @@ 
 				$sth->closeCursor();
 				if (isset($result['modes'])) $hex = $result['modes'];
 				else $hex = '';
-				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
+				$SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS');
 				$this->SI->add($SI_data);
 			}
 		}
@@ -1216,7 +1216,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalDebug) echo $e->getMessage();
 			return "error : ".$e->getMessage();
 		}
@@ -1227,7 +1227,7 @@ 
 			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
 			else $ModeS = '';
 			if ($ModeS == '') {
-				$id = explode('-',$result['flightaware_id']);
+				$id = explode('-', $result['flightaware_id']);
 				$ModeS = $id[0];
 			}
 			if ($ModeS != '') {
@@ -1238,21 +1238,21 @@ 
 
 					$sthc = $this->db->prepare($queryc);
 					$sthc->execute($queryc_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
 				$sthc->closeCursor();
-				if (count($row) ==  0) {
+				if (count($row) == 0) {
 					if ($globalDebug) echo " Add to ModeS table - ";
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
-					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
+					$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					try {
 
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						if ($globalDebug) echo $e->getMessage();
 						return "error : ".$e->getMessage();
 					}
@@ -1260,16 +1260,16 @@ 
 					if ($globalDebug) echo " Update ModeS table - ";
 					if ($ICAOTypeCode != '') {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					} else {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration);
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration);
 					}
 					try {
 
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						if ($globalDebug) echo $e->getMessage();
 						return "error : ".$e->getMessage();
 					}
@@ -1307,13 +1307,13 @@ 
 					elseif ($globalDBdriver == 'pgsql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
 					}
-					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
+					$queryi_values = array(':Registration' => $registration, ':ident' => $icao);
 				}
 				try {
 
 					$sthi = $this->db->prepare($queryi);
 					$sthi->execute($queryi_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}

statistics-year.php

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Busiest Month of Last Year");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php');
@@ -26,7 +26,7 @@ 
 	</div>
       <p>'._("Below is a chart that plots the busiest month during the <strong>last year</strong>.").'</p>';
 
-$date_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+$date_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 print '<div id="chart" class="chart" width="100%"></div>
       	<script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@ 
             	["'._("Month").'", "'._("# of Flights").'"], ';
 
 $date_data = '';
-foreach($date_array as $date_item)
+foreach ($date_array as $date_item)
 {
 	$date_data .= '[ "'.date("F, Y", strtotime($date_item['year_name'].'-'.$date_item['month_name'].'-01')).'",'.$date_item['date_count'].'],';
 }
@@ -73,7 +73,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics-airline.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 	  </div>
     	<p>'._("Below are the <strong>Top 10</strong> most common airlines.").'</p>';
 
-$airline_array = $Stats->countAllAirlines(true,$filter_name);
+$airline_array = $Stats->countAllAirlines(true, $filter_name);
 print '<div id="chart" class="chart" width="100%"></div>
       	<script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -23,7 +23,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Airline").'", "'._("# of times").'"], ';
 $airline_data = '';
-foreach($airline_array as $airline_item)
+foreach ($airline_array as $airline_item)
 {
 	$airline_data .= '[ "'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
 }
@@ -58,7 +58,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airline_array as $airline_item)
+	foreach ($airline_array as $airline_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics-month.php

Spacing +7 added lines, -7 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Busiest Month of Last Year");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@ 
 	  </div>
       <p>'._("Below is a chart that plots the busiest day during the <strong>last month</strong>.").'</p>';
 
-$date_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+$date_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
 print '<div id="chart" class="chart" width="100%"></div>
       	<script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -37,7 +37,7 @@ 
             	["'._("Month").'", "'._("# of Flights").'"], ';
 
 $date_data = '';
-foreach($date_array as $date_item)
+foreach ($date_array as $date_item)
 {
 	$date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
 }
@@ -74,12 +74,12 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';
 		print '<td>';
-		print '<a href="'.$globalURL.'/date/'.date('Y-m-d',strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
+		print '<a href="'.$globalURL.'/date/'.date('Y-m-d', strtotime($date_item['date_name'])).'">'.date("l F j, Y", strtotime($date_item['date_name'])).'</a>';
 		print '</td>';
 		print '<td>';
 		print $date_item['date_count'];

statistics-date.php

Spacing +7 added lines, -7 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Busiest Day");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@ 
 	  </div>
       <p>'._("Below is a chart that plots the busiest day during the <strong>last 7 days</strong>.").'</p>';
 
-$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+$date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
 if (count($date_array) == 0) {
 	print _("No data available");
 } else {
@@ -40,7 +40,7 @@ 
             	["'._("Date").'", "'._("# of Flights").'"], ';
 
 $date_data = '';
-foreach($date_array as $date_item)
+foreach ($date_array as $date_item)
 {
 	$date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
 }
@@ -66,7 +66,7 @@ 
       </script>';
 }
 if (isset($globalDBArchiveMonths) && $globalDBArchiveMonths > 0) {
-	print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."),$globalDBArchiveMonths).'</p>';
+	print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."), $globalDBArchiveMonths).'</p>';
 } else {
 	print '<p>'._("Below are the <strong>Top 10</strong> most busiest dates.").'</p>';
 }
@@ -82,7 +82,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics-airport-arrival-country.php

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Most common Arrival Airport by Country");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@ 
 	  </div>
     	 <p>'._("Below are the <strong>Top 10</strong> most common countries of all the arrival airports.").'</p>';
 
-$airport_country_array = $Stats->countAllArrivalCountries(true,$airline_icao,$filter_name);
+$airport_country_array = $Stats->countAllArrivalCountries(true, $airline_icao, $filter_name);
 
 print '<script>
     	google.load("visualization", "1", {packages:["geochart"]});
@@ -41,7 +41,7 @@ 
         	["'._("Country").'", "'._("# of times").'"],';
 
 $country_data = '';
-foreach($airport_country_array as $airport_item)
+foreach ($airport_country_array as $airport_item)
 {
 	$country_data .= '[ "'.$airport_item['airport_arrival_country'].'",'.$airport_item['airport_arrival_country_count'].'],';
 }
@@ -76,7 +76,7 @@ 
 print '</thead>';
 print '<tbody>';
 $i = 1;
-foreach($airport_country_array as $airport_item)
+foreach ($airport_country_array as $airport_item)
 {
 	print '<tr>';
 	print '<td><strong>'.$i.'</strong></td>';

statistics-aircraft.php

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Most common Aircraft");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 
@@ -27,7 +27,7 @@ 
 	</div>
 	<p>'._("Below are the <strong>Top 10</strong> most common aircraft types.").'</p>';
 	  
-$aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name);
+$aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name);
 print '<div id="chart" class="chart" width="100%"></div>
       	<script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Aircraft").'", "'._("# of times").'"], ';
 $aircraft_data = '';
-foreach($aircraft_array as $aircraft_item)
+foreach ($aircraft_array as $aircraft_item)
 {
 	$aircraft_data .= '[ "'.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 }
@@ -69,7 +69,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($aircraft_array as $aircraft_item)
+	foreach ($aircraft_array as $aircraft_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics-airline-country.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 	  </div>
       <p>'._("Below are the <strong>Top 10</strong> countries that an airline belongs to.").'</p>';
 
-$airline_array = $Stats->countAllAirlineCountries(true,$filter_name);
+$airline_array = $Stats->countAllAirlineCountries(true, $filter_name);
 if (count($airline_array) > 0) {
 print '<div id="chartCountry" class="chart" width="100%"></div>
       	<script> 
@@ -24,7 +24,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
 $country_data = '';
-foreach($airline_array as $airline_item)
+foreach ($airline_array as $airline_item)
 {
 	$country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],';
 }
@@ -58,7 +58,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airline_array as $airline_item)
+	foreach ($airline_array as $airline_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';