Ysurac / FlightAirMap

scripts/update_db.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 	exec("ps ux", $output, $result);
 	$j = 0;
-	foreach ($output as $line) if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ") && !strpos($line, "sudo ")) $j++;
+	foreach ($output as $line) if (strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ") && !strpos($line, "sudo ")) $j++;
 	if ($j > 1) {
 		echo "Script is already runnning...";
 		die();

install/class.update_db.php

Spacing +402 added lines, -402 removed lines

@@ -16,7 +16,7 @@ 
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -34,20 +34,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);
@@ -71,7 +71,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();
 		}
 	}
@@ -86,7 +86,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();
                 }
 
@@ -97,7 +97,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)';
@@ -108,11 +108,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();
 		}
@@ -128,26 +128,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();
 						}
@@ -169,7 +169,7 @@ 
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'skyteam'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -177,24 +177,24 @@ 
 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
-		if ($fh = fopen($database_file,"r")) {
+		if ($fh = fopen($database_file, "r")) {
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				while (!feof($fh)) {
-					$line = fgetcsv($fh,9999,',');
+					$line = fgetcsv($fh, 9999, ',');
 					if ($line[0] != '') {
-						$datebe = explode('  -  ',$line[2]);
+						$datebe = explode('  -  ', $line[2]);
 						if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) {
-							$query_dest_values = array(':CallSign' => str_replace('*','',$line[6]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[4],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[5],':routestop' => '',':source' => 'skyteam');
+							$query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam');
 							$sth_dest->execute($query_dest_values);
 						}
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				if ($globalTransaction) $Connection->db->rollBack(); 
 				return "error : ".$e->getMessage();
 			}
@@ -209,7 +209,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";
@@ -217,7 +217,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();
                 }
 
@@ -226,7 +226,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)';
@@ -243,15 +243,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();
 		}
 
@@ -261,7 +261,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 '';
@@ -276,11 +276,11 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
-		if ($fh = fopen($database_file,"r")) {
+		if ($fh = fopen($database_file, "r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 			$query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)';
 		
@@ -290,13 +290,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;
@@ -308,20 +308,20 @@ 
 	            				if (isset($result['icao']) && $result['icao'] != '') {
 	            				    $values['ICAOTypeCode'] = $result['icao'];
 	            				} 
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
 					// Add data to db
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
-						$query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm');
+						$query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm');
 						//print_r($query_dest_values);
 						$sth_dest->execute($query_dest_values);
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -331,7 +331,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 '';
@@ -345,11 +345,11 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
-		if ($fh = fopen($database_file,"r")) {
+		if ($fh = fopen($database_file, "r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 			$query_dest = 'INSERT INTO aircraft_modes (LastModified,ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:lastmodified,:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)';
 		
@@ -357,9 +357,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);
@@ -368,7 +368,7 @@ 
             				$values['ICAOTypeCode'] = '';
             				$aircraft_name = $line[2];
             				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
+            				$aircraft_name_split = explode(' ', $aircraft_name);
             				$search_more = '';
             				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
@@ -377,20 +377,20 @@ 
                                     		$sth_search->execute();
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
 	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					//if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
 					// Add data to db
 					if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') {
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
-						$query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'),':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm');
+						$query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'), ':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm');
 						//print_r($query_dest_values);
 						$sth_dest->execute($query_dest_values);
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -400,13 +400,13 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		return '';
 	}
 
-	public static function retrieve_owner($database_file,$country = 'F') {
+	public static function retrieve_owner($database_file, $country = 'F') {
 		global $globalTransaction, $globalMasterSource;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source; DELETE FROM aircraft_modes WHERE Source = :source;";
@@ -414,12 +414,12 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
-		if ($fh = fopen($database_file,"r")) {
+		if ($fh = fopen($database_file, "r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 			$query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 		        $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)';
@@ -429,9 +429,9 @@ 
 			$sth_modes = $Connection->db->prepare($query_modes);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-				$tmp = fgetcsv($fh,9999,',','"');
+				$tmp = fgetcsv($fh, 9999, ',', '"');
             			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',','"');
+            				$line = fgetcsv($fh, 9999, ',', '"');
             				$values = array();
             				//print_r($line);
             				if ($country == 'F') {
@@ -439,7 +439,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
@@ -447,7 +447,7 @@ 
             				    $values['base'] = $line[3];
             				    $values['owner'] = $line[2];
             				    if ($line[1] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1]));
 					    $values['cancel'] = '';
 					    $values['modes'] = $line[7];
 					    $values['icao'] = $line[8];
@@ -467,7 +467,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
@@ -475,7 +475,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') {
@@ -495,28 +495,28 @@ 
             				    $values['base'] = null;
             				    $values['owner'] = $line[8];
             				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7]));
 					    $values['cancel'] = '';
 					} elseif ($country == 'PP') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
             				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6]));
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'E7') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
             				    if ($line[5] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5]));
 					    $values['cancel'] = '';
 					} elseif ($country == '8Q') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[3];
             				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7]));
 					    $values['cancel'] = '';
 					} elseif ($country == 'ZK') {
             				    $values['registration'] = $line[0];
@@ -530,18 +530,18 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[6];
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
-					    $values['cancel'] = date("Y-m-d",strtotime($line[8]));
+            				    $values['date_first_reg'] = date("Y-m-d", strtotime($line[5]));
+					    $values['cancel'] = date("Y-m-d", strtotime($line[8]));
 					    $values['modes'] = $line[4];
 					    $values['icao'] = $line[10];
 					} elseif ($country == 'OY') {
             				    $values['registration'] = $line[0];
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[4]));
+            				    $values['date_first_reg'] = date("Y-m-d", strtotime($line[4]));
 					    $values['modes'] = $line[5];
 					    $values['icao'] = $line[6];
 					} elseif ($country == 'PH') {
             				    $values['registration'] = $line[0];
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[3]));
+            				    $values['date_first_reg'] = date("Y-m-d", strtotime($line[3]));
 					    $values['modes'] = $line[4];
 					    $values['icao'] = $line[5];
 					} elseif ($country == 'OM' || $country == 'TF') {
@@ -552,17 +552,17 @@ 
 					    $values['cancel'] = '';
 					}
 					if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) {
-						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
+						$query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file);
 						$sth_dest->execute($query_dest_values);
 					}
 					if ($globalMasterSource && $values['registration'] != null && isset($values['modes']) && $values['modes'] != '') {
 						$modescountry = $Spotter->countryFromAircraftRegistration($values['registration']);
-						$query_modes_values = array(':registration' => $values['registration'],':modes' => $values['modes'],':modescountry' => $modescountry,':icaotypecode' => $values['icao'],':source' => $database_file);
+						$query_modes_values = array(':registration' => $values['registration'], ':modes' => $values['modes'], ':modescountry' => $modescountry, ':icaotypecode' => $values['icao'], ':source' => $database_file);
 						$sth_modes->execute($query_modes_values);
 					}
 				}
 				if ($globalTransaction) $Connection->db->commit();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -700,7 +700,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);
@@ -720,33 +720,33 @@ 
 				$row['image'] = '';
 				$row['image_thumb'] = '';
 			} else {
-				$image = str_replace(' ','_',$row['image']);
+				$image = str_replace(' ', '_', $row['image']);
 				$digest = md5($image);
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image;
-				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder;
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image;
-				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder;
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image;
+				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder;
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image;
+				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder;
 			}
 			
-			$country = explode('-',$row['country']);
+			$country = explode('-', $row['country']);
 			$row['country'] = $country[0];
 			
 			$row['type'] = trim($row['type']);
-			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i',$row['name'])) {
+			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i', $row['name'])) {
 				$row['type'] = 'military';
 			} elseif ($row['type'] == 'http://dbpedia.org/resource/Airport' || $row['type'] == 'Civil' || $row['type'] == 'Public use' || $row['type'] == 'Public' || $row['type'] == 'http://dbpedia.org/resource/Civilian' || $row['type'] == 'Public, Civilian' || $row['type'] == 'Public / Military' || $row['type'] == 'Private & Civilian' || $row['type'] == 'Civilian and Military' || $row['type'] == 'Public/military' || $row['type'] == 'Active With Few Facilities' || $row['type'] == '?ivilian' || $row['type'] == 'Civil/Military' || $row['type'] == 'NA' || $row['type'] == 'Public/Military') {
 				$row['type'] = 'small_airport';
 			}
 			
-			$row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city'])));
-			$query_dest_values = array(':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => round($row['altitude']),':type' => $row['type'],':city' => $row['city'],':country' => $row['country'],':home_link' => $row['homepage'],':wikipedia_link' => $row['wikipedia_page'],':image' => $row['image'],':image_thumb' => $row['image_thumb']);
+			$row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city'])));
+			$query_dest_values = array(':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => round($row['altitude']), ':type' => $row['type'], ':city' => $row['city'], ':country' => $row['country'], ':home_link' => $row['homepage'], ':wikipedia_link' => $row['wikipedia_page'], ':image' => $row['image'], ':image_thumb' => $row['image_thumb']);
 			//print_r($query_dest_values);
 			
 			if ($row['icao'] != '') {
 				try {
 					$sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao');
 					$sth->execute(array(':icao' => $row['icao']));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 					if ($sth->fetchColumn() > 0) {
@@ -754,15 +754,15 @@ 
 						$query = 'UPDATE airport SET type = :type WHERE icao = :icao';
 						try {
 							$sth = $Connection->db->prepare($query);
-							$sth->execute(array(':icao' => $row['icao'],':type' => $row['type']));
-						} catch(PDOException $e) {
+							$sth->execute(array(':icao' => $row['icao'], ':type' => $row['type']));
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 						echo $row['icao'].' : '.$row['type']."\n";
 					} else {
 						try {
 							$sth_dest->execute($query_dest_values);
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 					}
@@ -813,7 +813,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";
 
@@ -824,33 +824,33 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
+				if (!$header) $header = $row;
 				else {
 					$data = array();
 					$data = array_combine($header, $row);
 					try {
 						$sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao');
 						$sth->execute(array(':icao' => $data['ident']));
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					if ($sth->fetchColumn() > 0) {
 						$query = 'UPDATE airport SET type = :type WHERE icao = :icao';
 						try {
 							$sth = $Connection->db->prepare($query);
-							$sth->execute(array(':icao' => $data['ident'],':type' => $data['type']));
-						} catch(PDOException $e) {
+							$sth->execute(array(':icao' => $data['ident'], ':type' => $data['type']));
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 					} else {
 						if ($data['gps_code'] == $data['ident']) {
 						$query = "INSERT INTO airport (name,city,country,iata,icao,latitude,longitude,altitude,type,home_link,wikipedia_link)
 						    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)";
-						$query_values = array(':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => round($data['elevation_ft']),':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']);
+						$query_values = array(':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => round($data['elevation_ft']), ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']);
 						try {
 							$sth = $Connection->db->prepare($query);
 							$sth->execute($query_values);
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 						$i++;
@@ -865,7 +865,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;
@@ -877,15 +877,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();
 					}
 				}
@@ -899,15 +899,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();
 			}
 		}
@@ -928,7 +928,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();
                 }
 
@@ -945,7 +945,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))) {
@@ -953,7 +953,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);
                                                 }
                                         }
 					
@@ -961,14 +961,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();
 					}
 				}
@@ -986,7 +986,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':source' => 'website_fam'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		//update_db::unzip($out_file);
@@ -1004,8 +1004,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();
 					}
 				}
@@ -1028,7 +1028,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1037,7 +1037,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1054,8 +1054,8 @@ 
 					$query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1';
 					try {
 						$sths = $Connection->db->prepare($query_search);
-						$sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa'));
-					} catch(PDOException $e) {
+						$sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa'));
+					} catch (PDOException $e) {
 						return "error s : ".$e->getMessage();
 					}
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
@@ -1068,8 +1068,8 @@ 
 							//}
 						try {
 							$sthi = $Connection->db->prepare($queryi);
-							$sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode']));
-						} catch(PDOException $e) {
+							$sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode']));
+						} catch (PDOException $e) {
 							return "error u : ".$e->getMessage();
 						}
 					} else {
@@ -1077,7 +1077,7 @@ 
 						try {
 							$sthsm = $Connection->db->prepare($query_search_mfr);
 							$sthsm->execute(array(':mfr' => $data[2]));
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error mfr : ".$e->getMessage();
 						}
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
@@ -1087,8 +1087,8 @@ 
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
 							try {
 								$sthf = $Connection->db->prepare($queryf);
-								$sthf->execute(array(':FirstCreated' => $data[16],':LastModified' => $data[15],':ModeS' => $data[33],':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0],':ICAOTypeCode' => $result_search_mfr[0]['icao'],':source' => 'website_faa'));
-							} catch(PDOException $e) {
+								$sthf->execute(array(':FirstCreated' => $data[16], ':LastModified' => $data[15], ':ModeS' => $data[33], ':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0], ':ICAOTypeCode' => $result_search_mfr[0]['icao'], ':source' => 'website_faa'));
+							} catch (PDOException $e) {
 								return "error f : ".$e->getMessage();
 							}
 						}
@@ -1098,13 +1098,13 @@ 
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 						try {
 							$sth = $Connection->db->prepare($query);
-							$sth->execute(array(':registration' => 'N'.$data[0],':base' => $data[9],':owner' => ucwords(strtolower($data[6])),':date_first_reg' => date('Y-m-d',strtotime($data[23])), ':source' => 'website_faa'));
-						} catch(PDOException $e) {
+							$sth->execute(array(':registration' => 'N'.$data[0], ':base' => $data[9], ':owner' => ucwords(strtolower($data[6])), ':date_first_reg' => date('Y-m-d', strtotime($data[23])), ':source' => 'website_faa'));
+						} catch (PDOException $e) {
 							return "error i : ".$e->getMessage();
 						}
 					}
 				}
-				if ($i % 90 == 0) {
+				if ($i%90 == 0) {
 					if ($globalTransaction) $Connection->db->commit();
 					if ($globalTransaction) $Connection->db->beginTransaction();
 				}
@@ -1123,7 +1123,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':source' => 'website_fam'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$delimiter = "\t";
@@ -1139,8 +1139,8 @@ 
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':FirstCreated' => $data[0],':LastModified' => $data[1],':ModeS' => $data[2],':ModeSCountry' => $data[3], ':Registration' => $data[4],':ICAOTypeCode' => $data[5],':type_flight' => $data[6],':source' => 'website_fam'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':FirstCreated' => $data[0], ':LastModified' => $data[1], ':ModeS' => $data[2], ':ModeSCountry' => $data[3], ':Registration' => $data[4], ':ICAOTypeCode' => $data[5], ':type_flight' => $data[6], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1172,7 +1172,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$delimiter = "\t";
@@ -1187,8 +1187,8 @@ 
 					$query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':name' => $data[0],':alias' => $data[1],':iata' => $data[2],':icao' => $data[3], ':callsign' => $data[4],':country' => $data[5],':active' => $data[6],':type' => $data[7],':home' => $data[8],':wikipedia_link' => $data[9],':alliance' => $data[10],':ban_eu' => $data[11]));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $data[0], ':alias' => $data[1], ':iata' => $data[2], ':icao' => $data[3], ':callsign' => $data[4], ':country' => $data[5], ':active' => $data[6], ':type' => $data[7], ':home' => $data[8], ':wikipedia_link' => $data[9], ':alliance' => $data[10], ':ban_eu' => $data[11]));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1216,7 +1216,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();
                 }
 
@@ -1232,8 +1232,8 @@ 
 					$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam'));
-					} catch(PDOException $e) {
+						$sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
 						//print_r($data);
 						return "error : ".$e->getMessage();
 					}
@@ -1253,7 +1253,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':source' => 'website_fam'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$delimiter = "\t";
@@ -1269,13 +1269,13 @@ 
 					$query = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign,:Operator_ICAO,:FromAirport_ICAO,:FromAirport_Time,:ToAirport_ICAO,:ToAirport_Time,:RouteStop,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
-					} catch(PDOException $e) {
-						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
+						$sth->execute(array(':CallSign' => $data[0], ':Operator_ICAO' => $data[1], ':FromAirport_ICAO' => $data[2], ':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4], ':ToAirport_Time' => $data[5], ':RouteStop' => $data[6], ':source' => 'website_fam'));
+					} catch (PDOException $e) {
+						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',', $data);
 						die();
 					}
 				}
-				if ($globalTransaction && $i % 2000 == 0) {
+				if ($globalTransaction && $i%2000 == 0) {
 					$Connection->db->commit();
 					if ($globalDebug) echo '.';
 					$Connection->db->beginTransaction();
@@ -1295,7 +1295,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 
@@ -1316,8 +1316,8 @@ 
 					$query = 'INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,length,gross_tonnage,dead_weight,width,country,engine_power,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:length,:gross_tonnage,:dead_weight,:width,:country,:engine_power,:type)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':mmsi' => $data[0],':imo' => $data[1],':call_sign' => $data[2],':ship_name' => $data[3], ':length' => $data[4],':gross_tonnage' => $data[5],':dead_weight' => $data[6],':width' => $data[7],':country' => $data[8],':engine_power' => $data[9],':type' => $data[10]));
-					} catch(PDOException $e) {
+						$sth->execute(array(':mmsi' => $data[0], ':imo' => $data[1], ':call_sign' => $data[2], ':ship_name' => $data[3], ':length' => $data[4], ':gross_tonnage' => $data[5], ':dead_weight' => $data[6], ':width' => $data[7], ':country' => $data[8], ':engine_power' => $data[9], ':type' => $data[10]));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1336,7 +1336,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$delimiter = "\t";
@@ -1353,8 +1353,8 @@ 
 					    VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21],':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29]));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21], ':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29]));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1373,7 +1373,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 
@@ -1389,7 +1389,7 @@ 
 					try {
 						$sth = $Connection->db->prepare($query);
 						$sth->execute(array(':icao' => $icao));
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1400,7 +1400,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();
@@ -1410,7 +1410,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':source' => $filename));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 		
@@ -1435,8 +1435,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();
 					}
 
@@ -1456,7 +1456,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':source' => $filename));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		
@@ -1466,13 +1466,13 @@ 
 			$i = 0;
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
 			//$Connection->db->beginTransaction();
-			while (($data = fgetcsv($handle, 1000,"\t")) !== FALSE)
+			while (($data = fgetcsv($handle, 1000, "\t")) !== FALSE)
 			{
 				if ($i > 0 && $data[0] != '') {
 					$sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]);
-					$period = str_replace(',','',$data[14]);
-					if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60;
-					if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18]));
+					$period = str_replace(',', '', $data[14]);
+					if (!empty($period) && strpos($period, 'days')) $period = str_replace(' days', '', $period)*24*60;
+					if ($data[18] != '') $launch_date = date('Y-m-d', strtotime($data[18]));
 					else $launch_date = NULL;
 					$data = array_map(function($value) {
 						return trim($value) === '' ? null : $value;
@@ -1482,8 +1482,8 @@ 
 					    VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)';
 					try {
 						$sth = $Connection->db->prepare($query);
-						$sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',','',$data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',','',$data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+',','),'',$data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',','-1900',' (BOL)',' (EOL)'),'',$data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',',' (BOL)',' (EOL)'),'',$data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20],':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources));
-					} catch(PDOException $e) {
+						$sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',', '', $data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',', '', $data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+', ','), '', $data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',', '-1900', ' (BOL)', ' (EOL)'), '', $data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',', ' (BOL)', ' (EOL)'), '', $data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20], ':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources));
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1523,7 +1523,7 @@ 
 			'EGYP' => array('country' => 'Egypt', 'owner' => ''),
 			'ESA' => array('country' => 'Multinational', 'owner' => 'European Space Agency'),
 			'ESRO' => array('country' => 'Multinational', 'owner' => 'European Space Research Organization'),
-			'EST' => array('country' => 'Estonia','owner' => ''),
+			'EST' => array('country' => 'Estonia', 'owner' => ''),
 			'EUME' => array('country' => 'Multinational', 'owner' => 'EUMETSAT (European Organization for the Exploitation of Meteorological Satellites)'),
 			'EUTE' => array('country' => 'Multinational', 'owner' => 'European Telecommunications Satellite Consortium (EUTELSAT)'),
 			'FGER' => array('country' => 'France/Germany', 'owner' => ''),
@@ -1647,10 +1647,10 @@ 
 			{
 				if ($data != '') {
 				$result = array();
-				$result['cospar'] = trim(substr($data,0,11));
-				$result['norad'] = trim(substr($data,13,6));
-				$result['operational'] = trim(substr($data,21,1));
-				$result['name'] = trim(substr($data,23,24));
+				$result['cospar'] = trim(substr($data, 0, 11));
+				$result['norad'] = trim(substr($data, 13, 6));
+				$result['operational'] = trim(substr($data, 21, 1));
+				$result['name'] = trim(substr($data, 23, 24));
 				/*
 				    * R/B(1) = Rocket body, first stage
 				    * R/B(2) = Rocket body, second stage
@@ -1662,29 +1662,29 @@ 
 				    * An ampersand (&) indicates two or more objects are attached
 				*/
 				
-				$owner_code = trim(substr($data,49,5));
+				$owner_code = trim(substr($data, 49, 5));
 				
 				if (!isset($satcat_sources[$owner_code])) {
 					echo $data;
 					echo 'owner_code: '.$owner_code."\n";
 				}
-				if (!isset($satcat_launch_site[trim(substr($data,68,5))])) {
-					echo 'launch_site_code: '.trim(substr($data,68,5))."\n";
+				if (!isset($satcat_launch_site[trim(substr($data, 68, 5))])) {
+					echo 'launch_site_code: '.trim(substr($data, 68, 5))."\n";
 				}
 				
-				if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data,68,5))])) {
+				if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data, 68, 5))])) {
 					$result['country_owner'] = $satcat_sources[$owner_code]['country'];
 					$result['owner'] = $satcat_sources[$owner_code]['owner'];
-					$result['launch_date'] = trim(substr($data,56,10));
-					$launch_site_code = trim(substr($data,68,5));
+					$result['launch_date'] = trim(substr($data, 56, 10));
+					$launch_site_code = trim(substr($data, 68, 5));
 					$result['launch_site'] = $satcat_launch_site[$launch_site_code];
-					$result['lifetime'] = trim(substr($data,75,10));
-					$result['period'] = trim(substr($data,87,7));
-					$result['inclination'] = trim(substr($data,96,5));
-					$result['apogee'] = trim(substr($data,103,6));
-					$result['perigee'] = trim(substr($data,111,6));
+					$result['lifetime'] = trim(substr($data, 75, 10));
+					$result['period'] = trim(substr($data, 87, 7));
+					$result['inclination'] = trim(substr($data, 96, 5));
+					$result['apogee'] = trim(substr($data, 103, 6));
+					$result['perigee'] = trim(substr($data, 111, 6));
 					//$result['radarcross'] = trim(substr($data,119,8));
-					$result['status'] = trim(substr($data,129,3));
+					$result['status'] = trim(substr($data, 129, 3));
 					//print_r($result);
 					$result = array_map(function($value) {
 						return trim($value) === '' ? null : $value;
@@ -1697,7 +1697,7 @@ 
 							$sth = $Connection->db->prepare($query);
 							$sth->execute(array(':cospar' => $result['cospar']));
 							$exist = $sth->fetchAll(PDO::FETCH_ASSOC);
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage();
 						}
 						if (empty($exist)) {
@@ -1709,10 +1709,10 @@ 
 								    ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'],
 								    ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'],
 								    ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], 
-								    ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => ''
+								    ':contractor' => '', ':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => ''
 								    )
 								);
-							} catch(PDOException $e) {
+							} catch (PDOException $e) {
 								return "error : ".$e->getMessage();
 							}
 						} elseif ($exist[0]['name'] != $result['name'] && $exist[0]['name_alternate'] != $result['name']) {
@@ -1720,8 +1720,8 @@ 
 							try {
 								$Connection = new Connection();
 								$sth = $Connection->db->prepare($query);
-								$sth->execute(array(':name_alternate' => $result['name'],':cospar' => $result['cospar']));
-							} catch(PDOException $e) {
+								$sth->execute(array(':name_alternate' => $result['name'], ':cospar' => $result['cospar']));
+							} catch (PDOException $e) {
 								return "error : ".$e->getMessage();
 							}
 						}
@@ -1840,13 +1840,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;
@@ -1856,8 +1856,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();
 						}
 					}
@@ -1874,16 +1874,16 @@ 
 		require_once(dirname(__FILE__).'/../require/class.Source.php');
 		$delimiter = ',';
 		$Common = new Common();
-		$Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv',$tmp_dir.'fires.csv');
+		$Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv', $tmp_dir.'fires.csv');
 		$Connection = new Connection();
 		$Source = new Source();
 		$Source->deleteLocationByType('fires');
 		$i = 0;
-		if (($handle = fopen($tmp_dir.'fires.csv','r')) !== false) {
-			while (($row = fgetcsv($handle,1000)) !== false) {
+		if (($handle = fopen($tmp_dir.'fires.csv', 'r')) !== false) {
+			while (($row = fgetcsv($handle, 1000)) !== false) {
 				if ($i > 0 && $row[0] != '' && $row[8] != 'low') {
-					$description = array('bright_t14' => $row[2],'scan' => $row[3],'track' => $row[4],'sat' => $row[7],'confidence' => $row[8],'version' => $row[9],'bright_t15' => $row[10],'frp' => $row[11],'daynight' => $row[12]);
-					$Source->addLocation('',$row[0],$row[1],null,'','','fires','fire.png','fires',0,0,$row[5].' '.substr($row[6],0,2).':'.substr($row[6],2,2),json_encode($description));
+					$description = array('bright_t14' => $row[2], 'scan' => $row[3], 'track' => $row[4], 'sat' => $row[7], 'confidence' => $row[8], 'version' => $row[9], 'bright_t15' => $row[10], 'frp' => $row[11], 'daynight' => $row[12]);
+					$Source->addLocation('', $row[0], $row[1], null, '', '', 'fires', 'fire.png', 'fires', 0, 0, $row[5].' '.substr($row[6], 0, 2).':'.substr($row[6], 2, 2), json_encode($description));
 				}
 				$i++;
 			}
@@ -1899,7 +1899,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$header = NULL;
@@ -1910,12 +1910,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();
 					}
 				}
@@ -1935,21 +1935,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();
 			}
 		}
@@ -1962,13 +1962,13 @@ 
 		include_once('class.create_db.php');
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
 		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5', $tmp_dir.'notam.txt.gz.md5');
 		$error = '';
 		if (file_exists($tmp_dir.'notam.txt.gz.md5')) {
-			$notam_md5_file = explode(' ',file_get_contents($tmp_dir.'notam.txt.gz.md5'));
+			$notam_md5_file = explode(' ', file_get_contents($tmp_dir.'notam.txt.gz.md5'));
 			$notam_md5 = $notam_md5_file[0];
 			if (!update_db::check_notam_version($notam_md5)) {
-				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
+				update_db::download('http://data.flightairmap.com/data/notam.txt.gz', $tmp_dir.'notam.txt.gz');
 				if (file_exists($tmp_dir.'notam.txt.gz')) {
 					if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) {
 						if ($globalDebug) echo "Gunzip...";
@@ -2004,14 +2004,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;
@@ -2024,7 +2024,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;
@@ -2045,7 +2045,7 @@ 
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
 				if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
 				if (is_writable(dirname(__FILE__).'/../images/airlines')) {
-					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
+					if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
 				} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
 			} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
 		} else $error = "ZIP module not loaded but required for IVAO.";
@@ -2059,7 +2059,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');
@@ -2075,7 +2075,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Schedules Oneworld : Download...";
-		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
+		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz');
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
 			if ($globalDebug) echo "Gunzip...";
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
@@ -2091,7 +2091,7 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Schedules Skyteam : Download...";
-		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
+		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz');
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
 			if ($globalDebug) echo "Gunzip...";
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
@@ -2119,7 +2119,7 @@ 
 */
 		if ($globalDebug) echo "Modes : Download...";
 //		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
-		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
+		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz');
 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
@@ -2139,7 +2139,7 @@ 
 	public static function update_ModeS_faa() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Modes FAA: Download...";
-		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
+		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip');
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
 			if ($globalDebug) echo "Unzip...";
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
@@ -2155,7 +2155,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');
@@ -2169,7 +2169,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');
@@ -2184,201 +2184,201 @@ 
 		global $tmp_dir, $globalDebug, $globalMasterSource;
 		
 		if ($globalDebug) echo "Owner France: Download...";
-		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
+		update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv');
 		if (file_exists($tmp_dir.'owner_f.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F');
 		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		
 		if ($globalDebug) echo "Owner Ireland: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
+		update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv');
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI');
 		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Switzerland: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
+		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv');
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB');
 		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Czech Republic: Download...";
-		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
+		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv');
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK');
 		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Australia: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
+		update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv');
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH');
 		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Austria: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
+		update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv');
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE');
 		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Chile: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
+		update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv');
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC');
 		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Colombia: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
+		update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv');
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ');
 		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
-		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
+		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv');
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7');
 		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Brazil: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
+		update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv');
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP');
 		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Cayman Islands: Download...";
-		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
+		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv');
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP');
 		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Croatia: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
+		update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv');
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A');
 		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Luxembourg: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
+		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv');
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX');
 		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Maldives: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
+		update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv');
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q');
 		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner New Zealand: Download...";
-		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
+		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv');
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK');
 		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
-		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
+		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv');
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2');
 		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Slovakia: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
+		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv');
 		if (file_exists($tmp_dir.'owner_om.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM');
 		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Ecuador: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
+		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv');
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC');
 		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Iceland: Download...";
-		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
+		update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv');
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF');
 		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "Owner Isle of Man: Download...";
-		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
+		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv');
 		if (file_exists($tmp_dir.'owner_m.csv')) {
 			if ($globalDebug) echo "Add to DB...";
-			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
+			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M');
 		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalMasterSource) {
 			if ($globalDebug) echo "ModeS Netherlands: Download...";
-			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
+			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv');
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
 				if ($globalDebug) echo "Add to DB...";
-				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
+				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH');
 			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
 			if ($error != '') {
 				return $error;
 			} elseif ($globalDebug) echo "Done\n";
 			if ($globalDebug) echo "ModeS Denmark: Download...";
-			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
+			update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv');
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
 				if ($globalDebug) echo "Add to DB...";
-				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
+				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY');
 			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
 			if ($error != '') {
 				return $error;
@@ -2391,7 +2391,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');
@@ -2408,10 +2408,10 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
-		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz');
+		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5', $tmp_dir.'translation.tsv.gz.md5');
 		if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) {
-			$translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
+			$translation_md5_file = explode(' ', file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
 			$translation_md5 = $translation_md5_file[0];
 			if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) {
 				if ($globalDebug) echo "Gunzip...";
@@ -2429,10 +2429,10 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
-		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz');
+		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5', $tmp_dir.'modes.tsv.gz.md5');
 		if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) {
-			$modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
+			$modes_md5_file = explode(' ', file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
 			$modes_md5 = $modes_md5_file[0];
 			if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) {
 				if ($globalDebug) echo "Gunzip...";
@@ -2451,12 +2451,12 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Airlines from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5', $tmp_dir.'airlines.tsv.gz.md5');
 		if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) {
-			$airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
+			$airlines_md5_file = explode(' ', file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
 			$airlines_md5 = $airlines_md5_file[0];
 			if (!update_db::check_airlines_version($airlines_md5)) {
-				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
+				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz', $tmp_dir.'airlines.tsv.gz');
 				if (file_exists($tmp_dir.'airlines.tsv.gz')) {
 					if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) {
 						if ($globalDebug) echo "Gunzip...";
@@ -2481,14 +2481,14 @@ 
 		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
 		$error = '';
 		if ($globalOwner === TRUE) {
-			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
-			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5');
+			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz');
+			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5');
 		} else {
-			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz');
-			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5');
+			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz');
+			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5');
 		}
 		if (file_exists($tmp_dir.'owners.tsv.gz') && file_exists($tmp_dir.'owners.tsv.gz.md5')) {
-			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
+			$owners_md5_file = explode(' ', file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
 			$owners_md5 = $owners_md5_file[0];
 			if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) {
 				if ($globalDebug) echo "Gunzip...";
@@ -2505,10 +2505,10 @@ 
 	public static function update_routes_fam() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
-		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz');
+		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5', $tmp_dir.'routes.tsv.gz.md5');
 		if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) {
-			$routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
+			$routes_md5_file = explode(' ', file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
 			$routes_md5 = $routes_md5_file[0];
 			if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) {
 				if ($globalDebug) echo "Gunzip...";
@@ -2524,13 +2524,13 @@ 
 	}
 	public static function update_marine_identity_fam() {
 		global $tmp_dir, $globalDebug;
-		update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5');
 		if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) {
-			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
+			$marine_identity_md5_file = explode(' ', file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
 			$marine_identity_md5 = $marine_identity_md5_file[0];
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
 				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
-				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
+				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz', $tmp_dir.'marine_identity.tsv.gz');
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
 					if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) {
 						if ($globalDebug) echo "Gunzip...";
@@ -2552,13 +2552,13 @@ 
 
 	public static function update_satellite_fam() {
 		global $tmp_dir, $globalDebug;
-		update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5',$tmp_dir.'satellite.tsv.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5', $tmp_dir.'satellite.tsv.gz.md5');
 		if (file_exists($tmp_dir.'satellite.tsv.gz.md5')) {
-			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
+			$satellite_md5_file = explode(' ', file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
 			$satellite_md5 = $satellite_md5_file[0];
 			if (!update_db::check_satellite_version($satellite_md5)) {
 				if ($globalDebug) echo "Satellite from FlightAirMap website : Download...";
-				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
+				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz', $tmp_dir.'satellite.tsv.gz');
 				if (file_exists($tmp_dir.'satellite.tsv.gz')) {
 					if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) {
 						if ($globalDebug) echo "Gunzip...";
@@ -2580,7 +2580,7 @@ 
 	public static function update_banned_fam() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
+		update_db::download('http://data.flightairmap.com/data/ban-eu.csv', $tmp_dir.'ban_eu.csv');
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
 			//if ($globalDebug) echo "Gunzip...";
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
@@ -2599,18 +2599,18 @@ 
 		$error = '';
 		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
 		if ($globalDBdriver == 'mysql') {
-			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
+			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
 		} else {
-			update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
+			update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
 		}
 		if (file_exists($tmp_dir.'airspace.sql.gz.md5')) {
-			$airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
+			$airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
 			$airspace_md5 = $airspace_md5_file[0];
 			if (!update_db::check_airspace_version($airspace_md5)) {
 				if ($globalDBdriver == 'mysql') {
-					update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz');
+					update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz');
 				} else {
-					update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
+					update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz');
 				}
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
@@ -2623,7 +2623,7 @@ 
 							try {
 								$sth = $Connection->db->prepare($query);
 								$sth->execute();
-							} catch(PDOException $e) {
+							} catch (PDOException $e) {
 								return "error : ".$e->getMessage();
 							}
 						}
@@ -2643,16 +2643,16 @@ 
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
 		$error = '';
 		if ($globalDebug) echo "Geoid from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
+		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5', $tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
 		if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) {
-			$geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
+			$geoid_md5_file = explode(' ', file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
 			$geoid_md5 = $geoid_md5_file[0];
 			if (!update_db::check_geoid_version($geoid_md5)) {
-				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
+				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz', $tmp_dir.$globalGeoidSource.'.pgm.gz');
 				if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) {
 					if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) {
 						if ($globalDebug) echo "Gunzip...";
-						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
+						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz', dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
 						if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) {
 							update_db::insert_geoid_version($geoid_md5);
 						} else $error = "File data/".$globalGeoidSource.'.pgm'." doesn't exist. Gunzip failed.";
@@ -2669,15 +2669,15 @@ 
 	public static function update_tle() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Download TLE : Download...";
-		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
-		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
-		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt');
+		$alltle = array('stations.txt', 'gps-ops.txt', 'glo-ops.txt', 'galileo.txt', 'weather.txt', 'noaa.txt', 'goes.txt', 'resource.txt', 'dmc.txt', 'tdrss.txt', 'geo.txt', 'intelsat.txt', 'gorizont.txt',
+		'raduga.txt', 'molniya.txt', 'iridium.txt', 'orbcomm.txt', 'globalstar.txt', 'amateur.txt', 'x-comm.txt', 'other-comm.txt', 'sbas.txt', 'nnss.txt', 'musson.txt', 'science.txt', 'geodetic.txt',
+		'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt', 'visual.txt', 'sarsat.txt', 'argos.txt', 'ses.txt', 'iridium-NEXT.txt', 'beidou.txt');
 		foreach ($alltle as $filename) {
 			if ($globalDebug) echo "downloading ".$filename.'...';
-			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
+			update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename);
 			if (file_exists($tmp_dir.$filename)) {
 				if ($globalDebug) echo "Add to DB ".$filename."...";
-				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
+				$error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename));
 			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
 			if ($error != '') {
 				echo $error."\n";
@@ -2689,7 +2689,7 @@ 
 	public static function update_ucsdb() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Download UCS DB : Download...";
-		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
+		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt', $tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
 			if ($globalDebug) echo "Add to DB...";
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
@@ -2703,7 +2703,7 @@ 
 	public static function update_celestrak() {
 		global $tmp_dir, $globalDebug;
 		if ($globalDebug) echo "Download Celestrak DB : Download...";
-		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
+		update_db::download('http://celestrak.com/pub/satcat.txt', $tmp_dir.'satcat.txt');
 		if (file_exists($tmp_dir.'satcat.txt')) {
 			if ($globalDebug) echo "Add to DB...";
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
@@ -2718,63 +2718,63 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
+		update_db::download('http://data.flightairmap.com/data/models/models.md5sum', $tmp_dir.'models.md5sum');
 		if (file_exists($tmp_dir.'models.md5sum')) {
 			if ($globalDebug) echo "Check files...\n";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
-				update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
+				update_db::download('http://data.flightairmap.com/data/models/'.$key, dirname(__FILE__).'/../models/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
+			update_db::download('http://data.flightairmap.com/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum');
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
 		} elseif ($globalDebug) echo "Done\n";
 		if ($globalDebug) echo "glTF 2.0 Models from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',$tmp_dir.'modelsgltf2.md5sum');
+		update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum', $tmp_dir.'modelsgltf2.md5sum');
 		if (file_exists($tmp_dir.'modelsgltf2.md5sum')) {
 			if ($globalDebug) echo "Check files...\n";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/gltf2/models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
-				update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key,dirname(__FILE__).'/../models/gltf2/'.$key);
+				update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key, dirname(__FILE__).'/../models/gltf2/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum');
+			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum', dirname(__FILE__).'/../models/gltf2/models.md5sum');
 		} else $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
@@ -2786,32 +2786,32 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Liveries from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',$tmp_dir.'liveries.md5sum');
+		update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum', $tmp_dir.'liveries.md5sum');
 		if (file_exists($tmp_dir.'liveries.md5sum')) {
 			if ($globalDebug) echo "Check files...\n";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'liveries.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				if ($globalDebug) echo 'Downloading liveries '.$key.' ...'."\n";
-				update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key,dirname(__FILE__).'/../models/gltf2/liveries/'.$key);
+				update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key, dirname(__FILE__).'/../models/gltf2/liveries/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum');
+			update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum', dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum');
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
@@ -2823,32 +2823,32 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
+		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum');
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
 			if ($globalDebug) echo "Check files...\n";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
-				update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
+				update_db::download('http://data.flightairmap.com/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
+			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum');
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
@@ -2860,32 +2860,32 @@ 
 		global $tmp_dir, $globalDebug;
 		$error = '';
 		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
-		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
+		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum');
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
 			if ($globalDebug) echo "Check files...\n";
 			$newmodelsdb = array();
-			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) {
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 					$model = trim($row[2]);
 					$newmodelsdb[$model] = trim($row[0]);
 				}
 			}
 			$modelsdb = array();
 			if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) {
-				if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) {
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) {
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
 						$model = trim($row[2]);
 						$modelsdb[$model] = trim($row[0]);
 					}
 				}
 			}
-			$diff = array_diff($newmodelsdb,$modelsdb);
+			$diff = array_diff($newmodelsdb, $modelsdb);
 			foreach ($diff as $key => $value) {
 				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
-				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
+				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key);
 				
 			}
-			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
+			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
 		if ($error != '') {
 			return $error;
@@ -2897,8 +2897,8 @@ 
 		global $tmp_dir, $globalDebug;
 		date_default_timezone_set('UTC');
 		$Common = new Common();
-		$data = $Common->getData('https://www4.icao.int/doc8643/External/AircraftTypes','post',array('X-Requested-With: XMLHttpRequest','Accept: application/json, text/javascript, */*; q=0.01','Host: www4.icao.int','Origin: https://www.icao.int','Content-Length: 0'),'','','https://www.icao.int/publications/DOC8643/Pages/Search.aspx',60);
-		$all = json_decode($data,true);
+		$data = $Common->getData('https://www4.icao.int/doc8643/External/AircraftTypes', 'post', array('X-Requested-With: XMLHttpRequest', 'Accept: application/json, text/javascript, */*; q=0.01', 'Host: www4.icao.int', 'Origin: https://www.icao.int', 'Content-Length: 0'), '', '', 'https://www.icao.int/publications/DOC8643/Pages/Search.aspx', 60);
+		$all = json_decode($data, true);
 		$Connection = new Connection();
 		$querychk = "SELECT COUNT(1) as nb FROM aircraft WHERE icao = :icao";
 		$sth = $Connection->db->prepare($querychk);
@@ -2910,8 +2910,8 @@ 
 		foreach ($all as $model) {
 			$icao = $model['Designator'];
 			if (!isset($allicao[$icao])) {
-				$aircraft_shadow = 'generic_'.substr($model['EngineType'],0,1).$model['EngineCount'].$model['WTC'].'.png';
-				$allicao[$icao] = array(':icao' => $icao,':type' => $model['ModelFullName'],':manufacturer' => $model['ManufacturerCode'],':aircraft_shadow' => $aircraft_shadow,':aircraft_description' => $model['AircraftDescription'],':engine_type' => $model['EngineType'],':engine_count' => $model['EngineCount'],':wake_category' => $model['WTC']);
+				$aircraft_shadow = 'generic_'.substr($model['EngineType'], 0, 1).$model['EngineCount'].$model['WTC'].'.png';
+				$allicao[$icao] = array(':icao' => $icao, ':type' => $model['ModelFullName'], ':manufacturer' => $model['ManufacturerCode'], ':aircraft_shadow' => $aircraft_shadow, ':aircraft_description' => $model['AircraftDescription'], ':engine_type' => $model['EngineType'], ':engine_count' => $model['EngineCount'], ':wake_category' => $model['WTC']);
 			} else {
 				$allicao[$icao][':type'] = $allicao[$icao][':type'].'/'.$model['ModelFullName'];
 			}
@@ -2923,9 +2923,9 @@ 
 				if ($exist[0]['nb'] == 0) {
 					$sthins->execute($airdata);
 				} else {
-					$sthup->execute(array(':type' => $airdata[':type'],':icao' => $icao));
+					$sthup->execute(array(':type' => $airdata[':type'], ':icao' => $icao));
 				}
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -2957,23 +2957,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];
@@ -2989,30 +2989,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;
@@ -3020,7 +3020,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.";
@@ -3043,16 +3043,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']);
@@ -3074,7 +3074,7 @@ 
 				$Connection = new Connection();
 				$sth = $Connection->db->prepare($query);
 				$sth->execute(array(':new' => $new, ':old' => $old));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -3091,7 +3091,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);
@@ -3106,7 +3106,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3117,7 +3117,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);
@@ -3131,7 +3131,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);
@@ -3145,7 +3145,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);
@@ -3159,7 +3159,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);
@@ -3173,7 +3173,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);
@@ -3187,7 +3187,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);
@@ -3202,7 +3202,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3214,7 +3214,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3226,7 +3226,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3238,7 +3238,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3250,7 +3250,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3262,7 +3262,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute(array(':version' => $version));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3278,7 +3278,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);
@@ -3293,7 +3293,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3309,7 +3309,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);
@@ -3324,7 +3324,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3340,7 +3340,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);
@@ -3355,7 +3355,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3371,7 +3371,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);
@@ -3386,7 +3386,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3402,7 +3402,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);
@@ -3417,7 +3417,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3433,7 +3433,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);
@@ -3448,7 +3448,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3464,7 +3464,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);
@@ -3479,7 +3479,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3495,7 +3495,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);
@@ -3510,7 +3510,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3526,7 +3526,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);
@@ -3541,7 +3541,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3557,7 +3557,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);
@@ -3572,7 +3572,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3588,7 +3588,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);
@@ -3607,7 +3607,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -3622,7 +3622,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3634,7 +3634,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -3650,7 +3650,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}
@@ -3665,7 +3665,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
 	}

require/class.GeoidHeight.php

Spacing +35 added lines, -35 removed lines

@@ -11,7 +11,7 @@ 
 * Translated to PHP of GeographicLib/src/Geoid.cpp
 * by Ycarus <ycarus@zugaina.org> in 2017
 */
-class GeoidHeight  {
+class GeoidHeight {
 	private $c0 = 240;
 	private $c3 = [[9, -18, -88, 0, 96, 90, 0, 0, -60, -20], [-9, 18, 8, 0, -96, 30, 0, 0, 60, -20], [9, -88, -18, 90, 96, 0, -20, -60, 0, 0], [186, -42, -42, -150, -96, -150, 60, 60, 60, 60], [54, 162, -78, 30, -24, -90, -60, 60, -60, 60], [-9, -32, 18, 30, 24, 0, 20, -60, 0, 0], [-9, 8, 18, 30, -96, 0, -20, 60, 0, 0], [54, -78, 162, -90, -24, 30, 60, -60, 60, -60], [-54, 78, 78, 90, 144, 90, -60, -60, -60, -60], [9, -8, -18, -30, -24, 0, 20, 60, 0, 0], [-9, 18, -32, 0, 24, 30, 0, 0, -60, 20], [9, -18, -8, 0, -24, -30, 0, 0, 60, 20]];
 	private $c0n = 372;
@@ -34,7 +34,7 @@ 
 	private $v10 = null;
 	private $v11 = null;
 
-	public function __construct($name='') {
+	public function __construct($name = '') {
 		global $globalGeoidSource;
 		//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
 		if ($name == '') {
@@ -45,35 +45,35 @@ 
 		if (file_exists($name) === FALSE) {
 			throw new Exception($name." doesn't exist");
 		}
-		$f = @fopen($name,"r");
+		$f = @fopen($name, "r");
 		if ($f === FALSE) {
 			throw new Exception("Can't open ".$name);
 		}
-		$line = fgets($f,4096);
+		$line = fgets($f, 4096);
 		if (trim($line) != 'P5') {
 			throw new Exception('No PGM header');
 		}
 		$headerlen = strlen($line);
 		while (true) {
-			$line = fgets($f,4096);
+			$line = fgets($f, 4096);
 			if ((strlen($line) == 0)) {
 				throw new Exception('EOF before end of file header');
 			}
 			$headerlen += strlen($line);
-			if (strpos($line,'# Offset ') !== FALSE) {
+			if (strpos($line, '# Offset ') !== FALSE) {
 				$this->offset = substr($line, 9);
-			} else if (strpos($line,'# Scale ') !== FALSE) {
+			} else if (strpos($line, '# Scale ') !== FALSE) {
 				$this->scale = substr($line, 8);
-			} else if ((strpos($line,'#') === FALSE)) {
-				list($this->width, $this->height) = preg_split('/\s+/',$line);
+			} else if ((strpos($line, '#') === FALSE)) {
+				list($this->width, $this->height) = preg_split('/\s+/', $line);
 				break;
 			}
 		}
-		$line = fgets($f,4096);
+		$line = fgets($f, 4096);
 		$headerlen += strlen($line);
-		$levels = (int)$line;
-		$this->width = (int)$this->width;
-		$this->height = (int)$this->height;
+		$levels = (int) $line;
+		$this->width = (int) $this->width;
+		$this->height = (int) $this->height;
 		if (($levels != 65535)) {
 			throw new Exception('PGM file must have 65535 gray levels ('.$levels.')');
 		}
@@ -88,42 +88,42 @@ 
 		}
 
 		$fullsize = filesize($name);
-		if ((($fullsize - $headerlen) != (($this->width * $this->height) * 2))) {
+		if ((($fullsize - $headerlen) != (($this->width*$this->height)*2))) {
 			throw new Exception('File has the wrong length');
 		}
 
 		$this->headerlen = $headerlen;
-		$this->raw= $f;
-		$this->rlonres = ($this->width / 360.0);
-		$this->rlatres = (($this->height - 1) / 180.0);
+		$this->raw = $f;
+		$this->rlonres = ($this->width/360.0);
+		$this->rlatres = (($this->height - 1)/180.0);
 	}
 
-	private function _rawval($ix,$iy) {
+	private function _rawval($ix, $iy) {
 		if (($iy < 0)) {
 			$iy = -$iy;
-			$ix += ($this->width / 2);
+			$ix += ($this->width/2);
 		} else if (($iy >= $this->height)) {
-			$iy = ((2 * ($this->height - 1)) - $iy);
-			$ix += ($this->width / 2);
+			$iy = ((2*($this->height - 1)) - $iy);
+			$ix += ($this->width/2);
 		}
 		if (($ix < 0)) {
 			$ix += $this->width;
 		} else if (($ix >= $this->width)) {
 			$ix -= $this->width;
 		}
-		$k = ((($iy * $this->width) + $ix) * 2) + $this->headerlen;
-		fseek($this->raw,$k);
-		return unpack('n',fread($this->raw,2))[1];
+		$k = ((($iy*$this->width) + $ix)*2) + $this->headerlen;
+		fseek($this->raw, $k);
+		return unpack('n', fread($this->raw, 2))[1];
 	}
 
-	public function get($lat,$lon,$cubic=true) {
+	public function get($lat, $lon, $cubic = true) {
 		if (($lon < 0)) {
 			$lon += 360;
 		}
-		$fy = ((90 - $lat) * $this->rlatres);
-		$fx = ($lon * $this->rlonres);
-		$iy = (int)$fy;
-		$ix = (int)$fx;
+		$fy = ((90 - $lat)*$this->rlatres);
+		$fx = ($lon*$this->rlonres);
+		$iy = (int) $fy;
+		$ix = (int) $fx;
 		$fx -= $ix;
 		$fy -= $iy;
 		$t = array();
@@ -150,7 +150,7 @@ 
 					$c3x = $this->c3;
 					$c0x = $this->c0;
 				}
-				for ($i = 0; $i < 10;++$i) {
+				for ($i = 0; $i < 10; ++$i) {
 					$t[$i] = 0;
 					for ($j = 0; $j < 12; ++$j) {
 						$t[$i] += $v[$j]*$c3x[$j][$i];
@@ -161,13 +161,13 @@ 
 			$this->t = $t;
 		} else $t = $this->t;
 		if (!($cubic)) {
-			$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
-			$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));
-			$h = (((1 - $fy) * $a) + ($fy * $b));
+			$a = (((1 - $fx)*$this->v00) + ($fx*$this->v01));
+			$b = (((1 - $fx)*$this->v10) + ($fx*$this->v11));
+			$h = (((1 - $fy)*$a) + ($fy*$b));
 		} else {
-			$h = (($t[0] + ($fx * ($t[1] + ($fx * ($t[3] + ($fx * $t[6])))))) + ($fy * (($t[2] + ($fx * ($t[4] + ($fx * $t[7])))) + ($fy * (($t[5] + ($fx * $t[8])) + ($fy * $t[9]))))));
+			$h = (($t[0] + ($fx*($t[1] + ($fx*($t[3] + ($fx*$t[6])))))) + ($fy*(($t[2] + ($fx*($t[4] + ($fx*$t[7])))) + ($fy*(($t[5] + ($fx*$t[8])) + ($fy*$t[9]))))));
 		}
-		return ((float)$this->offset + ((float)$this->scale * (float)$h));
+		return ((float) $this->offset + ((float) $this->scale*(float) $h));
 	}
 }
 /*

require/class.Stats.php

Spacing +643 added lines, -643 removed lines

@@ -28,14 +28,14 @@ 
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
 	}
 
-	public function addLastStatsUpdate($type,$stats_date) {
+	public function addLastStatsUpdate($type, $stats_date) {
 		$query = "DELETE FROM config WHERE name = :type;
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -45,7 +45,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':type' => $type));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -66,7 +66,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -79,14 +79,14 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -98,77 +98,77 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
 		}
 		return $all;
 	}
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -176,23 +176,23 @@ 
 	}
 
 
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -203,29 +203,29 @@ 
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllMarineTypes($limit = true, $filter_name = '',$year = '', $month = '') {
+	public function countAllMarineTypes($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -234,23 +234,23 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
 		if (empty($all)) {
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Marine = new Marine($this->db);
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
-			$all = $Marine->countAllMarineTypes($limit,0,'',$filters);
+			$all = $Marine->countAllMarineTypes($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -259,7 +259,7 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -267,32 +267,32 @@ 
 		if (empty($all)) {
 			$Spotter = new Spotter($this->db);
 			$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
 		}
 		return $all;
 	}
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -303,21 +303,21 @@ 
 				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
@@ -326,23 +326,23 @@ 
 		return $all;
 	}
 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -353,61 +353,61 @@ 
 				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
 		}
 		return $all;
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
+			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
 			$query_values = array(':filter_name' => $filter_name);
 		} else {
 			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
 			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
@@ -416,7 +416,7 @@ 
 		return $all;
 	}
 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -425,7 +425,7 @@ 
 			if (isset($forsource)) {
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
 			} else {
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
@@ -434,7 +434,7 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -442,32 +442,32 @@ 
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
             		$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -478,45 +478,45 @@ 
 				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -527,46 +527,46 @@ 
 				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
 				 try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		$Connection = new Connection($this->db);
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($Connection->tableExists('countries')) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
 				$Spotter = new Spotter($this->db);
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 				if ($year == '' && $month == '') {
 					$alliance_airlines = array();
 					foreach ($airlines as $airline) {
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 					}
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
+					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
+					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
 					 try {
 						$sth = $this->db->prepare($query);
 						$sth->execute(array(':filter_name' => $filter_name));
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						echo "error : ".$e->getMessage();
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -578,8 +578,8 @@ 
 					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
 					 try {
 						$sth = $this->db->prepare($query);
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-					} catch(PDOException $e) {
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+					} catch (PDOException $e) {
 						echo "error : ".$e->getMessage();
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -590,7 +590,7 @@ 
 			return $Spotter->countAllFlightOverCountries($limit);
 		} else return array();
 	}
-	public function countAllMarineOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
+	public function countAllMarineOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
 		$Connection = new Connection($this->db);
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($Connection->tableExists('countries')) {
@@ -601,7 +601,7 @@ 
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -609,15 +609,15 @@ 
 			if (empty($all)) {
 				$filters = array();
 				if ($filter_name != '') {
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 				}
 				$Marine = new Marine($this->db);
-				$all = $Marine->countAllMarineOverCountries($limit,0,'',$filters);
+				$all = $Marine->countAllMarineOverCountries($limit, 0, '', $filters);
 			}
 			return $all;
 		} else return array();
 	}
-	public function countAllTrackerOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
+	public function countAllTrackerOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		$Connection = new Connection($this->db);
 		if ($filter_name == '') $filter_name = $this->filter_name;
@@ -629,7 +629,7 @@ 
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -638,15 +638,15 @@ 
 			if (empty($all)) {
 				$filters = array();
 				if ($filter_name != '') {
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 				}
 				$Tracker = new Tracker($this->db);
-				$all = $Tracker->countAllTrackerOverCountries($limit,0,'',$filters);
+				$all = $Tracker->countAllTrackerOverCountries($limit, 0, '', $filters);
 			}
 			return $all;
 		} else return array();
 	}
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -654,41 +654,41 @@ 
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
 		}
 		return $all;
 	}
 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
+				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -699,45 +699,45 @@ 
 				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -748,27 +748,27 @@ 
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
 			$all = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_departure_icao'];
@@ -784,27 +784,27 @@ 
 			foreach ($all as $key => $row) {
 				$count[$key] = $row['airport_departure_icao_count'];
 			}
-			array_multisort($count,SORT_DESC,$all);
+			array_multisort($count, SORT_DESC, $all);
 		}
 		return $all;
 	}
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -815,27 +815,27 @@ 
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
 			$all = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_arrival_icao'];
@@ -851,26 +851,26 @@ 
 			foreach ($all as $key => $row) {
 				$count[$key] = $row['airport_arrival_icao_count'];
 			}
-			array_multisort($count,SORT_DESC,$all);
+			array_multisort($count, SORT_DESC, $all);
 		}
 		return $all;
 	}
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
 			} else {
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
@@ -881,23 +881,23 @@ 
 				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 			}
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllMonthsLastYear($filters);
@@ -905,7 +905,7 @@ 
 		return $all;
 	}
 
-	public function countAllMarineMonthsLastYear($limit = true,$filter_name = '') {
+	public function countAllMarineMonthsLastYear($limit = true, $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -919,14 +919,14 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Marine = new Marine($this->db);
 			$all = $Marine->countAllMonthsLastYear($filters);
@@ -934,7 +934,7 @@ 
 		return $all;
 	}
 
-	public function countAllTrackerMonthsLastYear($limit = true,$filter_name = '') {
+	public function countAllTrackerMonthsLastYear($limit = true, $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -948,14 +948,14 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Tracker = new Tracker($this->db);
 			$all = $Tracker->countAllMonthsLastYear($filters);
@@ -963,37 +963,37 @@ 
 		return $all;
 	}
 	
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDatesLastMonth($filters);
@@ -1008,14 +1008,14 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Marine = new Marine($this->db);
 			$all = $Marine->countAllDatesLastMonth($filters);
@@ -1030,34 +1030,34 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Tracker = new Tracker($this->db);
 			$all = $Tracker->countAllDatesLastMonth($filters);
 		}
 		return $all;
 	}
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			} else {
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
@@ -1066,23 +1066,23 @@ 
 			} else {
 				$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 			}
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDatesLast7Days($filters);
@@ -1101,14 +1101,14 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Marine = new Marine($this->db);
 			$all = $Marine->countAllDatesLast7Days($filters);
@@ -1127,51 +1127,51 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Tracker = new Tracker($this->db);
 			$all = $Tracker->countAllDatesLast7Days($filters);
 		}
 		return $all;
 	}
-	public function countAllDates($stats_airline = '',$filter_name = '') {
+	public function countAllDates($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDates($filters);
@@ -1186,7 +1186,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1208,7 +1208,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1230,34 +1230,34 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDatesByAirlines($filters);
 		}
 		return $all;
 	}
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
+				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
 			} else {
-				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
+				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
@@ -1271,18 +1271,18 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllMonths($filters);
@@ -1299,7 +1299,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1319,7 +1319,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1336,32 +1336,32 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllMilitaryMonths($filters);
 		}
 		return $all;
 	}
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1379,25 +1379,25 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
-			$all = $Spotter->countAllHours($orderby,$filters);
+			$all = $Spotter->countAllHours($orderby, $filters);
 		}
 		return $all;
 	}
-	public function countAllMarineHours($orderby = 'hour',$limit = true,$filter_name = '') {
+	public function countAllMarineHours($orderby = 'hour', $limit = true, $filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
@@ -1414,21 +1414,21 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Marine = new Marine($this->db);
-			$all = $Marine->countAllHours($orderby,$filters);
+			$all = $Marine->countAllHours($orderby, $filters);
 		}
 		return $all;
 	}
-	public function countAllTrackerHours($orderby = 'hour',$limit = true,$filter_name = '') {
+	public function countAllTrackerHours($orderby = 'hour', $limit = true, $filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
@@ -1445,33 +1445,33 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Tracker = new Tracker($this->db);
-			$all = $Tracker->countAllHours($orderby,$filters);
+			$all = $Tracker->countAllHours($orderby, $filters);
 		}
 		return $all;
 	}
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -1479,15 +1479,15 @@ 
 		}
 		return $all;
 	}
-	public function countOverallMarine($filter_name = '',$year = '',$month = '') {
+	public function countOverallMarine($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('marine_bymonth',$year,'',$filter_name,$month);
+		$all = $this->getSumStats('marine_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Marine = new Marine($this->db);
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -1495,15 +1495,15 @@ 
 		}
 		return $all;
 	}
-	public function countOverallTracker($filter_name = '',$year = '',$month = '') {
+	public function countOverallTracker($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('tracker_bymonth',$year,'',$filter_name,$month);
+		$all = $this->getSumStats('tracker_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Tracker = new Tracker($this->db);
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -1511,16 +1511,16 @@ 
 		}
 		return $all;
 	}
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
 			$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -1528,19 +1528,19 @@ 
 		}
 		return $all;
 	}
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
@@ -1548,48 +1548,48 @@ 
 		}
 		return $all;
 	}
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
 		} else {
 			if ($year == '' && $month == '') {
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
-				} catch(PDOException $e) {
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
@@ -1597,7 +1597,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -1605,17 +1605,17 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb_airline'];
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
 			$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -1623,7 +1623,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallMarineTypes($filter_name = '',$year = '',$month = '') {
+	public function countOverallMarineTypes($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$all = array();
@@ -1632,7 +1632,7 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1640,9 +1640,9 @@ 
 		}
 		if (empty($all)) {
 			$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Marine = new Marine($this->db);
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -1650,29 +1650,29 @@ 
 		}
 		return $all;
 	}
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 				$query_values = array(':filter_name' => $filter_name);
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
 			} else {
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
 			}
 		} else {
 			if ($year == '' && $month == '') {
@@ -1681,23 +1681,23 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
 			} else {
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
 			}
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
@@ -1705,7 +1705,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		//if ($year == '') $year = date('Y');
@@ -1715,18 +1715,18 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb'];
 		} else {
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
 		}
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
@@ -1735,104 +1735,104 @@ 
 		return $all;
 	}
 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
+			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
 		} else {
 			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 	}
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		global $globalArchiveMonths, $globalDBdriver;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
 				if ($month == '') {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
 				} else {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			} else {
 				if ($month == '') {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
 				} else {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			}
 		} else {
 			if ($globalDBdriver == 'mysql') {
 				if ($month == '') {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 				} else {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			} else {
 				if ($month == '') {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 				} else {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			}
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1841,17 +1841,17 @@ 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			} else {
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			}
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
 		} else {
@@ -1865,7 +1865,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1874,17 +1874,17 @@ 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			} else {
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			}
 		} else {
 			if ($globalDBdriver == 'mysql') {
@@ -1896,7 +1896,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1913,7 +1913,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1930,20 +1930,20 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all[0]['total'];
 	}
-	public function getStatsOwner($owner_name,$filter_name = '') {
+	public function getStatsOwner($owner_name, $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1961,20 +1961,20 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all[0]['total'];
 	}
-	public function getStatsPilot($pilot,$filter_name = '') {
+	public function getStatsPilot($pilot, $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
-		} catch(PDOException $e) {
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1982,7 +1982,7 @@ 
 		else return 0;
 	}
 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -1990,15 +1990,15 @@ 
 		} else {
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -2007,11 +2007,11 @@ 
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -2035,95 +2035,95 @@ 
         }
         */
 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
 		global $globalDBdriver;
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
 		$query_values = array();
 		if ($globalDBdriver == 'mysql') {
 			if ($year != '') {
 				$query .= ' AND YEAR(stats_date) = :year';
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 			if ($month != '') {
 				$query .= ' AND MONTH(stats_date) = :month';
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 			if ($day != '') {
 				$query .= ' AND DAY(stats_date) = :day';
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		} else {
 			if ($year != '') {
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 			if ($month != '') {
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 			if ($day != '') {
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " ORDER BY source_name";
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
+	public function addStatSource($data, $source_name, $stats_type, $date) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
 		} else {
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
 		}
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatMarine($type,$date_name,$cnt,$filter_name = '') {
+	public function addStatMarine($type, $date_name, $cnt, $filter_name = '') {
 		$query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatTracker($type,$date_name,$cnt,$filter_name = '') {
+	public function addStatTracker($type, $date_name, $cnt, $filter_name = '') {
 		$query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2138,15 +2138,15 @@ 
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2161,15 +2161,15 @@ 
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2184,15 +2184,15 @@ 
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
 			}
 		}
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatCountryMarine($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
+	public function addStatCountryMarine($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2207,15 +2207,15 @@ 
 				$query = "UPDATE stats_marine_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_marine_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatCountryTracker($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
+	public function addStatCountryTracker($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2230,15 +2230,15 @@ 
 				$query = "UPDATE stats_tracker_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_tracker_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2253,15 +2253,15 @@ 
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatMarineType($type,$type_id,$cnt, $filter_name = '', $reset = false) {
+	public function addStatMarineType($type, $type_id, $cnt, $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2276,15 +2276,15 @@ 
 				$query = "UPDATE stats_marine_type SET cnt = cnt+:cnt, type = :type, filter_name = :filter_name WHERE type_id = :type_id AND filter_name = :filter_name; INSERT INTO stats_marine_type (type,type_id,cnt,filter_name) SELECT :type,:type_id,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_type WHERE type_id = :type_id AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':type' => $type,':type_id' => $type_id,':cnt' => $cnt, ':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':type_id' => $type_id, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatTrackerType($type,$cnt, $filter_name = '', $reset = false) {
+	public function addStatTrackerType($type, $cnt, $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2299,15 +2299,15 @@ 
 				$query = "UPDATE stats_tracker_type SET cnt = cnt+:cnt WHERE type = :type AND filter_name = :filter_name; INSERT INTO stats_tracker_type (type,cnt,filter_name) SELECT :type,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_type WHERE type = :type AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':type' => $type,':cnt' => $cnt, ':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2322,15 +2322,15 @@ 
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2345,15 +2345,15 @@ 
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -2368,15 +2368,15 @@ 
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
 			}
 		}
-		$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
+		$query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -2392,16 +2392,16 @@ 
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 				}
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
 	}
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -2409,16 +2409,16 @@ 
 			} else {
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			 try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
 	}
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -2434,16 +2434,16 @@ 
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 				}
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
 	}
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -2451,11 +2451,11 @@ 
 			} else {
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -2467,7 +2467,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -2477,7 +2477,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -2487,7 +2487,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -2497,7 +2497,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -2507,13 +2507,13 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
 
 	public function addOldStats() {
-		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
+		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
 		$Common = new Common();
 		$Connection = new Connection($this->db);
 		date_default_timezone_set('UTC');
@@ -2528,9 +2528,9 @@ 
 			$filtername = 'marine';
 			if ($Connection->tableExists('countries')) {
 				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
-				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
+				$alldata = $Marine->countAllMarineOverCountries(false, 0, $last_update_day);
 				foreach ($alldata as $number) {
-					echo $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
+					echo $this->addStatCountryMarine($number['marine_country_iso2'], $number['marine_country_iso3'], $number['marine_country'], $number['marine_count'], '', '', $reset);
 				}
 			}
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
@@ -2540,44 +2540,44 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('marine_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			echo 'Marine data...'."\n";
 			$this->deleteStatMarine('month');
 			echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Marine->countAllDatesLastMonth($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatMarine('month',$number['date_name'],$number['date_count']);
+				$this->addStatMarine('month', $number['date_name'], $number['date_count']);
 			}
 			echo '-> countAllDates...'."\n";
 			$previousdata = $this->countAllDatesMarine();
 			$this->deleteStatMarine('date');
-			$alldata = $Common->array_merge_noappend($previousdata,$Marine->countAllDates($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdata, $Marine->countAllDates($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatMarine('date',$number['date_name'],$number['date_count']);
+				$this->addStatMarine('date', $number['date_name'], $number['date_count']);
 			}
 			
 			$this->deleteStatMarine('hour');
 			echo '-> countAllHours...'."\n";
-			$alldata = $Marine->countAllHours('hour',$filter_last_month);
+			$alldata = $Marine->countAllHours('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
+				$this->addStatMarine('hour', $number['hour_name'], $number['hour_count']);
 			}
 			if ($globalDebug) echo 'Count all types...'."\n";
-			$alldata = $Marine->countAllMarineTypes(false,0,$last_update_day);
+			$alldata = $Marine->countAllMarineTypes(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatMarineType($number['marine_type'],$number['marine_type_id'],$number['marine_type_count'],'',$reset);
+				$this->addStatMarineType($number['marine_type'], $number['marine_type_id'], $number['marine_type_count'], '', $reset);
 			}
 
 			echo 'Insert last stats update date...'."\n";
 			date_default_timezone_set('UTC');
-			$this->addLastStatsUpdate('last_update_stats_marine',date('Y-m-d G:i:s'));
+			$this->addLastStatsUpdate('last_update_stats_marine', date('Y-m-d G:i:s'));
 		}
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
@@ -2589,9 +2589,9 @@ 
 			$Tracker = new Tracker($this->db);
 			if ($Connection->tableExists('countries')) {
 				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
-				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
+				$alldata = $Tracker->countAllTrackerOverCountries(false, 0, $last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
+					$this->addStatCountryTracker($number['tracker_country_iso2'], $number['tracker_country_iso3'], $number['tracker_country'], $number['tracker_count'], '', '', $reset);
 				}
 			}
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
@@ -2601,43 +2601,43 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('tracker_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			echo 'Tracker data...'."\n";
 			$this->deleteStatTracker('month');
 			echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Tracker->countAllDatesLastMonth($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatTracker('month',$number['date_name'],$number['date_count']);
+				$this->addStatTracker('month', $number['date_name'], $number['date_count']);
 			}
 			echo '-> countAllDates...'."\n";
 			$previousdata = $this->countAllDatesTracker();
 			$this->deleteStatTracker('date');
-			$alldata = $Common->array_merge_noappend($previousdata,$Tracker->countAllDates($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdata, $Tracker->countAllDates($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatTracker('date',$number['date_name'],$number['date_count']);
+				$this->addStatTracker('date', $number['date_name'], $number['date_count']);
 			}
 			
 			$this->deleteStatTracker('hour');
 			echo '-> countAllHours...'."\n";
-			$alldata = $Tracker->countAllHours('hour',$filter_last_month);
+			$alldata = $Tracker->countAllHours('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
+				$this->addStatTracker('hour', $number['hour_name'], $number['hour_count']);
 			}
 			if ($globalDebug) echo 'Count all types...'."\n";
-			$alldata = $Tracker->countAllTrackerTypes(false,0,$last_update_day);
+			$alldata = $Tracker->countAllTrackerTypes(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatTrackerType($number['tracker_type'],$number['tracker_type_count'],'',$reset);
+				$this->addStatTrackerType($number['tracker_type'], $number['tracker_type_count'], '', $reset);
 			}
 			echo 'Insert last stats update date...'."\n";
 			date_default_timezone_set('UTC');
-			$this->addLastStatsUpdate('last_update_stats_tracker',date('Y-m-d G:i:s'));
+			$this->addLastStatsUpdate('last_update_stats_tracker', date('Y-m-d G:i:s'));
 		}
 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
@@ -2655,41 +2655,41 @@ 
 			$Spotter = new Spotter($this->db);
 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all airlines...'."\n";
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all registrations...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all owners...'."\n";
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all pilots...'."\n";
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
 			}
 			
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order departure airports...'."\n";
 			$alldata = array();
 			foreach ($pall as $value) {
@@ -2706,14 +2706,14 @@ 
 			foreach ($alldata as $key => $row) {
 				$count[$key] = $row['airport_departure_icao_count'];
 			}
-			array_multisort($count,SORT_DESC,$alldata);
+			array_multisort($count, SORT_DESC, $alldata);
 			foreach ($alldata as $number) {
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
 			$alldata = array();
 			foreach ($pall as $value) {
@@ -2730,18 +2730,18 @@ 
 			foreach ($alldata as $key => $row) {
 				$count[$key] = $row['airport_arrival_icao_count'];
 			}
-			array_multisort($count,SORT_DESC,$alldata);
+			array_multisort($count, SORT_DESC, $alldata);
 			foreach ($alldata as $number) {
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset);
 			}
 			if ($Connection->tableExists('countries')) {
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
 				//$SpotterArchive = new SpotterArchive();
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
 				$Spotter = new Spotter($this->db);
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
 				}
 			}
 			
@@ -2751,12 +2751,12 @@ 
 				$this->deleteStatsByType('fatalities_byyear');
 				$alldata = $Accident->countFatalitiesByYear();
 				foreach ($alldata as $number) {
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
 				}
 				$this->deleteStatsByType('fatalities_bymonth');
 				$alldata = $Accident->countFatalitiesLast12Months();
 				foreach ($alldata as $number) {
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
 				}
 			}
 
@@ -2770,37 +2770,37 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			if ($globalDebug) echo 'Airports data...'."\n";
 			if ($globalDebug) echo '...Departure'."\n";
@@ -2845,7 +2845,7 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
 			}
 			echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrival();
@@ -2886,7 +2886,7 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
 			}
 
 			echo 'Flights data...'."\n";
@@ -2894,28 +2894,28 @@ 
 			echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
 			}
 			echo '-> countAllDates...'."\n";
 			$previousdata = $this->countAllDates();
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
 			$this->deleteStatFlight('date');
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
 			}
 			
 			$this->deleteStatFlight('hour');
 			echo '-> countAllHours...'."\n";
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
 			}
 
 			// Count by airlines
@@ -2924,42 +2924,42 @@ 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
 				$SpotterArchive = new SpotterArchive($this->db);
 				//$Spotter = new Spotter($this->db);
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
 				}
 			}
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
 			}
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
 			//$alldata = array();
 			foreach ($dall as $value) {
@@ -2979,12 +2979,12 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
 			//$alldata = array();
 			foreach ($dall as $value) {
@@ -3004,7 +3004,7 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
+				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
@@ -3012,27 +3012,27 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
 			}
 			if ($globalDebug) echo '...Departure'."\n";
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -3055,7 +3055,7 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
@@ -3078,32 +3078,32 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']);
 			}
 
 			if ($globalDebug) echo 'Flights data...'."\n";
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo '-> countAllDates...'."\n";
 			//$previousdata = $this->countAllDatesByAirlines();
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			
 			if ($globalDebug) echo '-> countAllHours...'."\n";
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
 			}
 
 			// Stats by filters
@@ -3127,7 +3127,7 @@ 
 							$last_update_day = date('Y').'-01-01 00:00:00';
 						}
 					}
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
 						$last_update_day = date('Y').'-01-01 00:00:00';
 						$reset = true;
 					}
@@ -3135,38 +3135,38 @@ 
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
 					$Spotter = new Spotter($this->db);
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all airlines...'."\n";
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all owners...'."\n";
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all pilots...'."\n";
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
 					}
 					if ($globalDebug) echo 'Count departure airports...'."\n";
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
 					$alldata = array();
 					foreach ($pall as $value) {
 						$icao = $value['airport_departure_icao'];
@@ -3182,13 +3182,13 @@ 
 					foreach ($alldata as $key => $row) {
 						$count[$key] = $row['airport_departure_icao_count'];
 					}
-					array_multisort($count,SORT_DESC,$alldata);
+					array_multisort($count, SORT_DESC, $alldata);
 					foreach ($alldata as $number) {
-						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
 					$alldata = array();
 					foreach ($pall as $value) {
 						$icao = $value['airport_arrival_icao'];
@@ -3204,9 +3204,9 @@ 
 					foreach ($alldata as $key => $row) {
 						$count[$key] = $row['airport_arrival_icao_count'];
 					}
-					array_multisort($count,SORT_DESC,$alldata);
+					array_multisort($count, SORT_DESC, $alldata);
 					foreach ($alldata as $number) {
-						echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
+						echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all months...'."\n";
 					$Spotter = new Spotter($this->db);
@@ -3214,36 +3214,36 @@ 
 					$lastyear = false;
 					foreach ($alldata as $number) {
 						if ($number['year_name'] != date('Y')) $lastyear = true;
-						$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+						$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
 					$alldata = $Spotter->countAllMonthsOwners($filter);
 					foreach ($alldata as $number) {
-						$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+						$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
 					$alldata = $Spotter->countAllMonthsPilots($filter);
 					foreach ($alldata as $number) {
-						$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+						$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					if ($globalDebug) echo 'Count all military by months...'."\n";
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
 					foreach ($alldata as $number) {
-						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+						$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
 				    	foreach ($alldata as $number) {
-			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+			    			$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
 					foreach ($alldata as $number) {
-						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+						$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					echo '...Departure'."\n";
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
 					foreach ($dall as $value) {
 						$icao = $value['departure_airport_icao'];
 						$ddate = $value['date'];
@@ -3261,11 +3261,11 @@ 
 					}
 					$alldata = $pall;
 					foreach ($alldata as $number) {
-						$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
+						$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name);
 					}
 					echo '...Arrival'."\n";
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
 					foreach ($dall as $value) {
 						$icao = $value['arrival_airport_icao'];
 						$ddate = $value['date'];
@@ -3283,39 +3283,39 @@ 
 					}
 					$alldata = $pall;
 					foreach ($alldata as $number) {
-						$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
+						$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name);
 					}
 					echo 'Flights data...'."\n";
 					echo '-> countAllDatesLastMonth...'."\n";
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
 					foreach ($alldata as $number) {
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
 					}
 					echo '-> countAllDates...'."\n";
-					$previousdata = $this->countAllDates('',$filter_name);
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
+					$previousdata = $this->countAllDates('', $filter_name);
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
 					$values = array();
 					foreach ($alldata as $cnt) {
 						$values[] = $cnt['date_count'];
 					}
-					array_multisort($values,SORT_DESC,$alldata);
-					array_splice($alldata,11);
+					array_multisort($values, SORT_DESC, $alldata);
+					array_splice($alldata, 11);
 					foreach ($alldata as $number) {
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
 					}
 				
 					echo '-> countAllHours...'."\n";
-					$alldata = $Spotter->countAllHours('hour',$filter);
+					$alldata = $Spotter->countAllHours('hour', $filter);
 					foreach ($alldata as $number) {
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
 					}
 					echo 'Insert last stats update date...'."\n";
 					date_default_timezone_set('UTC');
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
 							$this->deleteOldStats($filter_name);
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
 						}
 					}
 				}
@@ -3328,16 +3328,16 @@ 
 				// SUM all previous month to put as year
 				$previous_year = date('Y');
 				$previous_year--;
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
 				$allairlines = $this->getAllAirlineNames();
 				foreach ($allairlines as $data) {
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
 				}
 				
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
@@ -3346,21 +3346,21 @@ 
 						try {
 							$sth = $this->db->prepare($query);
 							$sth->execute();
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
 						}
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
 						try {
 							$sth = $this->db->prepare($query);
 							$sth->execute();
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
 						}
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
 						try {
 							$sth = $this->db->prepare($query);
 							$sth->execute();
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
 						}
 					}
@@ -3373,7 +3373,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
 					}
 					if ($globalDBdriver == 'mysql') {
@@ -3384,7 +3384,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
 					}
 					if ($globalDBdriver == 'mysql') {
@@ -3395,15 +3395,15 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
 					}
 				}
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
 						$this->deleteOldStats();
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
 						$lastyearupdate = true;
 					}
 				}
@@ -3425,7 +3425,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					echo 'Archive old tracker data...'."\n";
@@ -3441,7 +3441,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					echo 'Archive old marine data...'."\n";
@@ -3457,7 +3457,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -3470,7 +3470,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 				echo 'Deleting old tracker data...'."\n";
@@ -3482,7 +3482,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 				echo 'Deleting old marine data...'."\n";
@@ -3494,14 +3494,14 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			}
 			if (!isset($lastyearupdate)) {
 				echo 'Insert last stats update date...'."\n";
 				date_default_timezone_set('UTC');
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
 			}
 			if ($globalStatsResetYear) {
 				require_once(dirname(__FILE__).'/../install/class.settings.php');

aircraft-data.php

Spacing +21 added lines, -21 removed lines

@@ -11,14 +11,14 @@ 
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
@@ -29,15 +29,15 @@ 
 	}
 }
 if (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
@@ -57,7 +57,7 @@ 
 	if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 	{
 		if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-			$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+			$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 		} else $image = $spotter_item['image_thumbnail'];
 	}
 	/* else {
@@ -80,7 +80,7 @@ 
 		print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
 		if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 			if ($spotter_item['departure_airport_time'] > 2460) {
-				print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
+				print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
 			} else {
 				print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
 			}
@@ -89,7 +89,7 @@ 
 		print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
 		if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 			if ($spotter_item['arrival_airport_time'] > 2460) {
-				print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
+				print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
 			} else {
 				print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
 			}
@@ -108,7 +108,7 @@ 
 	print '<span>'._("Aircraft").'</span>';
 	if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
 	if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
-		$aircraft_names = explode('/',$spotter_item['aircraft_name']);
+		$aircraft_names = explode('/', $spotter_item['aircraft_name']);
 		if (count($aircraft_names) == 1) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
 		else print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
 	} elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
@@ -118,8 +118,8 @@ 
 	print '<div id ="altitude"><span>'._("Altitude").'</span>';
 	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
 		try {
-			$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
-		} catch(Exception $e) {
+			$groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
+		} catch (Exception $e) {
 			// If catched not exist
 		}
 	}
@@ -158,9 +158,9 @@ 
 	if (isset($globalCam) && $globalCam) {
 		require_once(dirname(__FILE__).'/require/class.Common.php');
 		$Common = new Common();
-		$azimuth = round($Common->azimuth($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude']));
-		$distance = $Common->distance($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude'],'m');
-		$plunge = round($Common->plunge($globalCenterAltitude,$spotter_item['real_altitude'],$distance));
+		$azimuth = round($Common->azimuth($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude']));
+		$distance = $Common->distance($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude'], 'm');
+		$plunge = round($Common->plunge($globalCenterAltitude, $spotter_item['real_altitude'], $distance));
 		print '<div id="camcoordinates"><span>'._("Cam Coordinates").'</span>';
 		print 'azimuth: '.$azimuth;
 		print ' / ';
@@ -170,16 +170,16 @@ 
 		print '</div>';
 		//echo $Common->getData('http://127.0.0.1/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
 		//echo $Common->getData('file://'.dirname(__FILE__).'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
-		echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
+		echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge, 'get', '', '', '', '', '', '', false, true);
 	}
   
 	print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
 	if (isset($spotter_item['verticalrate']) && $spotter_item['verticalrate'] != '') {
 		print '<div id="verticalrate"><span>'._("Vertical rate").'</span>';
 		if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
-			print $spotter_item['verticalrate']. ' ft/min';
+			print $spotter_item['verticalrate'].' ft/min';
 		} else {
-			print round($spotter_item['verticalrate']*0.3048). ' m/min';
+			print round($spotter_item['verticalrate']*0.3048).' m/min';
 		}
 		print '</div>';
 	}
@@ -214,7 +214,7 @@ 
 	print '</div>';
 	if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
 	if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
-	if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
+	if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>';
 	if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
 	print '</div>';
 }

require/class.Common.php

Spacing +118 added lines, -118 removed lines

@@ -14,12 +14,12 @@ 
 	* @param Array $headers header to submit with the form
 	* @return String the result
 	*/
-	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '', $sizelimit = false, $async = false) {
+	public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '', $sizelimit = false, $async = false) {
 		global $globalProxy, $globalForceIPv4;
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -29,7 +29,7 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLINFO_HEADER_OUT, true); 
-		curl_setopt($ch,CURLOPT_ENCODING , "gzip");
+		curl_setopt($ch, CURLOPT_ENCODING, "gzip");
 		//curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 //		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0');
 		if ($useragent == '') {
@@ -39,13 +39,13 @@ 
 		}
 		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
 		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
-		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
+		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common', "curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
 			if (is_array($data)) {
 				curl_setopt($ch, CURLOPT_POST, count($data));
 				$data_string = '';
-				foreach($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
+				foreach ($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
 				rtrim($data_string, '&');
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
 			} else {
@@ -57,7 +57,7 @@ 
 		}
 		if ($cookie != '') {
 			if (is_array($cookie)) {
-				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie,';'));
+				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie, ';'));
 			} else {
 				curl_setopt($ch, CURLOPT_COOKIE, $cookie);
 			}
@@ -68,7 +68,7 @@ 
 		if ($sizelimit === true) {
 			curl_setopt($ch, CURLOPT_BUFFERSIZE, 128);
 			curl_setopt($ch, CURLOPT_NOPROGRESS, false);
-			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curlr,$downloadsize, $downloaded, $uploadsize, $uploaded){
+			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curlr, $downloadsize, $downloaded, $uploadsize, $uploaded) {
 				return ($downloaded > (3*1024)) ? 1 : 0;
 			});
 		}
@@ -79,13 +79,13 @@ 
 		$result = curl_exec($ch);
 		$info = curl_getinfo($ch);
 		curl_close($ch);
-		if ($info['http_code'] == '503' && strstr($result,'DDoS protection by CloudFlare')) {
+		if ($info['http_code'] == '503' && strstr($result, 'DDoS protection by CloudFlare')) {
 			echo "Cloudflare Detected\n";
 			require_once(dirname(__FILE__).'/libs/cloudflare-bypass/libraries/cloudflareClass.php');
 			$useragent = UAgent::random();
 			cloudflare::useUserAgent($useragent);
 			if ($clearanceCookie = cloudflare::bypass($url)) {
-				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
+				return $this->getData($url, 'get', $data, $headers, $clearanceCookie, $referer, $timeout, $useragent);
 			}
 		} else {
 			return $result;
@@ -109,7 +109,7 @@ 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -124,20 +124,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);
@@ -145,19 +145,19 @@ 
 		}
 	}
 
-	public static function bunzip2($in_file,$out_file_name = '') {
+	public static function bunzip2($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('.bz2', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('bzopen')) $file = bzopen($in_file,'rb');
+			if (function_exists('bzopen')) $file = bzopen($in_file, 'rb');
 			else {
 				echo 'bzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!feof($file)) {
+			while (!feof($file)) {
 				fwrite($out_file, bzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -175,27 +175,27 @@ 
 		if ($data == '') return array();
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$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);
-			$tabledata[]=array_merge($td,$tdi);
+			$td = array_filter($td);
+			$tdi = array_filter($tdi);
+			$tabledata[] = array_merge($td, $tdi);
 		}
 		$html->clear();
 		unset($html);
@@ -210,8 +210,8 @@ 
 	public function text2array($data) {
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('p') as $element)
+		$tabledata = array();
+		foreach ($html->find('p') as $element)
 		{
 			$tabledata [] = trim($element->plaintext);
 		}
@@ -231,11 +231,11 @@ 
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
-		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
+		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc))) + cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon) - floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
-			return round($dist * 1.609344);
+			return round($dist*1.609344);
 		} elseif ($unit == "m") {
-			return round($dist * 1.609344 * 1000);
+			return round($dist*1.609344*1000);
 		} elseif ($unit == "mile" || $unit == "mi") {
 			return round($dist);
 		} elseif ($unit == "nm") {
@@ -252,8 +252,8 @@ 
 	* @param String $distance distance between two points in m
 	* @return Float plunge
 	*/
-	public function plunge($initial_altitude,$final_altitude,$distance) {
-		$plunge = rad2deg(asin(($final_altitude-$initial_altitude)/$distance));
+	public function plunge($initial_altitude, $final_altitude, $distance) {
+		$plunge = rad2deg(asin(($final_altitude - $initial_altitude)/$distance));
 		/*
 		$siter = 6378137.0 + $initial_altitude;
 		$planer = 6378137.0 + $final_altitude;
@@ -275,8 +275,8 @@ 
 	public function azimuth($lat, $lon, $latc, $lonc) {
 		$dX = $latc - $lat;
 		$dY = $lonc - $lon;
-		$azimuth = rad2deg(atan2($dY,$dX));
-		if ($azimuth < 0) return $azimuth+360;
+		$azimuth = rad2deg(atan2($dY, $dX));
+		if ($azimuth < 0) return $azimuth + 360;
 		return $azimuth;
 	}
 	
@@ -287,7 +287,7 @@ 
 	* @param float $distance distance covered
 	* @return whether distance is realistic
 	*/
-	public function withinThreshold ($timeDifference, $distance) {
+	public function withinThreshold($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
 		if ($x == 0 || $d == 0) return true;
@@ -303,13 +303,13 @@ 
 		return ($array !== array_values($array));
 	}
 
-	public function isInteger($input){
+	public function isInteger($input) {
 		//return(ctype_digit(strval($input)));
-		return preg_match('/^-?[0-9]+$/', (string)$input) ? true : false;
+		return preg_match('/^-?[0-9]+$/', (string) $input) ? true : false;
 	}
 
 
-	public function convertDec($dms,$latlong) {
+	public function convertDec($dms, $latlong) {
 		if ($latlong == 'latitude') {
 			$deg = substr($dms, 0, 2);
 			$min = substr($dms, 2, 4);
@@ -317,10 +317,10 @@ 
 			$deg = substr($dms, 0, 3);
 			$min = substr($dms, 3, 5);
 		}
-		return $deg+(($min*60)/3600);
+		return $deg + (($min*60)/3600);
 	}
 	
-	public function convertDM($coord,$latlong) {
+	public function convertDM($coord, $latlong) {
 		if ($latlong == 'latitude') {
 			if ($coord < 0) $NSEW = 'S';
 			else $NSEW = 'N';
@@ -330,9 +330,9 @@ 
 		}
 		$coord = abs($coord);
 		$deg = floor($coord);
-		$coord = ($coord-$deg)*60;
+		$coord = ($coord - $deg)*60;
 		$min = $coord;
-		return array('deg' => $deg,'min' => $min,'NSEW' => $NSEW);
+		return array('deg' => $deg, 'min' => $min, 'NSEW' => $NSEW);
 	}
 	
 	/**
@@ -344,8 +344,8 @@ 
 	public function xcopy($source, $dest)
 	{
 		$files = glob($source.'*.*');
-		foreach($files as $file){
-			$file_to_go = str_replace($source,$dest,$file);
+		foreach ($files as $file) {
+			$file_to_go = str_replace($source, $dest, $file);
 			copy($file, $file_to_go);
 		}
 		return true;
@@ -356,9 +356,9 @@ 
 	* @param	String $url url to check
 	* @return	bool Return true on succes false on failure
 	*/
-	public function urlexist($url){
-		$headers=get_headers($url);
-		return stripos($headers[0],"200 OK")?true:false;
+	public function urlexist($url) {
+		$headers = get_headers($url);
+		return stripos($headers[0], "200 OK") ?true:false;
 	}
 	
 	/**
@@ -369,7 +369,7 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for ($i = 0; $i < $hexln; $i += 2) $str .= chr(hexdec(substr($hex, $i, 2)));
 		return $str;
 	}
 	
@@ -379,7 +379,7 @@ 
 	* @return	String Return result
 	*/
 	public function hex2rgb($hex) {
-		$hex = str_replace('#','',$hex);
+		$hex = str_replace('#', '', $hex);
 		return sscanf($hex, "%02x%02x%02x"); 
 	}
 	
@@ -387,33 +387,33 @@ 
 		//difference in longitudinal coordinates
 		$dLon = deg2rad($lon2) - deg2rad($lon1);
 		//difference in the phi of latitudinal coordinates
-		$dPhi = log(tan(deg2rad($lat2) / 2 + M_PI / 4) / tan(deg2rad($lat1) / 2 + M_PI / 4));
+		$dPhi = log(tan(deg2rad($lat2)/2 + M_PI/4)/tan(deg2rad($lat1)/2 + M_PI/4));
 		//we need to recalculate $dLon if it is greater than pi
-		if(abs($dLon) > M_PI) {
-			if($dLon > 0) {
-				$dLon = (2 * M_PI - $dLon) * -1;
+		if (abs($dLon) > M_PI) {
+			if ($dLon > 0) {
+				$dLon = (2*M_PI - $dLon)*-1;
 			} else {
-				$dLon = 2 * M_PI + $dLon;
+				$dLon = 2*M_PI + $dLon;
 			}
 		}
 		//return the angle, normalized
-		return (rad2deg(atan2($dLon, $dPhi)) + 360) % 360;
+		return (rad2deg(atan2($dLon, $dPhi)) + 360)%360;
 	}
 
-	public function checkLine($lat1,$lon1,$lat2,$lon2,$lat3,$lon3,$approx = 0.15) {
+	public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.15) {
 		//$a = ($lon2-$lon1)*$lat3+($lat2-$lat1)*$lon3+($lat1*$lon2+$lat2*$lon1);
-		$a = -($lon2-$lon1);
+		$a = -($lon2 - $lon1);
 		$b = $lat2 - $lat1;
-		$c = -($a*$lat1+$b*$lon1);
-		$d = $a*$lat3+$b*$lon3+$c;
+		$c = -($a*$lat1 + $b*$lon1);
+		$d = $a*$lat3 + $b*$lon3 + $c;
 		if ($d > -$approx && $d < $approx) return true;
 		else return false;
 	}
 	
 	public function array_merge_noappend() {
 		$output = array();
-		foreach(func_get_args() as $array) {
-			foreach($array as $key => $value) {
+		foreach (func_get_args() as $array) {
+			foreach ($array as $key => $value) {
 				$output[$key] = isset($output[$key]) ?
 				array_merge($output[$key], $value) : $value;
 			}
@@ -477,7 +477,7 @@ 
 		return $result;
 	}
 
-	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = ''){
+	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = '') {
 		global $globalMapRefresh;
 		if ($seconds == '') {
 			$distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000;
@@ -488,27 +488,27 @@ 
 		$latitude = deg2rad($latitude);
 		$longitude = deg2rad($longitude);
 		$bearing = deg2rad($heading); 
-		$latitude2 =  asin( (sin($latitude) * cos($distance/$r)) + (cos($latitude) * sin($distance/$r) * cos($bearing)) );
-		$longitude2 = $longitude + atan2( sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r)-(sin($latitude)*sin($latitude2)) );
-		return array('latitude' => number_format(rad2deg($latitude2),5,'.',''),'longitude' => number_format(rad2deg($longitude2),5,'.',''));
+		$latitude2 = asin((sin($latitude)*cos($distance/$r)) + (cos($latitude)*sin($distance/$r)*cos($bearing)));
+		$longitude2 = $longitude + atan2(sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r) - (sin($latitude)*sin($latitude2)));
+		return array('latitude' => number_format(rad2deg($latitude2), 5, '.', ''), 'longitude' => number_format(rad2deg($longitude2), 5, '.', ''));
 	}
 	
-	public function getCoordfromDistanceBearing($latitude,$longitude,$bearing,$distance) {
+	public function getCoordfromDistanceBearing($latitude, $longitude, $bearing, $distance) {
 		// distance in meter
 		$R = 6378.14;
-		$latitude1 = $latitude * (M_PI/180);
-		$longitude1 = $longitude * (M_PI/180);
-		$brng = $bearing * (M_PI/180);
+		$latitude1 = $latitude*(M_PI/180);
+		$longitude1 = $longitude*(M_PI/180);
+		$brng = $bearing*(M_PI/180);
 		$d = $distance;
 
 		$latitude2 = asin(sin($latitude1)*cos($d/$R) + cos($latitude1)*sin($d/$R)*cos($brng));
-		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1),cos($d/$R)-sin($latitude1)*sin($latitude2));
+		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1), cos($d/$R) - sin($latitude1)*sin($latitude2));
 
-		$latitude2 = $latitude2 * (180/M_PI);
-		$longitude2 = $longitude2 * (180/M_PI);
+		$latitude2 = $latitude2*(180/M_PI);
+		$longitude2 = $longitude2*(180/M_PI);
 
-		$flat = round ($latitude2,6);
-		$flong = round ($longitude2,6);
+		$flat = round($latitude2, 6);
+		$flong = round($longitude2, 6);
 /*
 		$dx = $distance*cos($bearing);
 		$dy = $distance*sin($bearing);
@@ -517,7 +517,7 @@ 
 		$flong = $longitude + $dlong;
 		$flat = $latitude + $dlat;
 */
-		return array('latitude' => $flat,'longitude' => $flong);
+		return array('latitude' => $flat, 'longitude' => $flong);
 	}
 
 	/**
@@ -531,14 +531,14 @@ 
 	 * @param integer $level GZIP compression level (default: 9)
 	 * @return string New filename (with .gz appended) if success, or false if operation fails
 	 */
-	public function gzCompressFile($source, $level = 9){ 
-		$dest = $source . '.gz'; 
-		$mode = 'wb' . $level; 
+	public function gzCompressFile($source, $level = 9) { 
+		$dest = $source.'.gz'; 
+		$mode = 'wb'.$level; 
 		$error = false; 
 		if ($fp_out = gzopen($dest, $mode)) { 
-			if ($fp_in = fopen($source,'rb')) { 
+			if ($fp_in = fopen($source, 'rb')) { 
 				while (!feof($fp_in)) 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512)); 
+					gzwrite($fp_out, fread($fp_in, 1024*512)); 
 				fclose($fp_in); 
 			} else {
 				$error = true; 
@@ -554,7 +554,7 @@ 
 	} 
 	
 	public function remove_accents($string) {
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
+		if (!preg_match('/[\x80-\xff]/', $string)) return $string;
 		$chars = array(
 		    // Decompositions for Latin-1 Supplement
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
@@ -611,7 +611,7 @@ 
 		    chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
 		    chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
 		    chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		    chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+		    chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
 		    chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
 		    chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
 		    chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
@@ -627,13 +627,13 @@ 
 		    chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
 		    chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
 		    chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		    chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		    chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		    chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		    chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		    chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		    chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		    chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+		    chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
+		    chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
+		    chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
+		    chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
+		    chr(197).chr(154) => 'S', chr(197).chr(155) => 's',
+		    chr(197).chr(156) => 'S', chr(197).chr(157) => 's',
+		    chr(197).chr(158) => 'S', chr(197).chr(159) => 's',
 		    chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
 		    chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
 		    chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
@@ -667,7 +667,7 @@ 
 		for ($i = 0, $int = '', $concat_flag = true; $i < $length; $i++) {
 			if (is_numeric($string[$i]) && $concat_flag) {
 				$int .= $string[$i];
-			} elseif(!$concat && $concat_flag && strlen($int) > 0) {
+			} elseif (!$concat && $concat_flag && strlen($int) > 0) {
 				$concat_flag = false;
 			}
 		}
@@ -713,7 +713,7 @@ 
 			$slice = array_slice($arr, $offset + 1, $length);
 			return implode("", $slice);
 		} else {
-			return mb_substr($string,$offset,$length,'UTF-8');
+			return mb_substr($string, $offset, $length, 'UTF-8');
 		}
 	}
 
@@ -723,14 +723,14 @@ 
 		//NOTE: use a trailing slash for folders!!!
 		//see http://bugs.php.net/bug.php?id=27609
 		//see http://bugs.php.net/bug.php?id=30931
-		if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
+		if ($path{strlen($path) - 1} == '/') // recursively return a temporary file path
 			return $this->is__writable($path.uniqid(mt_rand()).'.tmp');
 		else if (is_dir($path))
 			return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
 		// check tmp file for read/write capabilities
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
-		if ($f===false)
+		if ($f === false)
 			return false;
 		fclose($f);
 		if (!$rm)
@@ -749,29 +749,29 @@ 
 	 * @param Integer $offset Controls the likelyhood that lines will be split which cross the dateline
 	 * @return Array Coordinate of the route
 	*/
-	public function greatcircle($begin_lat,$begin_lon,$end_lat,$end_lon,$nbpts = 20, $offset = 10) {
-		if ($nbpts <= 2) return array(array($begin_lon,$begin_lat),array($end_lon,$end_lat));
+	public function greatcircle($begin_lat, $begin_lon, $end_lat, $end_lon, $nbpts = 20, $offset = 10) {
+		if ($nbpts <= 2) return array(array($begin_lon, $begin_lat), array($end_lon, $end_lat));
 		$sx = deg2rad($begin_lon);
 		$sy = deg2rad($begin_lat);
 		$ex = deg2rad($end_lon);
 		$ey = deg2rad($end_lat);
 		$w = $sx - $ex;
 		$h = $sy - $ey;
-		$z = pow(sin($h/2.0),2) + cos($sy)*cos($ey)*pow(sin($w/2.0),2);
+		$z = pow(sin($h/2.0), 2) + cos($sy)*cos($ey)*pow(sin($w/2.0), 2);
 		$g = 2.0*asin(sqrt($z));
-		if ($g == M_PI || is_nan($g)) return array(array($begin_lon,$begin_lat),array($end_lon,$end_lat));
+		if ($g == M_PI || is_nan($g)) return array(array($begin_lon, $begin_lat), array($end_lon, $end_lat));
 		$first_pass = array();
-		$delta = 1.0/($nbpts-1);
-		for ($i =0; $i < $nbpts; ++$i) {
+		$delta = 1.0/($nbpts - 1);
+		for ($i = 0; $i < $nbpts; ++$i) {
 			$step = $delta*$i;
-			$A = sin((1 - $step) * $g) / sin($g);
-			$B = sin($step * $g) / sin($g);
-			$x = $A * cos($sy) * cos($sx) + $B * cos($ey) * cos($ex);
-			$y = $A * cos($sy) * sin($sx) + $B * cos($ey) * sin($ex);
-			$z = $A * sin($sy) + $B * sin($ey);
+			$A = sin((1 - $step)*$g)/sin($g);
+			$B = sin($step*$g)/sin($g);
+			$x = $A*cos($sy)*cos($sx) + $B*cos($ey)*cos($ex);
+			$y = $A*cos($sy)*sin($sx) + $B*cos($ey)*sin($ex);
+			$z = $A*sin($sy) + $B*sin($ey);
 			$lat = rad2deg(atan2($z, sqrt(pow($x, 2) + pow($y, 2))));
 			$lon = rad2deg(atan2($y, $x));
-			$first_pass[] = array($lon,$lat);
+			$first_pass[] = array($lon, $lat);
 		}
 		$bHasBigDiff = false;
 		$dfMaxSmallDiffLong = 0;
@@ -786,7 +786,7 @@ 
 		// https://github.com/OSGeo/gdal/blob/7bfb9c452a59aac958bff0c8386b891edf8154ca/gdal/ogr/ogrgeometryfactory.cpp#L2342
 		$first_pass_ln = count($first_pass);
 		for ($j = 1; $j < $first_pass_ln; ++$j) {
-			$dfPrevX = $first_pass[$j-1][0];
+			$dfPrevX = $first_pass[$j - 1][0];
 			$dfX = $first_pass[$j][0];
 			$dfDiffLong = abs($dfX - $dfPrevX);
 			if ($dfDiffLong > $dfDiffSpace &&
@@ -804,14 +804,14 @@ 
 			//$poMulti[] = $poNewLS;
 			for ($k = 0; $k < $first_pass_ln; ++$k) {
 				$dfX0 = floatval($first_pass[$k][0]);
-				if ($k > 0 &&  abs($dfX0 - $first_pass[$k-1][0]) > $dfDiffSpace) {
-					$dfX1 = floatval($first_pass[$k-1][0]);
-					$dfY1 = floatval($first_pass[$k-1][1]);
+				if ($k > 0 && abs($dfX0 - $first_pass[$k - 1][0]) > $dfDiffSpace) {
+					$dfX1 = floatval($first_pass[$k - 1][0]);
+					$dfY1 = floatval($first_pass[$k - 1][1]);
 					$dfX2 = floatval($first_pass[$k][0]);
 					$dfY2 = floatval($first_pass[$k][1]);
 					if ($dfX1 > -180 && $dfX1 < $dfRightBorderX && $dfX2 == 180 &&
-					    $k+1 < count($first_pass) &&
-					    $first_pass[$k-1][0] > -180 && $first_pass[$k-1][0] < $dfRightBorderX)
+					    $k + 1 < count($first_pass) &&
+					    $first_pass[$k - 1][0] > -180 && $first_pass[$k - 1][0] < $dfRightBorderX)
 					{
 						$poNewLS[] = array(-180, $first_pass[$k][1]);
 						$k++;
@@ -819,8 +819,8 @@ 
 						$poNewLS[] = array($first_pass[$k][0], $first_pass[$k][1]);
 						continue;
 					} else if ($dfX1 > $dfLeftBorderX && $dfX1 < 180 && $dfX2 == -180 &&
-					    $k+1 < $first_pass_ln &&
-					    $first_pass[$k-1][0] > $dfLeftBorderX && $first_pass[$k-1][0] < 180)
+					    $k + 1 < $first_pass_ln &&
+					    $first_pass[$k - 1][0] > $dfLeftBorderX && $first_pass[$k - 1][0] < 180)
 					{
 						$poNewLS[] = array(180, $first_pass[$k][1]);
 						$k++;
@@ -843,12 +843,12 @@ 
 					}
 					if ($dfX1 <= 180 && $dfX2 >= 180 && $dfX1 < $dfX2)
 					{
-						$dfRatio = (180 - $dfX1) / ($dfX2 - $dfX1);
-						$dfY = $dfRatio * $dfY2 + (1 - $dfRatio) * $dfY1;
-						$poNewLS[] = array($first_pass[$k-1][0] > $dfLeftBorderX ? 180 : -180, $dfY);
+						$dfRatio = (180 - $dfX1)/($dfX2 - $dfX1);
+						$dfY = $dfRatio*$dfY2 + (1 - $dfRatio)*$dfY1;
+						$poNewLS[] = array($first_pass[$k - 1][0] > $dfLeftBorderX ? 180 : -180, $dfY);
 						$poMulti[] = $poNewLS;
 						$poNewLS = array();
-						$poNewLS[] = array($first_pass[$k-1][0] > $dfLeftBorderX ? -180 : 180, $dfY);
+						$poNewLS[] = array($first_pass[$k - 1][0] > $dfLeftBorderX ? -180 : 180, $dfY);
 						//$poMulti[] = $poNewLS;
 					} else {
 						//$poNewLS[] = array();
@@ -866,7 +866,7 @@ 
 			$poNewLS0 = array();
 			//$poMulti[] = $poNewLS0;
 			for ($l = 0; $l < $first_pass_ln; ++$l) {
-				$poNewLS0[] = array($first_pass[$l][0],$first_pass[$l][1]);
+				$poNewLS0[] = array($first_pass[$l][0], $first_pass[$l][1]);
 			}
 			$poMulti[] = $poNewLS0;
 		}

install/index.php

Spacing +287 added lines, -287 removed lines

@@ -22,7 +22,7 @@ 
 require_once(dirname(__FILE__).'/class.create_db.php');
 require_once(dirname(__FILE__).'/class.update_schema.php');
 require_once(dirname(__FILE__).'/class.settings.php');
-$title="Install";
+$title = "Install";
 require(dirname(__FILE__).'/../require/settings.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
 require(dirname(__FILE__).'/header.php');
@@ -93,8 +93,8 @@ 
 	if (!extension_loaded('curl')) {
 		$error[] = "Curl is not loaded.";
 	}
-	if(function_exists('apache_get_modules') ){
-		if(!in_array('mod_rewrite',apache_get_modules())) {
+	if (function_exists('apache_get_modules')) {
+		if (!in_array('mod_rewrite', apache_get_modules())) {
 			$error[] = "mod_rewrite is not available.";
 		}
 	/*
@@ -111,12 +111,12 @@ 
 	if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
 		if (function_exists('get_headers')) {
 			//$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'search',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
-			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'live/geojson?test',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
-			if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
+			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/', 'install'), 'live/geojson?test', str_replace('index.php', '', $_SERVER["REQUEST_URI"])));
+			if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
 				print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>';
 			} else {
-				$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'search',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
-				if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
+				$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/', 'install'), 'search', str_replace('index.php', '', $_SERVER["REQUEST_URI"])));
+				if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
 					print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>';
 				}
 			}
@@ -196,7 +196,7 @@ 
 				    if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
 					if (isset($_SERVER['REQUEST_URI'])) {
 						$URL = $_SERVER['REQUEST_URI'];
-						$globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL)));
+						$globalURL = str_replace('/install', '', str_replace('/install/', '', str_replace('/install/index.php', '', $URL)));
 					}
 				    }
 				?>
@@ -519,13 +519,13 @@ 
 ?>
 							<tr>
 								<?php
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
 								?>
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
 								<?php
 								    } else {
-									$hostport = explode(':',$source['host']);
+									$hostport = explode(':', $source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
 										$port = $hostport[1];
@@ -575,7 +575,7 @@ 
 									<select name="timezones[]" id="timezones">
 								<?php
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
-									foreach($timezonelist as $timezones){
+									foreach ($timezonelist as $timezones) {
 										if (isset($source['timezone']) && $source['timezone'] == $timezones) {
 											print '<option selected>'.$timezones.'</option>';
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
@@ -630,7 +630,7 @@ 
 									<select name="timezones[]" id="timezones">
 								<?php
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
-									foreach($timezonelist as $timezones){
+									foreach ($timezonelist as $timezones) {
 										if ($timezones == 'UTC') {
 											print '<option selected>'.$timezones.'</option>';
 										} else print '<option>'.$timezones.'</option>';
@@ -1089,7 +1089,7 @@ 
 			<br />
 			<p>
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
 			</p>
 			<br />
 			<p>
@@ -1151,14 +1151,14 @@ 
 $error = '';
 
 if (isset($_POST['dbtype'])) {
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
 
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -1178,49 +1178,49 @@ 
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
 	*/
 	
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
 
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
 
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
-	$openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING);
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey));
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
+	$openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING);
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey));
 	
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
 
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
 
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
 
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
 	if ($acars == 'acars') {
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
 	}
 
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
 	
 	$source_name = $_POST['source_name'];
 	$source_latitude = $_POST['source_latitude'];
@@ -1234,8 +1234,8 @@ 
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    if (isset($source_id[$keys])) $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'id' => $source_id[$keys], 'source' => $source_ref[$keys]);
+	    else $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'source' => $source_ref[$keys]);
 	}
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
@@ -1244,16 +1244,16 @@ 
 	$newstype = $_POST['newstype'];
 	
 	$newsfeeds = array();
-	foreach($newsurl as $newskey => $url) {
+	foreach ($newsurl as $newskey => $url) {
 	    if ($url != '') {
 		$type = $newstype[$newskey];
 		$lng = $newslng[$newskey];
 		if (isset($newsfeeds[$type][$lng])) {
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
+		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng], array($url));
 		} else $newsfeeds[$type][$lng] = array($url);
 	    }
 	}
-	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
+	$settings = array_merge($settings, array('globalNewsFeeds' => $newsfeeds));
 
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
@@ -1264,27 +1264,27 @@ 
 	$sbsurl = $_POST['sbsurl'];
 	*/
 
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
-	$globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING);
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
+	$globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING);
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
 
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
-	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
+	$globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING);
+	if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalSatellite' => 'FALSE'));
 
 /*	
 	$globalSBS1Hosts = array();
@@ -1300,7 +1300,7 @@ 
 	}
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
 */
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
 	$host = $_POST['host'];
 	$port = $_POST['port'];
 	$name = $_POST['name'];
@@ -1317,115 +1317,115 @@ 
 		else $cov = 'FALSE';
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
 		else $arch = 'FALSE';
-		if (strpos($format[$key],'_callback')) {
-			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
+		if (strpos($format[$key], '_callback')) {
+			$gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE');
 		} elseif ($h != '' || $name[$key] != '') {
-			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
+			$gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE');
 		}
 		if ($format[$key] == 'airwhere') $forcepilots = true;
 	}
-	$settings = array_merge($settings,array('globalSources' => $gSources));
+	$settings = array_merge($settings, array('globalSources' => $gSources));
 
 /*
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
 */
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
 
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
 
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
 
-	$map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile));
+	$map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile));
 
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
 
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
 
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
-	$minfetch = filter_input(INPUT_POST,'minfetch',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMinFetch' => $minfetch));
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
+	$minfetch = filter_input(INPUT_POST, 'minfetch', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMinFetch' => $minfetch));
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
 
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
 
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
 	
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
 	if ($archiveyear == "archiveyear") {
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
 	}
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
 
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
 
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
 
 	// Create in settings.php keys not yet configurable if not already here
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
 
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
 	if ($resetyearstats == 'resetyearstats') {
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
 	}
 
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
 	if ($archive == 'archive') {
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
 	}
-	$archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING);
+	$archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING);
 	if ($archiveresults == 'archiveresults') {
-		$settings = array_merge($settings,array('globalArchiveResults' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchiveResults' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchiveResults' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchiveResults' => 'FALSE'));
 	}
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
 	if ($daemon == 'daemon') {
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
 	}
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
 	if ($schedules == 'schedules') {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
 	}
 
 /*
@@ -1436,280 +1436,280 @@ 
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
 	}
 */
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
 	$va = false;
 	if ($globalivao == 'ivao') {
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
 	if ($globalvatsim == 'vatsim') {
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
 	if ($globalphpvms == 'phpvms') {
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
 	if ($globalvam == 'vam') {
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
 	if ($va) {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
 	if ($globalva == 'va' || $va) {
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
-		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
+		$settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
 	} else {
-		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVA' => 'FALSE'));
+		if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
+		else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE'));
 	}
 	
 	
-	$mapoffline = filter_input(INPUT_POST,'mapoffline',FILTER_SANITIZE_STRING);
+	$mapoffline = filter_input(INPUT_POST, 'mapoffline', FILTER_SANITIZE_STRING);
 	if ($mapoffline == 'mapoffline') {
-		$settings = array_merge($settings,array('globalMapOffline' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapOffline' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapOffline' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapOffline' => 'FALSE'));
 	}
-	$globaloffline = filter_input(INPUT_POST,'globaloffline',FILTER_SANITIZE_STRING);
+	$globaloffline = filter_input(INPUT_POST, 'globaloffline', FILTER_SANITIZE_STRING);
 	if ($globaloffline == 'globaloffline') {
-		$settings = array_merge($settings,array('globalOffline' => 'TRUE'));
+		$settings = array_merge($settings, array('globalOffline' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalOffline' => 'FALSE'));
+		$settings = array_merge($settings, array('globalOffline' => 'FALSE'));
 	}
 
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
 	if ($notam == 'notam') {
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
 	}
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
 	if ($owner == 'owner') {
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
 	}
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
 	if ($map3d == 'map3d') {
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
 	}
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
 	if ($crash == 'crash') {
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
 	}
-	$fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING);
+	$fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING);
 	if ($fires == 'fires') {
-		$settings = array_merge($settings,array('globalMapFires' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapFires' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapFires' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapFires' => 'FALSE'));
 	}
-	$firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING);
+	$firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING);
 	if ($firessupport == 'firessupport') {
-		$settings = array_merge($settings,array('globalFires' => 'TRUE'));
+		$settings = array_merge($settings, array('globalFires' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalFires' => 'FALSE'));
+		$settings = array_merge($settings, array('globalFires' => 'FALSE'));
 	}
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
 	if ($mapsatellites == 'mapsatellites') {
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
 	}
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
 	if ($map3ddefault == 'map3ddefault') {
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
 	}
-	$one3dmodel = filter_input(INPUT_POST,'one3dmodel',FILTER_SANITIZE_STRING);
+	$one3dmodel = filter_input(INPUT_POST, 'one3dmodel', FILTER_SANITIZE_STRING);
 	if ($one3dmodel == 'one3dmodel') {
-		$settings = array_merge($settings,array('globalMap3DOneModel' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3DOneModel' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3DOneModel' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3DOneModel' => 'FALSE'));
 	}
-	$map3dliveries = filter_input(INPUT_POST,'map3dliveries',FILTER_SANITIZE_STRING);
+	$map3dliveries = filter_input(INPUT_POST, 'map3dliveries', FILTER_SANITIZE_STRING);
 	if ($map3dliveries == 'map3dliveries') {
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'FALSE'));
 	}
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
 	if ($translate == 'translate') {
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
 	}
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
 	if ($realairlines == 'realairlines') {
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
 	}
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
 	if ($estimation == 'estimation') {
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
 	}
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
 	if ($metar == 'metar') {
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
 	}
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
 	if ($metarcycle == 'metarcycle') {
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
 	}
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
 	if ($fork == 'fork') {
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
 	}
 
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
 	if ($colormap == 'colormap') {
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
 	}
 	
 	if (isset($_POST['aircrafticoncolor'])) {
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
 	}
 
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
 
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
 
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
 	if ($mappopup == 'mappopup') {
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
 	}
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
 	if ($airportpopup == 'airportpopup') {
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
 	}
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
 	if ($maphistory == 'maphistory') {
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
 	}
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
 	if ($maptooltip == 'maptooltip') {
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapTooltip' => 'FALSE'));
 	}
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
 	if ($flightroute == 'flightroute') {
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
 	}
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
 	if ($flightremainingroute == 'flightremainingroute') {
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
 	}
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
 	if ($allflights == 'allflights') {
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
 	}
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
 	if ($bbox == 'bbox') {
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
 	}
-	$groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING);
+	$groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING);
 	if ($groundaltitude == 'groundaltitude') {
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE'));
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE'));
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE'));
 	}
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
 	if ($waypoints == 'waypoints') {
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
 	}
-	$geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING);
+	$geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING);
 	if ($geoid == 'geoid') {
-		$settings = array_merge($settings,array('globalGeoid' => 'TRUE'));
+		$settings = array_merge($settings, array('globalGeoid' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalGeoid' => 'FALSE'));
+		$settings = array_merge($settings, array('globalGeoid' => 'FALSE'));
 	}
-	$geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalGeoidSource' => $geoid_source));
+	$geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalGeoidSource' => $geoid_source));
 
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
 	if ($noairlines == 'noairlines') {
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
 	}
 
-	$tsk = filter_input(INPUT_POST,'tsk',FILTER_SANITIZE_STRING);
+	$tsk = filter_input(INPUT_POST, 'tsk', FILTER_SANITIZE_STRING);
 	if ($tsk == 'tsk') {
-		$settings = array_merge($settings,array('globalTSK' => 'TRUE'));
+		$settings = array_merge($settings, array('globalTSK' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalTSK' => 'FALSE'));
+		$settings = array_merge($settings, array('globalTSK' => 'FALSE'));
 	}
-	$mapmatching = filter_input(INPUT_POST,'mapmatching',FILTER_SANITIZE_STRING);
+	$mapmatching = filter_input(INPUT_POST, 'mapmatching', FILTER_SANITIZE_STRING);
 	if ($mapmatching == 'mapmatching') {
-		$settings = array_merge($settings,array('globalMapMatching' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapMatching' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapMatching' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapMatching' => 'FALSE'));
 	}
-	$mapmatchingsource = filter_input(INPUT_POST,'mapmatchingsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMapMatchingSource' => $mapmatchingsource));
-	$graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper));
+	$mapmatchingsource = filter_input(INPUT_POST, 'mapmatchingsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMapMatchingSource' => $mapmatchingsource));
+	$graphhopper = filter_input(INPUT_POST, 'graphhopper', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalGraphHopperKey' => $graphhopper));
 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
 	}
 
 	if (!isset($globalSchedulesSources)) {
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
     	}
 
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
 
 	if ($error == '') settings::modify_settings($settings);
 	if ($error == '') settings::comment_settings($settings_comment);

index.php

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
 require_once('require/class.Language.php');
 require_once('require/class.Satellite.php');
 
-$trackident = filter_input(INPUT_GET,'trackid',FILTER_SANITIZE_STRING);
+$trackident = filter_input(INPUT_GET, 'trackid', FILTER_SANITIZE_STRING);
 if ($trackident != '') {
 	require_once('require/class.SpotterLive.php');
 	$SpotterLive = new SpotterLive();
@@ -14,7 +14,7 @@ 
 		$spotterid = $Spotter->getSpotterIDBasedOnFlightAwareID($trackident);
 		header('Location: '.$globalURL.'/flightid/'.$spotterid);
 	} else {
-		setcookie('MapTrack',$resulttrackident[0]['flightaware_id']);
+		setcookie('MapTrack', $resulttrackident[0]['flightaware_id']);
 	}
 } else {
 	unset($_COOKIE['MapTrack']);
@@ -195,7 +195,7 @@ 
 		        <div class="form-group">
 			    <label>From (UTC):</label>
 		            <div class='input-group date' id='datetimepicker1'>
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a", $_COOKIE['archive_begin']); ?>" required />
 		                <span class="input-group-addon">
             			    <span class="glyphicon glyphicon-calendar"></span>
 		                </span>
@@ -204,7 +204,7 @@ 
 		        <div class="form-group">
 			    <label>To (UTC):</label>
 		            <div class='input-group date' id='datetimepicker2'>
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" />
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a", $_COOKIE['archive_end']); ?>" />
             			<span class="input-group-addon">
 		                    <span class="glyphicon glyphicon-calendar"></span>
             			</span>
@@ -348,9 +348,9 @@ 
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
 			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
-			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option>
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected'; ?>>ellipsoid</option>
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected'; ?>>vr terrain</option>
+			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected'; ?>>ArticDEM</option>
 			</select>
 		    </li>
 <?php
@@ -398,7 +398,7 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="one3dmodel" value="1" onclick="useOne3Dmodel(this)" <?php if ((isset($_COOKIE['one3dmodel']) && $_COOKIE['one3dmodel'] == 'true') || (!isset($_COOKIE['one3dmodel']) && isset($globalMap3DOneModel) && $globalMap3DOneModel)) print 'checked'; ?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li>
 <?php
     }
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
+    if (time() > mktime(0, 0, 0, 12, 1, date("Y")) && time() < mktime(0, 0, 0, 12, 31, date("Y"))) {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
 <?php
@@ -575,10 +575,10 @@ 
 					$Spotter = new Spotter();
 					$allairlinenames = $Spotter->getAllAirlineNames();
 				}
-				foreach($allairlinenames as $airline) {
+				foreach ($allairlinenames as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
-					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
+					if (strlen($airline_name) > 30) $airline_name = substr($airline_name, 0, 30).'...';
+					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'], explode(',', $_COOKIE['filter_Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
@@ -597,7 +597,7 @@ 
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
 			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
 			    <?php
-				foreach($allalliancenames as $alliance) {
+				foreach ($allalliancenames as $alliance) {
 					$alliance_name = $alliance['alliance'];
 					if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] == $alliance_name) {
 						echo '<option value="'.$alliance_name.'" selected>'.$alliance_name.'</option>';
@@ -633,8 +633,8 @@ 
 				*/
 				$Source = new Source();
 				$datasource = $Source->getLocationInfoByType('gs');
-				foreach($datasource as $src) {
-					if (isset($_COOKIE['filter_Sources']) && in_array($src['name'],explode(',',$_COOKIE['filter_Sources']))) {
+				foreach ($datasource as $src) {
+					if (isset($_COOKIE['filter_Sources']) && in_array($src['name'], explode(',', $_COOKIE['filter_Sources']))) {
 						echo '<option value="'.$src['name'].'" selected>'.$src['name'].'</option>';
 					} else {
 						echo '<option value="'.$src['name'].'">'.$src['name'].'</option>';
@@ -722,7 +722,7 @@ 
 					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
 					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
 					
-					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
+					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'], explode(',', $_COOKIE['sattypes']))) {
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';
 					} else {
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';

live-czml.php

Spacing +65 added lines, -65 removed lines

@@ -59,11 +59,11 @@ 
     $s3 = sin($bank/2);
     $c1c2 = $c1*$c2;
     $s1s2 = $s1*$s2;
-    $w =$c1c2*$c3 - $s1s2*$s3;
-    $x =$c1c2*$s3 + $s1s2*$c3;
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
+    $w = $c1c2*$c3 - $s1s2*$s3;
+    $x = $c1c2*$s3 + $s1s2*$c3;
+    $y = $s1*$c2*$c3 + $c1*$s2*$s3;
+    $z = $c1*$s2*$c3 - $s1*$c2*$s3;
+    return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w);
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
 
 }
@@ -84,17 +84,17 @@ 
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
 /*
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -141,12 +141,12 @@ 
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
 } elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) {
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
@@ -156,46 +156,46 @@ 
 	$begindate = $_COOKIE['archive_begin'];
 	$enddate = $_COOKIE['archive_end'];
 
-	$archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
+	$archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
 //	echo 'Begin : '.$begindate.' - End : '.$enddate."\n";
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 } elseif ($tracker) {
 	$coord = array();
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
-		$coord = explode(',',$_GET['coord']);
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+		$coord = explode(',', $_GET['coord']);
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
-	$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord,$filter,true);
+	$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord, $filter, true);
 } elseif ($marine) {
 	$coord = array();
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
-		$coord = explode(',',$_GET['coord']);
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+		$coord = explode(',', $_GET['coord']);
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
-	$spotter_array = $MarineLive->getMinLastLiveMarineData($coord,$filter,true);
+	$spotter_array = $MarineLive->getMinLastLiveMarineData($coord, $filter, true);
 } else {
 	$coord = array();
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
-		$coord = explode(',',$_GET['coord']);
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+		$coord = explode(',', $_GET['coord']);
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
-	$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,true);
+	$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, true);
 }
 //print_r($spotter_array);
 if (!empty($spotter_array) && isset($coord)) {
 	if (isset($_GET['archive'])) {
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	} elseif ($tracker) {
 		$flightcnt = $TrackerLive->getLiveTrackerCount($filter);
 	} elseif ($marine) {
@@ -206,15 +206,15 @@ 
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 $minitime = time();
 $maxitime = 0;
-$lastupdate = filter_input(INPUT_GET,'update',FILTER_SANITIZE_NUMBER_INT);
+$lastupdate = filter_input(INPUT_GET, 'update', FILTER_SANITIZE_NUMBER_INT);
 $modelsdb = array();
 if (file_exists(dirname(__FILE__).'/models/modelsdb')) {
-	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb','r')) !== FALSE) {
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
-			if (isset($row[1]) ){
+	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb', 'r')) !== FALSE) {
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
+			if (isset($row[1])) {
 				$model = $row[0];
 				$modelsdb[$model] = $row[1];
 			}
@@ -224,9 +224,9 @@ 
 }
 $modelsdb2 = array();
 if (file_exists(dirname(__FILE__).'/models/gltf2/modelsdb')) {
-	if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb','r')) !== FALSE) {
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
-			if (isset($row[1]) ){
+	if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb', 'r')) !== FALSE) {
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
+			if (isset($row[1])) {
 				$model = $row[0];
 				$modelsdb2[$model] = $row[1];
 			}
@@ -264,7 +264,7 @@ 
 if (!empty($spotter_array) && is_array($spotter_array))
 {
 	$nblatlong = 0;
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$j++;
 		//if (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'airwhere') $heightrelative = 'RELATIVE_TO_GROUND';
@@ -306,9 +306,9 @@ 
 			$output .= '"lastupdate": "'.$lastupdate.'",';
 			if (isset($spotter_item['format_source'])) $output .= '"format": "'.$spotter_item['format_source'].'",';
 			if ($tracker) {
-				$output.= '"type": "tracker"';
+				$output .= '"type": "tracker"';
 			} elseif ($marine) {
-				$output.= '"type": "marine"';
+				$output .= '"type": "marine"';
 			} else {
 				if ($one3dmodel === false && isset($globalMap3DLiveries) && $globalMap3DLiveries) {
 					$aircraft_icao = $spotter_item['aircraft_icao'];
@@ -322,14 +322,14 @@ 
 						if (isset($airline_icao)) {
 							$imagefile = $aircraft_icao.'-'.$airline_icao.'.png';
 							if (file_exists(dirname(__FILE__).'/models/gltf2/liveries/'.$imagefile)) {
-								$output.= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
+								$output .= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
 							}
 						}
 					}
-					if ($ident != '') $output.= '"ident": "'.$ident.'",';
+					if ($ident != '') $output .= '"ident": "'.$ident.'",';
 				}
-				$output.= '"gltf2": %gltf2%,';
-				$output.= '"type": "flight"';
+				$output .= '"gltf2": %gltf2%,';
+				$output .= '"type": "flight"';
 			}
 			$output .= '},';
 
@@ -682,8 +682,8 @@ 
 					$output .= '},';
 				}
 			}
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
-			else $output = str_replace('%onground%','false',$output);
+			if (isset($onground) && $onground) $output = str_replace('%onground%', 'true', $output);
+			else $output = str_replace('%onground%', 'false', $output);
 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
 			//$output .= '"heightReference": "'.$heightrelative.'",';
@@ -698,7 +698,7 @@ 
 			$output .= '"cartographicDegrees": [';
 			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
-			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$output .= '"'.date("c", strtotime($spotter_item['date'])).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'];
 			$prevlong = $spotter_item['longitude'];
@@ -726,8 +726,8 @@ 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 			//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 		} else {
-			$nblatlong = $nblatlong+1;
-			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$nblatlong = $nblatlong + 1;
+			$output .= ',"'.date("c", strtotime($spotter_item['date'])).'", ';
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
 			if ($spotter_item['ground_speed'] == 0) {
 				$output .= $prevlong.', ';
@@ -767,17 +767,17 @@ 
 }
 $output .= ']';
 if (isset($globalArchive) && $globalArchive === TRUE) {
-	if ((time()-$globalLiveInterval) > $minitime) {
-		if (time()-$globalLiveInterval > $maxitime) {
-			$output = str_replace('%minitime%',date("c",$maxitime),$output);
+	if ((time() - $globalLiveInterval) > $minitime) {
+		if (time() - $globalLiveInterval > $maxitime) {
+			$output = str_replace('%minitime%', date("c", $maxitime), $output);
 		} else {
-			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
+			$output = str_replace('%minitime%', date("c", time() - $globalLiveInterval), $output);
 		}
 	}
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
-$output = str_replace('%maxitime%',date("c",$maxitime),$output);
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
-else $output = str_replace('%gltf2%','false',$output);
+	else $output = str_replace('%minitime%', date("c", $minitime), $output);
+} else $output = str_replace('%minitime%', date("c", $minitime), $output);
+$output = str_replace('%maxitime%', date("c", $maxitime), $output);
+if ($gltf2) $output = str_replace('%gltf2%', 'true', $output);
+else $output = str_replace('%gltf2%', 'false', $output);
 print $output;
 ?>