Ysurac / FlightAirMap

install/class.create_db.php

Doc Comments +4 added lines

@@ -3,6 +3,10 @@
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 
 class create_db {
+
+	/**
+	 * @param string $filename
+	 */
 	public static function import_file($filename) {
 		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
 		$Connection = new Connection();

Indentation +20 added lines, -20 removed lines

@@ -6,27 +6,27 @@ 
 	public static function import_file($filename) {
 		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
 		$Connection = new Connection();
-                //Connection::$db->beginTransaction();
-                 $templine = '';
-                 $lines = file($filename);
-                 foreach ($lines as $line)
-                 {
-                	if (substr($line,0,2) == '--' || $line == '') continue;
-                	$templine .= $line;
-                	if (substr(trim($line), -1,1) == ';')
-                	{
-                		try {
-                			$sth = $Connection->db->prepare($templine);
+				//Connection::$db->beginTransaction();
+				 $templine = '';
+				 $lines = file($filename);
+				 foreach ($lines as $line)
+				 {
+					if (substr($line,0,2) == '--' || $line == '') continue;
+					$templine .= $line;
+					if (substr(trim($line), -1,1) == ';')
+					{
+						try {
+							$sth = $Connection->db->prepare($templine);
 					$sth->execute();
-                    		} catch(PDOException $e) {
+							} catch(PDOException $e) {
 					return "error (import ".$filename.") : ".$e->getMessage()."\n";
-                    		}
-                		$templine = '';
-                	}
+							}
+						$templine = '';
+					}
 		}
-                //Connection::$db->commit();
-                $Connection->db = null;
-                return '';
+				//Connection::$db->commit();
+				$Connection->db = null;
+				return '';
 	}
 
 	public static function import_all_db($directory) {
@@ -35,7 +35,7 @@ 
 		//foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename)
 		while(false !== ($filename = readdir($dh)))
 		{
-		    if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename);
+			if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename);
 		}
 		return $error;
 	}
@@ -50,7 +50,7 @@ 
 		$host = filter_var($host,FILTER_SANITIZE_STRING);
 		// Dirty hack
 		if ($host != 'localhost' && $host != '127.0.0.1') {
-		    $grantright = $_SERVER['SERVER_ADDR'];
+			$grantright = $_SERVER['SERVER_ADDR'];
 		} else $grantright = 'localhost';
 		try {
 			$dbh = new PDO($db_type.':host='.$host,$root,$root_pass);

install/class.update_db.php

Doc Comments +31 added lines

@@ -10,6 +10,9 @@ 
 class update_db {
 	public static $db_sqlite;
 
+	/**
+	 * @param string $file
+	 */
 	public static function download($url, $file, $referer = '') {
 		$fp = fopen($file, 'w+');
 		$ch = curl_init();
@@ -23,6 +26,9 @@ 
 		curl_close($ch);
 	}
 
+	/**
+	 * @param string $in_file
+	 */
 	public static function gunzip($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
@@ -40,6 +46,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $in_file
+	 */
 	public static function unzip($in_file) {
 		if ($in_file != '' && file_exists($in_file)) {
 			$path = pathinfo(realpath($in_file), PATHINFO_DIRNAME);
@@ -61,6 +70,9 @@ 
 		}
 	}
 	
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_route_sqlite_to_dest($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
@@ -103,6 +115,10 @@ 
 		}
                 return '';
 	}
+
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_modes_sqlite_to_dest($database_file) {
 		global $globalTransaction;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
@@ -168,6 +184,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_modes_flarmnet($database_file) {
 		global $globalTransaction;
 		$Common = new Common();
@@ -237,6 +256,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_modes_ogn($database_file) {
 		global $globalTransaction;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
@@ -305,6 +327,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $database_file
+	 */
 	public static function retrieve_owner($database_file,$country = 'F') {
 		global $globalTransaction;
 		//$query = 'TRUNCATE TABLE aircraft_modes';
@@ -937,6 +962,9 @@ 
 
 	}
 */
+	/**
+	 * @param string $filename
+	 */
 	public static function waypoints($filename) {
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		global $tmp_dir, $globalTransaction;
@@ -993,6 +1021,9 @@ 
 		return '';
         }
 
+	/**
+	 * @param string $filename
+	 */
 	public static function ivao_airlines($filename) {
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		global $tmp_dir, $globalTransaction;

Indentation +305 added lines, -305 removed lines

@@ -70,38 +70,38 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		if ($globalDebug) echo " - Add routes to DB -";
-    		update_db::connect_sqlite($database_file);
+			if ($globalDebug) echo " - Add routes to DB -";
+			update_db::connect_sqlite($database_file);
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,ToAirport_ICAO,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$sth_dest->execute($query_dest_values);
-            		}
+					}
 			if ($globalTransaction) $Connection->db->commit();
 		} catch(PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack(); 
 			return "error : ".$e->getMessage();
 		}
-                return '';
+				return '';
 	}
 	public static function retrieve_modes_sqlite_to_dest($database_file) {
 		global $globalTransaction;
@@ -110,27 +110,27 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		update_db::connect_sqlite($database_file);
+			update_db::connect_sqlite($database_file);
 		$query = 'select * from Aircraft';
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 		$query_dest = 'INSERT INTO aircraft_modes (LastModified, ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type,:source)';
 		
@@ -141,17 +141,17 @@ 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 				if ($values['UserString4'] == 'M') $type = 'military';
 				else $type = null;
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
 				$sth_dest->execute($query_dest_values);
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
-				    $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
-				    $sth_dest_owner->execute($query_dest_owner_values);
+					$query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
+					$sth_dest_owner->execute($query_dest_owner_values);
 				}
-            		}
+					}
 			if ($globalTransaction) $Connection->db->commit();
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
@@ -161,10 +161,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -176,10 +176,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -189,25 +189,25 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-            			while (!feof($fh)) {
-            				$line = $Common->hex2str(fgets($fh,9999));
+						while (!feof($fh)) {
+							$line = $Common->hex2str(fgets($fh,9999));
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
-            				$values['ModeS'] = substr($line,0,6);
-            				$values['Registration'] = trim(substr($line,69,6));
-            				$aircraft_name = trim(substr($line,48,6));
-            				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
-            				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = substr($line,0,6);
+							$values['Registration'] = trim(substr($line,69,6));
+							$aircraft_name = trim(substr($line,48,6));
+							// Check if we can find ICAO, else set it to GLID
+							$aircraft_name_split = explode(' ',$aircraft_name);
+							$search_more = '';
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
+							$sth_search = $Connection->db->prepare($query_search);
 					try {
-                                    		$sth_search->execute();
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				//if (count($result) > 0) {
-	            				if (isset($result['icao']) && $result['icao'] != '') {
-	            				    $values['ICAOTypeCode'] = $result['icao'];
-	            				} 
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								//if (count($result) > 0) {
+								if (isset($result['icao']) && $result['icao'] != '') {
+									$values['ICAOTypeCode'] = $result['icao'];
+								} 
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -230,10 +230,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -244,10 +244,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -258,24 +258,24 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',',"'");
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',',"'");
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',',"'");
             				
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
 					//print_r($line);
-            				$values['ModeS'] = $line[1];
-            				$values['Registration'] = $line[3];
-            				$aircraft_name = $line[2];
-            				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
-            				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = $line[1];
+							$values['Registration'] = $line[3];
+							$aircraft_name = $line[2];
+							// Check if we can find ICAO, else set it to GLID
+							$aircraft_name_split = explode(' ',$aircraft_name);
+							$search_more = '';
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
+							$sth_search = $Connection->db->prepare($query_search);
 					try {
-                                    		$sth_search->execute();
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -298,10 +298,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -312,10 +312,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -326,94 +326,94 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',','"');
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',','"');
-            				//print_r($line);
-            				if ($country == 'F') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = $line[4];
-            				    $values['owner'] = $line[5];
-            				    if ($line[6] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
-					    $values['cancel'] = $line[7];
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',','"');
+							//print_r($line);
+							if ($country == 'F') {
+								$values['registration'] = $line[0];
+								$values['base'] = $line[4];
+								$values['owner'] = $line[5];
+								if ($line[6] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+						$values['cancel'] = $line[7];
 					} elseif ($country == 'EI') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = $line[3];
-            				    $values['owner'] = $line[2];
-            				    if ($line[1] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = $line[3];
+								$values['owner'] = $line[2];
+								if ($line[1] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+						$values['cancel'] = '';
 					} elseif ($country == 'HB') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[5];
-            				    $values['date_first_reg'] = '';
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[5];
+								$values['date_first_reg'] = '';
+						$values['cancel'] = '';
 					} elseif ($country == 'OK') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[3];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[5];
-            				    if ($line[18] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[3];
+								$values['base'] = null;
+								$values['owner'] = $line[5];
+								if ($line[18] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+						$values['cancel'] = '';
 					} elseif ($country == 'VH') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[12];
-            				    if ($line[28] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
-
-					    $values['cancel'] = $line[39];
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[12];
+								if ($line[28] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+
+						$values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'CC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[6];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[6];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'HJ') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[8];
-            				    if ($line[7] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[8];
+								if ($line[7] == '') $values['date_first_reg'] = '';
+						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'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
-					    $values['cancel'] = $line[7];
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								if ($line[6] == '') $values['date_first_reg'] = '';
+						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'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								if ($line[5] == '') $values['date_first_reg'] = '';
+						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'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[3];
+								if ($line[7] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+						$values['cancel'] = '';
 					} elseif ($country == 'ZK' || $country == 'OM' || $country == 'TF') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[3];
-            				    $values['date_first_reg'] = '';
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[3];
+								$values['date_first_reg'] = '';
+						$values['cancel'] = '';
 					}
 					if ($values['cancel'] == '' && $values['registration'] != null) {
 						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
@@ -535,20 +535,20 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		$query = 'ALTER TABLE airport DROP INDEX icaoidx';
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$query_dest = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image_thumb`,`image`)
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
@@ -614,10 +614,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		if ($globalDebug) echo "Insert Not available Airport...\n";
@@ -627,10 +627,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$i++;
 /*
 		$query = 'DELETE FROM airport WHERE airport_id IN (SELECT * FROM (SELECT min(a.airport_id) FROM airport a GROUP BY a.icao) x)';
@@ -744,7 +744,7 @@ 
 
 
 
-                return "success";
+				return "success";
 	}
 	
 	public static function translation() {
@@ -760,10 +760,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'translation.csv'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'translation.csv'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -782,21 +782,21 @@ 
 					$data = $row;
 					$operator = $data[2];
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
-                                                //echo substr($operator, 0, 2)."\n";;
-                                                if (count($airline_array) > 0) {
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
+												//echo substr($operator, 0, 2)."\n";;
+												if (count($airline_array) > 0) {
 							//print_r($airline_array);
 							$operator = $airline_array[0]['icao'].substr($operator,2);
-                                                }
-                                        }
+												}
+										}
 					
 					$operator_correct = $data[3];
 					if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
-                                                if (count($airline_array) > 0) {
-                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
-                                            	}
-                                        }
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
+												if (count($airline_array) > 0) {
+													$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
+												}
+										}
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -810,7 +810,7 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function translation_fam() {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -820,10 +820,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -852,54 +852,54 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	/**
-        * Convert a HTML table to an array
-        * @param String $data HTML page
-        * @return Array array of the tables in HTML page
-        */
-        private static function table2array($data) {
-                $html = str_get_html($data);
-                $tabledata=array();
-                foreach($html->find('tr') as $element)
-                {
-                        $td = array();
-                        foreach( $element->find('th') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                        }
-                        $td=array_filter($td);
-                        $tabledata[] = $td;
-
-                        $td = array();
-                        $tdi = array();
-                        foreach( $element->find('td') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                                $tdi [] = trim($row->innertext);
-                        }
-                        $td=array_filter($td);
-                        $tdi=array_filter($tdi);
-                    //    $tabledata[]=array_merge($td,$tdi);
-                        $tabledata[]=$td;
-                }
-                return(array_filter($tabledata));
-        }
-
-       /**
-        * Get data from form result
-        * @param String $url form URL
-        * @return String the result
-        */
-        private static function getData($url) {
-                $ch = curl_init();
-                curl_setopt($ch, CURLOPT_URL, $url);
-                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-                curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
-                return curl_exec($ch);
-        }
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
+		private static function table2array($data) {
+				$html = str_get_html($data);
+				$tabledata=array();
+				foreach($html->find('tr') as $element)
+				{
+						$td = array();
+						foreach( $element->find('th') as $row)
+						{
+								$td [] = trim($row->plaintext);
+						}
+						$td=array_filter($td);
+						$tabledata[] = $td;
+
+						$td = array();
+						$tdi = array();
+						foreach( $element->find('td') as $row)
+						{
+								$td [] = trim($row->plaintext);
+								$tdi [] = trim($row->innertext);
+						}
+						$td=array_filter($td);
+						$tdi=array_filter($tdi);
+					//    $tabledata[]=array_merge($td,$tdi);
+						$tabledata[]=$td;
+				}
+				return(array_filter($tabledata));
+		}
+
+	   /**
+	    * Get data from form result
+	    * @param String $url form URL
+	    * @return String the result
+	    */
+		private static function getData($url) {
+				$ch = curl_init();
+				curl_setopt($ch, CURLOPT_URL, $url);
+				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+				curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
+				return curl_exec($ch);
+		}
 /*
 	public static function waypoints() {
 		$data = update_db::getData('http://www.fallingrain.com/world/FR/waypoints.html');
@@ -949,10 +949,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -993,7 +993,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function ivao_airlines($filename) {
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -1002,10 +1002,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$header = NULL;
 		$delimiter = ':';
@@ -1029,7 +1029,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function update_airspace() {
 		global $tmp_dir, $globalDBdriver;
@@ -1064,10 +1064,10 @@ 
 			$query = 'DROP TABLE countries';
 			try {
 				$sth = $Connection->db->prepare($query);
-            	        	$sth->execute();
-	                } catch(PDOException $e) {
-    	                	echo "error : ".$e->getMessage();
-	                }
+							$sth->execute();
+					} catch(PDOException $e) {
+							echo "error : ".$e->getMessage();
+					}
 		}
 		if ($globalDBdriver == 'mysql') {
 			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
@@ -1412,12 +1412,12 @@ 
 		echo $data;
 		*/
 		if (file_exists($tmp_dir.'aircrafts.html')) {
-		    //var_dump(file_get_html($tmp_dir.'aircrafts.html'));
-		    $fh = fopen($tmp_dir.'aircrafts.html',"r");
-		    $result = fread($fh,100000000);
-		    //echo $result;
-		    //var_dump(str_get_html($result));
-		    //print_r(self::table2array($result));
+			//var_dump(file_get_html($tmp_dir.'aircrafts.html'));
+			$fh = fopen($tmp_dir.'aircrafts.html',"r");
+			$result = fread($fh,100000000);
+			//echo $result;
+			//var_dump(str_get_html($result));
+			//print_r(self::table2array($result));
 		}
 
 	}
@@ -1431,10 +1431,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$error = '';
 		if ($globalDebug) echo "Notam : Download...";
@@ -1490,8 +1490,8 @@ 
 					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
 					$data['permanent'] = 0;
 				} else {
-				    $data['date_end'] = NULL;
-				    $data['permanent'] = 1;
+					$data['date_end'] = NULL;
+					$data['permanent'] = 1;
 				}
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
 				$NOTAM = new NOTAM();
@@ -1515,13 +1515,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_update() {
@@ -1530,10 +1530,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_notam_update() {
@@ -1546,13 +1546,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_notam_update() {
@@ -1561,10 +1561,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_owner_update() {
@@ -1577,13 +1577,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_owner_update() {
@@ -1592,10 +1592,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	
 	public static function update_all() {

install/libs/sparqllib.php

Doc Comments +10 added lines

@@ -13,6 +13,9 @@ 
 function sparql_connect( $endpoint ) { return new sparql_connection( $endpoint ); }
 
 function sparql_ns( $short, $long, $db = null ) { return _sparql_a_connection( $db )->ns( $short, $long ); }
+/**
+ * @param string $sparql
+ */
 function sparql_query( $sparql, $db = null ) { return _sparql_a_connection( $db )->query( $sparql ); }
 function sparql_errno( $db = null ) { return _sparql_a_connection( $db )->errno(); }
 function sparql_error( $db = null ) { return _sparql_a_connection( $db )->error(); }
@@ -84,6 +87,9 @@ 
 		$this->params = $params;
 	}
 
+	/**
+	 * @param integer $timeout
+	 */
 	function query( $query, $timeout=null )
 	{	
 		$prefixes = "";
@@ -324,6 +330,10 @@ 
 	var $fields;
 	var $db;
 	var $i = 0;
+
+	/**
+	 * @param sparql_connection $db
+	 */
 	function __construct( $db, $rows, $fields )
 	{
 		$this->rows = $rows;

require/class.ACARS.php

Doc Comments -2 removed lines

@@ -809,8 +809,6 @@
 	/**
 	* Get Message title from label from DB
 	*
-	* @param String $ident
-	* @return Array Return ACARS data in array
 	*/
 	public function getTitlefromLabel($label) {
 		$Connection = new Connection($this->db);

Indentation +72 added lines, -72 removed lines

@@ -16,11 +16,11 @@ 
 		$this->SI = new SpotterImport($this->db);
 	}
 	/**
-	* Change IATA to ICAO value for ident
-	*
-	* @param String $ident ident
-	* @return String the icao
-	*/
+	 * Change IATA to ICAO value for ident
+	 *
+	 * @param String $ident ident
+	 * @return String the icao
+	 */
 	public function ident2icao($ident) {
 		if (substr($ident,0,2) == 'AF') {
 			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
@@ -36,11 +36,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the live table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the live table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveAcarsData()
 	{
 		global $globalDBdriver;
@@ -60,11 +60,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the archive table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the archive table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteArchiveAcarsData()
 	{
 		global $globalACARSArchiveKeepMonths, $globalDBdriver;
@@ -85,11 +85,11 @@ 
 
 
 	/**
-	* Parse ACARS data
-	*
-	* @param String ACARS data in acarsdec data
-	*
-	*/
+	 * Parse ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 */
 	function parse($data) {
 		global $globalDebug, $globalACARSArchive;
 		$Image = new Image($this->db);
@@ -660,11 +660,11 @@ 
 
 
 	/**
-	* Add ACARS data
-	*
-	* @param String ACARS data in acarsdec data
-	*
-	*/
+	 * Add ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 */
 	function add($data) {
 		global $globalDebug, $globalACARSArchive;
 		$Image = new Image($this->db);
@@ -719,15 +719,15 @@ 
 	}
 
 	/**
-	* Add Live ACARS data in DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $label Label of the ACARS message
-	* @param String $block_id Block id of the ACARS message
-	* @param String $msg_no Number of the ACARS message
-	* @param String $message ACARS message
-	*/
+	 * Add Live ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 */
 	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -765,15 +765,15 @@ 
 	}
 
 	/**
-	* Add Archive ACARS data in DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $label Label of the ACARS message
-	* @param String $block_id Block id of the ACARS message
-	* @param String $msg_no Number of the ACARS message
-	* @param String $message ACARS message
-	*/
+	 * Add Archive ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 */
 	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -807,11 +807,11 @@ 
 	}
 
 	/**
-	* Get Message title from label from DB
-	*
-	* @param String $ident
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Message title from label from DB
+	 *
+	 * @param String $ident
+	 * @return Array Return ACARS data in array
+	 */
 	public function getTitlefromLabel($label) {
 		$Connection = new Connection($this->db);
 		$this->db = $Connection->db;
@@ -830,10 +830,10 @@ 
 	}
 
 	/**
-	* List all Message title & label from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * List all Message title & label from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getAllTitleLabel() {
 		$query = "SELECT * FROM acars_label ORDER BY title";
 		$query_values = array();
@@ -850,11 +850,11 @@ 
 	}
 
 	/**
-	* Get Live ACARS data from DB
-	*
-	* @param String $ident
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Live ACARS data from DB
+	 *
+	 * @param String $ident
+	 * @return Array Return ACARS data in array
+	 */
 	public function getLiveAcarsData($ident) {
 		$query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC";
 		$query_values = array(':ident' => $ident);
@@ -871,10 +871,10 @@ 
 	}
 
 	/**
-	* Get Latest ACARS data from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Latest ACARS data from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getLatestAcarsData($limit = '',$label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
@@ -972,10 +972,10 @@ 
 	}
 
 	/**
-	* Get Archive ACARS data from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Archive ACARS data from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getArchiveAcarsData($limit = '',$label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
@@ -1077,13 +1077,13 @@ 
 	}
 
 	/**
-	* Add ModeS data to DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $icao
-	* @param String $ICAOTypeCode
-	*/
+	 * Add ModeS data to DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $icao
+	 * @param String $ICAOTypeCode
+	 */
 	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
 		global $globalDebug, $globalDBdriver;
 		$ident = trim($ident);

require/class.APRS.php

Doc Comments +5 added lines

@@ -1,5 +1,10 @@
 <?php
 class aprs {
+
+    /**
+     * @param integer $n
+     * @param integer $s
+     */
     private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
     	    (($n & 0x7fffffff) >> $s) | 

Indentation +88 added lines, -88 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 class aprs {
-    private function urshift($n, $s) {
+	private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
-    	    (($n & 0x7fffffff) >> $s) | 
-        	(0x40000000 >> ($s - 1));
-    }
+			(($n & 0x7fffffff) >> $s) | 
+			(0x40000000 >> ($s - 1));
+	}
 
-    public function parse($input) {
+	public function parse($input) {
 	$debug = false;
 	$result = array();
 	$input_len = strlen($input);
@@ -17,8 +17,8 @@ 
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    echo 'invalid';
-	    return false;
+		echo 'invalid';
+		return false;
 	}
 	
 	/* Save header and body. */
@@ -31,44 +31,44 @@ 
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
-	    $ident = $matches[1];
-	    $all_elements = $matches[2];
-	    if ($debug) echo 'ident : '.$ident."\n";
-	    $result['ident'] = $ident;
+		$ident = $matches[1];
+		$all_elements = $matches[2];
+		if ($debug) echo 'ident : '.$ident."\n";
+		$result['ident'] = $ident;
 	} else return false;
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
 	foreach ($elements as $element) {
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
-	        //echo "ok";
-	        if ($element == 'TCPIP*') return false;
-	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
+		if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+			//echo "ok";
+			if ($element == 'TCPIP*') return false;
+		} elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
 		//echo "ok";
-	    } else {
-	        return false;
-	    }
+		} else {
+			return false;
+		}
 	}
 	// Check for Timestamp
 	$body_parse = substr($body,1);
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
-	    $timestamp = $matches[0];
-	    if ($matches[4] == 'h') {
+		$timestamp = $matches[0];
+		if ($matches[4] == 'h') {
 		$timestamp = strtotime($matches[1].':'.$matches[2].':'.$matches[3]);
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
 		/*
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
 		*/
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
 		// FIXME : fix this...
 		$timestamp = strtotime($matches[1].' '.$matches[2].':'.$matches[3]);
-	    }
-	    $body_parse = substr($body_parse,7);
-	    $result['timestamp'] = $timestamp;
+		}
+		$body_parse = substr($body_parse,7);
+		$result['timestamp'] = $timestamp;
 	}
 	if (strlen($body_parse) > 19) {
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
 		// 4658.70N/00707.78Ez
 		//print_r(str_split($body_parse));
 		$latlon = $matches[0];
@@ -84,7 +84,7 @@ 
 		$lon = intval($lon_deg);
 		if ($lat > 89 || $lon > 179) return false;
 	    
-	    /*
+		/*
 	    $tmp_5b = str_replace('.','',$lat_min);
 	    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
 	        print_r($matches);
@@ -96,58 +96,58 @@ 
 		if ($wind == 'W') $longitude = 0-$longitude;
 		$result['latitude'] = $latitude;
 		$result['longitude'] = $longitude;
-	    }
-	    if ($body_len > 19) {
+		}
+		if ($body_len > 19) {
 		$body_split = str_split($body_parse);
 		$symbol_code = $body_split[18];
 		if ($symbol_code != '_') {
-		    $body_parse = substr($body_parse,19);
-		    $body_parse_len = strlen($body_parse);
-		    if ($body_parse_len >= 7) {
+			$body_parse = substr($body_parse,19);
+			$body_parse_len = strlen($body_parse);
+			if ($body_parse_len >= 7) {
 			
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
-		    	    $course = substr($body_parse,0,3);
-		    	    $tmp_s = intval($course);
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['course'] = intval($course);
-		    	    $speed = substr($body_parse,4,3);
-		    	    $result['speed'] = round($speed*1.852);
-		    	    $body_parse = substr($body_parse,7);
-		        }
-		        // Check PHGR, PHG, RNG
-		    } else if ($body_parse_len > 0) {
+				if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
+					$course = substr($body_parse,0,3);
+					$tmp_s = intval($course);
+					if ($tmp_s >= 1 && $tmp_s <= 360) $result['course'] = intval($course);
+					$speed = substr($body_parse,4,3);
+					$result['speed'] = round($speed*1.852);
+					$body_parse = substr($body_parse,7);
+				}
+				// Check PHGR, PHG, RNG
+			} else if ($body_parse_len > 0) {
 			$rest = $body_parse;
-		    }
-		    if (strlen($body_parse) > 0) {
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
-		            $altitude = intval($matches[1]);
-		            $result['altitude'] = round($altitude*0.3048);
-		            $body_parse = substr($body_parse,strlen($matches[0])+1);
-		        }
-		    }
+			}
+			if (strlen($body_parse) > 0) {
+				if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+					$altitude = intval($matches[1]);
+					$result['altitude'] = round($altitude*0.3048);
+					$body_parse = substr($body_parse,strlen($matches[0])+1);
+				}
+			}
 		    
-		    // Telemetry
-		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
-		        // Nothing yet...
-		    }
-		    // DAO
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
-			    $dao = $matches[1];
-			    $dao_split = str_split($dao);
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
-			        $lat_off = (($dao[1])-48.0)*0.001/60.0;
-			        $lon_off = (($dao[2])-48.0)*0.001/60.0;
+			// Telemetry
+			if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
+				// Nothing yet...
+			}
+			// DAO
+			if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+				$dao = $matches[1];
+				$dao_split = str_split($dao);
+				if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+					$lat_off = (($dao[1])-48.0)*0.001/60.0;
+					$lon_off = (($dao[2])-48.0)*0.001/60.0;
 			    
-			    }
-			    if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
-			    else $result['latitude'] += $lat_off;
-			    if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
-			    else $result['longitude'] += $lon_off;
-		            $body_parse = substr($body_parse,6);
-		    }
+				}
+				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
+				else $result['latitude'] += $lat_off;
+				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
+				else $result['longitude'] += $lon_off;
+					$body_parse = substr($body_parse,6);
+			}
 		    
-		    // OGN comment
+			// OGN comment
 		   // echo "Before OGN : ".$body_parse."\n";
-		    if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
+			if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
 			$id = $matches[1];
 			$mode = substr($id,0,2);
 			$address = substr($id,2);
@@ -177,49 +177,49 @@ 
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
-		    }
+			}
 		    
-		    //Comment
-		    $result['comment'] = $body_parse;
+			//Comment
+			$result['comment'] = $body_parse;
 		} else {
-		    // parse weather
-		    $body_parse = substr($body_parse,19);
-		    $body_parse_len = strlen($body_parse);
+			// parse weather
+			$body_parse = substr($body_parse,19);
+			$body_parse_len = strlen($body_parse);
 
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+			if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = $matches[1];
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = $matches[1];
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = $matches[1];
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = $matches[1];
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    }
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			}
+			if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
 			$result['temp'] = round(5/9*(($matches[1])-32),1);
-		    }
+			}
+		}
 		}
-	    }
 	}
 	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
 	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
 	//print_r($result);
 	return $result;
-    }
+	}
 }
 /*
 $aprs = new aprs();

require/class.Common.php

Doc Comments +5 added lines, -2 removed lines

@@ -160,7 +160,7 @@ 
 	* Check is distance realistic
 	* @param int $timeDifference the time between the reception of both messages
 	* @param float $distance distance covered
-	* @return whether distance is realistic
+	* @return boolean distance is realistic
 	*/
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
@@ -183,6 +183,9 @@ 
 	}
 
 
+	/**
+	 * @param string $latlong
+	 */
 	public function convertDec($dms,$latlong) {
 		if ($latlong == 'latitude') {
 			$deg = substr($dms, 0, 2);
@@ -274,7 +277,7 @@ 
 	/**
 	* Returns list of available locales
 	*
-	* @return array
+	* @return string[]
 	 */
 	public function listLocaleDir()
 	{

Indentation +46 added lines, -46 removed lines

@@ -6,13 +6,13 @@ 
 	protected $cookies = array();
 	
 	/**
-	* Get data from form result
-	* @param String $url form URL
-	* @param String $type type of submit form method (get or post)
-	* @param String or Array $data values form post method
-	* @param Array $headers header to submit with the form
-	* @return String the result
-	*/
+	 * Get data from form result
+	 * @param String $url form URL
+	 * @param String $type type of submit form method (get or post)
+	 * @param String or Array $data values form post method
+	 * @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 = '') {
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
@@ -67,7 +67,7 @@ 
 				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
 			}
 		} else {
-		    return $result;
+			return $result;
 		}
 	}
 	
@@ -79,10 +79,10 @@ 
 	}
 	
 	/**
-	* Convert a HTML table to an array
-	* @param String $data HTML page
-	* @return Array array of the tables in HTML page
-	*/
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
 	public function table2array($data) {
 		if (!is_string($data)) return array();
 		if ($data == '') return array();
@@ -115,10 +115,10 @@ 
 	}
 	
 	/**
-	* Convert <p> part of a HTML page to an array
-	* @param String $data HTML page
-	* @return Array array of the <p> in HTML page
-	*/
+	 * Convert <p> part of a HTML page to an array
+	 * @param String $data HTML page
+	 * @return Array array of the <p> in HTML page
+	 */
 	public function text2array($data) {
 		$html = str_get_html($data);
 		$tabledata=array();
@@ -132,14 +132,14 @@ 
 	}
 
 	/**
-	* Give distance between 2 coordonnates
-	* @param Float $lat latitude of first point
-	* @param Float $lon longitude of first point
-	* @param Float $latc latitude of second point
-	* @param Float $lonc longitude of second point
-	* @param String $unit km else no unit used
-	* @return Float Distance in $unit
-	*/
+	 * Give distance between 2 coordonnates
+	 * @param Float $lat latitude of first point
+	 * @param Float $lon longitude of first point
+	 * @param Float $latc latitude of second point
+	 * @param Float $lonc longitude of second point
+	 * @param String $unit km else no unit used
+	 * @return Float Distance in $unit
+	 */
 	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;
@@ -157,11 +157,11 @@ 
 	}
 
 	/**
-	* Check is distance realistic
-	* @param int $timeDifference the time between the reception of both messages
-	* @param float $distance distance covered
-	* @return whether distance is realistic
-	*/
+	 * Check is distance realistic
+	 * @param int $timeDifference the time between the reception of both messages
+	 * @param float $distance distance covered
+	 * @return whether distance is realistic
+	 */
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
@@ -179,7 +179,7 @@ 
 	}
 
 	public function isInteger($input){
-	    return(ctype_digit(strval($input)));
+		return(ctype_digit(strval($input)));
 	}
 
 
@@ -195,11 +195,11 @@ 
 	}
 	
 	/**
-	* Copy folder contents
-	* @param       string   $source    Source path
-	* @param       string   $dest      Destination path
-	* @return      bool     Returns true on success, false on failure
-	*/
+	 * Copy folder contents
+	 * @param       string   $source    Source path
+	 * @param       string   $dest      Destination path
+	 * @return      bool     Returns true on success, false on failure
+	 */
 	public function xcopy($source, $dest, $permissions = 0755)
 	{
 		$files = glob($source.'*.*');
@@ -211,20 +211,20 @@ 
 	}
 	
 	/**
-	* Check if an url exist
-	* @param	String $url url to check
-	* @return	bool Return true on succes false on failure
-	*/
+	 * Check if an url exist
+	 * @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;
 	}
 	
 	/**
-	* Convert hexa to string
-	* @param	String $hex data in hexa
-	* @return	String Return result
-	*/
+	 * Convert hexa to string
+	 * @param	String $hex data in hexa
+	 * @return	String Return result
+	 */
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
@@ -272,9 +272,9 @@ 
 	}
 	
 	/**
-	* Returns list of available locales
-	*
-	* @return array
+	 * Returns list of available locales
+	 *
+	 * @return array
 	 */
 	public function listLocaleDir()
 	{

require/class.Connection.php

Doc Comments +6 added lines

@@ -6,6 +6,9 @@ 
 	public $dbs = array();
 	public $latest_schema = 23;
 	
+	/**
+	 * @param string $dbname
+	 */
 	public function __construct($dbc = null,$dbname = null) {
 	    global $globalDBdriver;
 	    if ($dbc === null) {
@@ -102,6 +105,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $table
+	 */
 	public function tableExists($table)
 	{
 		global $globalDBdriver, $globalDBname;

Indentation +24 added lines, -24 removed lines

@@ -7,18 +7,18 @@ 
 	public $latest_schema = 23;
 	
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
-	    global $globalDBdriver;
-	    if ($dbc === null) {
+		global $globalDBdriver;
+		if ($dbc === null) {
 		if ($this->db === null && $dbname === null) {
-		    if ($user === null && $pass === null) {
+			if ($user === null && $pass === null) {
 			$this->createDBConnection();
-		    } else {
+			} else {
 			$this->createDBConnection(null,$user,$pass);
-		    }
+			}
 		} else {
-		    $this->createDBConnection($dbname);
+			$this->createDBConnection($dbname);
 		}
-	    } elseif ($dbname === null || $dbname === 'default') {
+		} elseif ($dbname === null || $dbname === 'default') {
 		$this->db = $dbc;
 		if ($this->connectionExists() === false) {
 			/*
@@ -28,19 +28,19 @@ 
 			*/
 			$this->createDBConnection();
 		}
-	    } else {
+		} else {
 		//$this->connectionExists();
 		$this->dbs[$dbname] = $dbc;
-	    }
+		}
 	}
 
 
 	/**
-	* Creates the database connection
-	*
-	* @return Boolean of the database connection
-	*
-	*/
+	 * Creates the database connection
+	 *
+	 * @return Boolean of the database connection
+	 *
+	 */
 
 	public function createDBConnection($DBname = null, $user = null, $pass = null)
 	{
@@ -133,7 +133,7 @@ 
 			return false;
 		}
 		if($results->rowCount()>0) {
-		    return true; 
+			return true; 
 		}
 		else return false;
 	}
@@ -150,14 +150,14 @@ 
 				$sum = $sum->fetchColumn(0);
 			} else $sum = 0;
 			if (intval($sum) !== 2) {
-			     return false;
+				 return false;
 			}
 			
 		} catch(PDOException $e) {
 			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
-            			throw $e;
-	                }
-	                //echo 'error ! '.$e->getMessage();
+						throw $e;
+					}
+					//echo 'error ! '.$e->getMessage();
 			return false;
 		}
 		return true; 
@@ -181,7 +181,7 @@ 
 			return false;
 		}
 		if($results->rowCount()>0) {
-		    return true; 
+			return true; 
 		}
 		else return false;
 	}
@@ -235,8 +235,8 @@ 
 		$version = 0;
 		if ($this->tableExists('aircraft')) {
 			if (!$this->tableExists('config')) {
-	    			$version = '1';
-	    			return $version;
+					$version = '1';
+					return $version;
 			} else {
 				$Connection = new Connection();
 				$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
@@ -257,8 +257,8 @@ 
 	* @return Boolean if latest version or not
 	*/
 	public function latest() {
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+		if ($this->check_schema_version() == $this->latest_schema) return true;
+		else return false;
 	}
 
 }

require/class.Image.php

Doc Comments +3 added lines

@@ -327,6 +327,9 @@
     }
 
 
+    /**
+     * @param string $aircraft_icao
+     */
     public function fromIvaoMtl($aircraft_icao,$airline_icao) {
 	$Common = new Common();
 	//echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';

Indentation +227 added lines, -227 removed lines

@@ -4,27 +4,27 @@ 
 require_once(dirname(__FILE__).'/settings.php');
 
 class Image {
-    public $db;
+	public $db;
 
-    function __construct($dbc = null) {
-	    $Connection = new Connection($dbc);
-            $this->db = $Connection->db;
-    }
+	function __construct($dbc = null) {
+		$Connection = new Connection($dbc);
+			$this->db = $Connection->db;
+	}
 
-    /**
-    * Gets the images based on the aircraft registration
-    *
-    * @return Array the images list
-    *
-    */
-    public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
-    {
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-	    if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
+	/**
+	 * Gets the images based on the aircraft registration
+	 *
+	 * @return Array the images list
+	 *
+	 */
+	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
+	{
+		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
 	    
-	    $registration = trim($registration);
+		$registration = trim($registration);
 
 	$query  = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright
 			FROM spotter_image 
@@ -33,7 +33,7 @@ 
 	
 	$sth = $this->db->prepare($query);
 	$sth->execute(array(':registration' => $registration));
-          /*
+		  /*
         $images_array = array();
 	$temp_array = array();
 
@@ -52,36 +52,36 @@ 
         
         return $images_array;
         */
-        return $sth->fetchAll(PDO::FETCH_ASSOC);
-    }
+		return $sth->fetchAll(PDO::FETCH_ASSOC);
+	}
 
-    /**
-    * Gets the image copyright based on the Exif data
-    *
-    * @return String image copyright
-    *
-    */
-    public function getExifCopyright($url) {
-        $exif = exif_read_data($url);
-        $copyright = '';
-        if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
-        elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
-        if ($copyright != '') {
-    	    $copyright = str_replace('Copyright ','',$copyright);
-    	    $copyright = str_replace('© ','',$copyright);
-    	    $copyright = str_replace('(c) ','',$copyright);
-        }
-        return $copyright;
-    }
+	/**
+	 * Gets the image copyright based on the Exif data
+	 *
+	 * @return String image copyright
+	 *
+	 */
+	public function getExifCopyright($url) {
+		$exif = exif_read_data($url);
+		$copyright = '';
+		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
+		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
+		if ($copyright != '') {
+			$copyright = str_replace('Copyright ','',$copyright);
+			$copyright = str_replace('© ','',$copyright);
+			$copyright = str_replace('(c) ','',$copyright);
+		}
+		return $copyright;
+	}
     
-    /**
-    * Adds the images based on the aircraft registration
-    *
-    * @return String either success or error
-    *
-    */
-    public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
-    {
+	/**
+	 * Adds the images based on the aircraft registration
+	 *
+	 * @return String either success or error
+	 *
+	 */
+	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
+	{
 	global $globalAircraftImageFetch;
 	if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
 	$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -90,29 +90,29 @@ 
 	$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
 	if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
 	if ($image_url['original'] != '') {
-	    $query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
-	    try {
+		$query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
+		try {
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $registration,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website']));
-	    } catch(PDOException $e) {
+		} catch(PDOException $e) {
 		echo $e->getMessage."\n";
 		return "error";
-	    }
+		}
 	}
 	return "success";
-    }
+	}
     
     
-    /**
-    * Gets the aircraft image
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '')
-    {
+	/**
+	 * Gets the aircraft image
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '')
+	{
 	global $globalAircraftImageSources, $globalIVAO;
 	$Spotter = new Spotter($this->db);
 	if (!isset($globalIVAO)) $globalIVAO = FALSE;
@@ -120,17 +120,17 @@ 
 	
 	if ($aircraft_registration != '') {
 	if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
-	    $aircraft_registration = urlencode(trim($aircraft_registration));
-	    $aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
-    	    if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
-	    else $aircraft_name = '';
-	    if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao'];
-    	    else $aircraft_icao = '';
-    	    if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao'];
-    	    else $airline_icao = '';
-        } elseif ($aircraft_icao != '') {
-    	    $aircraft_registration = $aircraft_icao;
-    	    $aircraft_name = '';
+		$aircraft_registration = urlencode(trim($aircraft_registration));
+		$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
+			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
+		else $aircraft_name = '';
+		if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao'];
+			else $aircraft_icao = '';
+			if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao'];
+			else $airline_icao = '';
+		} elseif ($aircraft_icao != '') {
+			$aircraft_registration = $aircraft_icao;
+			$aircraft_name = '';
 	} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
 
 	if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
@@ -150,29 +150,29 @@ 
 		if (isset($images_array) && $images_array['original'] != '') return $images_array;
 	}
 	return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
-    }
+	}
 
-    /**
-    * Gets the aircraft image from Planespotters
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @param String $aircraft_name type of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function fromPlanespotters($aircraft_registration, $aircraft_name='') {
+	/**
+	 * Gets the aircraft image from Planespotters
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function fromPlanespotters($aircraft_registration, $aircraft_name='') {
 	$Common = new Common();
 	// If aircraft registration is only number, also check with aircraft model
 	if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') {
-	    $url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
+		$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
 	} else {
-	    //$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss';
-	    $url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
+		//$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss';
+		$url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
 	}
 	
 	$data = $Common->getData($url);
 	if ($xml = simplexml_load_string($data)) {
-	    if (isset($xml->channel->item)) {
+		if (isset($xml->channel->item)) {
 		$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
 		$image_url['thumbnail'] = $thumbnail_url;
 		$image_url['original'] = str_replace('thumbnail','original',$thumbnail_url);
@@ -180,31 +180,31 @@ 
 		$image_url['source_website'] = trim((string)$xml->channel->item->link);
 		$image_url['source'] = 'planespotters';
 		return $image_url;
-	    }
+		}
 	} 
 	return false;
-    }
+	}
 
-    /**
-    * Gets the aircraft image from Deviantart
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @param String $aircraft_name type of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function fromDeviantart($aircraft_registration, $aircraft_name='') {
+	/**
+	 * Gets the aircraft image from Deviantart
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function fromDeviantart($aircraft_registration, $aircraft_name='') {
 	$Common = new Common();
 	// If aircraft registration is only number, also check with aircraft model
 	if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') {
-	    $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$aircraft_registration.'%20'.urlencode($aircraft_name);
+		$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$aircraft_registration.'%20'.urlencode($aircraft_name);
 	} else {
-	    $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$aircraft_registration;
+		$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$aircraft_registration;
 	}
 	
 	$data = $Common->getData($url);
 	if ($xml = simplexml_load_string($data)) {
-	    if (isset($xml->channel->item->link)) {
+		if (isset($xml->channel->item->link)) {
 		$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
 		$image_url['thumbnail'] = $thumbnail_url;
 		$original_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url);
@@ -213,20 +213,20 @@ 
 		$image_url['source_website'] = trim((string)$xml->channel->item->link);
 		$image_url['source'] = 'deviantart';
 		return $image_url;
-	    }
+		}
 	} 
 	return false;
-    }
+	}
 
-    /**
-    * Gets the aircraft image from JetPhotos
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @param String $aircraft_name type of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function fromJetPhotos($aircraft_registration, $aircraft_name='') {
+	/**
+	 * Gets the aircraft image from JetPhotos
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function fromJetPhotos($aircraft_registration, $aircraft_name='') {
 	$Common = new Common();
 	$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
 	
@@ -235,19 +235,19 @@ 
 	@$dom->loadHTML($data);
 	$all_pics = array();
 	foreach($dom->getElementsByTagName('img') as $image) {
-	    if ($image->getAttribute('itemprop') == "http://schema.org/image") {
+		if ($image->getAttribute('itemprop') == "http://schema.org/image") {
 		$all_pics[] = $image->getAttribute('src');
-	    }
+		}
 	}
 	$all_authors = array();
 	foreach($dom->getElementsByTagName('meta') as $author) {
-	    if ($author->getAttribute('itemprop') == "http://schema.org/author") {
+		if ($author->getAttribute('itemprop') == "http://schema.org/author") {
 		$all_authors[] = $author->getAttribute('content');
-	    }
+		}
 	}
 	$all_ref = array();
 	foreach($dom->getElementsByTagName('a') as $link) {
-	    $all_ref[] = $link->getAttribute('href');
+		$all_ref[] = $link->getAttribute('href');
 	}
 
 	if (isset($all_pics[0])) {
@@ -259,17 +259,17 @@ 
 		return $image_url;
 	}
 	return false;
-    }
+	}
   
-    /**
-    * Gets the aircraft image from PlanePictures
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @param String $aircraft_name type of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function fromPlanePictures($aircraft_registration, $aircraft_name='') {
+	/**
+	 * Gets the aircraft image from PlanePictures
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function fromPlanePictures($aircraft_registration, $aircraft_name='') {
 	$Common = new Common();
 	$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
 	
@@ -278,11 +278,11 @@ 
 	@$dom->loadHTML($data);
 	$all_pics = array();
 	foreach($dom->getElementsByTagName('img') as $image) {
-	    $all_pics[] = $image->getAttribute('src');
+		$all_pics[] = $image->getAttribute('src');
 	}
 	$all_links = array();
 	foreach($dom->getElementsByTagName('a') as $link) {
-	    $all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href'));
+		$all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href'));
 	}
 	if (isset($all_pics[1]) && !preg_match('/bit.ly/',$all_pics[1])) {
 		$image_url['thumbnail'] = 'http://www.planepictures.net'.$all_pics[1];
@@ -293,26 +293,26 @@ 
 		return $image_url;
 	}
 	return false;
-    }
+	}
   
-    /**
-    * Gets the aircraft image from Flickr
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @param String $aircraft_name type of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function fromFlickr($aircraft_registration,$aircraft_name='') {
+	/**
+	 * Gets the aircraft image from Flickr
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function fromFlickr($aircraft_registration,$aircraft_name='') {
 	$Common = new Common();
 
-	    if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
-	    else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
+		if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
+		else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
 	    
 	$data = $Common->getData($url);
 	
 	if ($xml = simplexml_load_string($data)) {
-	    if (isset($xml->channel->item)) {
+		if (isset($xml->channel->item)) {
 		$original_url = trim((string)$xml->channel->item->enclosure->attributes()->url);
 		$image_url['thumbnail'] = $original_url;
 		$image_url['original'] = $original_url;
@@ -320,39 +320,39 @@ 
 		$image_url['source_website'] = trim((string)$xml->channel->item->link);
 		$image_url['source'] = 'flickr';
 		return $image_url;
-	    }
+		}
 	} 
 	
 	return false;
-    }
+	}
 
 
-    public function fromIvaoMtl($aircraft_icao,$airline_icao) {
+	public function fromIvaoMtl($aircraft_icao,$airline_icao) {
 	$Common = new Common();
 	//echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
 	if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) {
-	    $image_url['thumbnail'] = 'http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
-	    $image_url['original'] = 'http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
-	    $image_url['copyright'] = 'IVAO';
-	    $image_url['source_website'] = 'http://mtlcatalog.ivao.aero/';
-	    $image_url['source'] = 'ivao.aero';
-	    return $image_url;
+		$image_url['thumbnail'] = 'http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
+		$image_url['original'] = 'http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
+		$image_url['copyright'] = 'IVAO';
+		$image_url['source_website'] = 'http://mtlcatalog.ivao.aero/';
+		$image_url['source'] = 'ivao.aero';
+		return $image_url;
 	} else {
-	    return false;
+		return false;
 	}
     
-    }
+	}
     
     
-    /**
-    * Gets the aircraft image from Bing
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @param String $aircraft_name type of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function fromBing($aircraft_registration,$aircraft_name='') {
+	/**
+	 * Gets the aircraft image from Bing
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function fromBing($aircraft_registration,$aircraft_name='') {
 	global $globalImageBingKey;
 	$Common = new Common();
 	if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false;
@@ -365,54 +365,54 @@ 
 
 	$result = json_decode($data);
 	if (isset($result->d->results[0]->MediaUrl)) {
-	    $image_url['original'] = $result->d->results[0]->MediaUrl;
-	    $image_url['source_website'] = $result->d->results[0]->SourceUrl;
-	    // Thumbnail can't be used this way...
-	    // $image_url['thumbnail'] = $result->d->results[0]->Thumbnail->MediaUrl;
-	    $image_url['thumbnail'] = $result->d->results[0]->MediaUrl;
-	    $url = parse_url($image_url['source_website']);
-	    $image_url['copyright'] = $url['host'];
-	    $image_url['source'] = 'bing';
-	    return $image_url;
+		$image_url['original'] = $result->d->results[0]->MediaUrl;
+		$image_url['source_website'] = $result->d->results[0]->SourceUrl;
+		// Thumbnail can't be used this way...
+		// $image_url['thumbnail'] = $result->d->results[0]->Thumbnail->MediaUrl;
+		$image_url['thumbnail'] = $result->d->results[0]->MediaUrl;
+		$url = parse_url($image_url['source_website']);
+		$image_url['copyright'] = $url['host'];
+		$image_url['source'] = 'bing';
+		return $image_url;
 	}
 	return false;
-    }
+	}
 
-    /**
-    * Gets the aircraft image from airport-data
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @param String $aircraft_name type of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function fromAirportData($aircraft_registration,$aircraft_name='') {
+	/**
+	 * Gets the aircraft image from airport-data
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function fromAirportData($aircraft_registration,$aircraft_name='') {
 	$Common = new Common();
 	$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration;
 	$data = $Common->getData($url);
 	$result = json_decode($data);
 	
 	if (isset($result->count) && $result->count > 0) {
-	    $image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image);
-	    $image_url['source_website'] = $result->data[0]->link;
-	    $image_url['thumbnail'] = $result->data[0]->image;
-	    $image_url['copyright'] = $result->data[0]->photographer;
-	    $image_url['source'] = 'AirportData';
+		$image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image);
+		$image_url['source_website'] = $result->data[0]->link;
+		$image_url['thumbnail'] = $result->data[0]->image;
+		$image_url['copyright'] = $result->data[0]->photographer;
+		$image_url['source'] = 'AirportData';
 	
-	    return $image_url;
+		return $image_url;
 	}
 	return false;
-    }
+	}
 
-    /**
-    * Gets the aircraft image from WikiMedia
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @param String $aircraft_name type of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function fromWikimedia($aircraft_registration,$aircraft_name='') {
+	/**
+	 * Gets the aircraft image from WikiMedia
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function fromWikimedia($aircraft_registration,$aircraft_name='') {
 	$Common = new Common();
 	if ($aircraft_name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
 	else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft';
@@ -420,59 +420,59 @@ 
 	$data = $Common->getData($url);
 	$result = json_decode($data);
 	if (isset($result->query->search[0]->title)) {
-	    $fileo = $result->query->search[0]->title;
-	    if (substr($fileo,-3) == 'pdf') return false;
-	    $file = urlencode($fileo);
-	    $url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
+		$fileo = $result->query->search[0]->title;
+		if (substr($fileo,-3) == 'pdf') return false;
+		$file = urlencode($fileo);
+		$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
 
-	    $data2 = $Common->getData($url2);
-	    $result2 = json_decode($data2);
-	    if (isset($result2->query->pages)) {
+		$data2 = $Common->getData($url2);
+		$result2 = json_decode($data2);
+		if (isset($result2->query->pages)) {
 		foreach ($result2->query->pages as $page) {
-		    if (isset($page->imageinfo[0]->user)) {
+			if (isset($page->imageinfo[0]->user)) {
 			$image_url['copyright'] = 'Wikimedia, '.$page->imageinfo[0]->user;
 			$image_url['original'] = $page->imageinfo[0]->url;
 			$image_url['thumbnail'] = $page->imageinfo[0]->thumburl;
 			$image_url['source'] = 'wikimedia';
 			$image_url['source_website'] = 'http://commons.wikimedia.org/wiki/'.$fileo;
 			//return $image_url;
-		    }
+			}
+		}
 		}
-	    }
 	    
-	    if (isset($image_url['original'])) {
+		if (isset($image_url['original'])) {
 		$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&prop=imageinfo&iiprop=extmetadata&format=json&continue&titles='.$file;
 
 		$data2 = $Common->getData($url2);
 		$result2 = json_decode($data2);
 		if (isset($result2->query->pages)) {
-		    foreach ($result2->query->pages as $page) {
+			foreach ($result2->query->pages as $page) {
 			if (isset($page->imageinfo[0]->extmetadata->Artist)) {
-			    $image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
-			    if (isset($page->imageinfo[0]->extmetadata->License->value)) {
-			        $image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')';
-			    }
-			    $image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright']));
-			    return $image_url;
+				$image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
+				if (isset($page->imageinfo[0]->extmetadata->License->value)) {
+					$image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')';
+				}
+				$image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright']));
+				return $image_url;
+			}
 			}
-		    }
 		}
 		return $image_url;
-	    }
+		}
 	    
 	}
 	return false;
-    }
+	}
 
-    /**
-    * Gets the aircraft image from custom url
-    *
-    * @param String $aircraft_registration the registration of the aircraft
-    * @param String $aircraft_name type of the aircraft
-    * @return Array the aircraft thumbnail, orignal url and copyright
-    *
-    */
-    public function fromCustomSource($aircraft_registration,$aircraft_name='') {
+	/**
+	 * Gets the aircraft image from custom url
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
+	public function fromCustomSource($aircraft_registration,$aircraft_name='') {
 	global $globalAircraftCustomSources;
 	//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);
 	if (!empty($globalAircraftImageCustomSources)) {
@@ -495,7 +495,7 @@ 
 		}
 		return false;
 	} else return false;
-    }
+	}
 
 
 

require/class.Language.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	/**
 	* Returns list of available locales
 	*
-	* @return array
+	* @return string[]
 	 */
 	public function listLocaleDir()
 	{

Indentation +9 added lines, -9 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 if (!function_exists("gettext")) {
-        function _($text) {
-                return $text;
-        }
+		function _($text) {
+				return $text;
+		}
 } else {
 	if (isset($_COOKIE['language']) && $_COOKIE['language'] != 'en_GB' && (isset($globalTranslate) && $globalTranslate)) {
 		$Language = new Language();
@@ -75,9 +75,9 @@ 
 			);
 
 	/**
-	* Returns list of available locales
-	*
-	* @return array
+	 * Returns list of available locales
+	 *
+	 * @return array
 	 */
 	public function listLocaleDir()
 	{
@@ -103,9 +103,9 @@ 
 	}
 
 	/**
-	* Returns list of available languages
-	*
-	* @return array
+	 * Returns list of available languages
+	 *
+	 * @return array
 	 */
 	public function getLanguages()
 	{