Ysurac / FlightAirMap

install/class.update_schema.php

Indentation +590 added lines, -590 removed lines

@@ -8,18 +8,18 @@ 
 class update_schema {
 
 	public static function update_schedule() {
-	    $Connection = new Connection();
-	    $Schedule = new Schedule();
-	    $query = "SELECT * FROM schedule";
-            try {
-            	$sth = $Connection->db->prepare($query);
+		$Connection = new Connection();
+		$Schedule = new Schedule();
+		$query = "SELECT * FROM schedule";
+			try {
+				$sth = $Connection->db->prepare($query);
 		$sth->execute();
-    	    } catch(PDOException $e) {
+			} catch(PDOException $e) {
 		return "error : ".$e->getMessage()."\n";
-    	    }
-    	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
-    	    }
+			}
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+			$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
+			}
 	
 	}
 /*
@@ -43,198 +43,198 @@ 
     	}
 */	
 	private static function update_from_1() {
-    		$Connection = new Connection();
-    		// Add new column to routes table
-    		//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
+			$Connection = new Connection();
+			// Add new column to routes table
+			//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
 		$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10) NULL , ADD `ToAirport_Time` VARCHAR(10) NULL , ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP, ADD `date_modified` timestamp NULL, ADD `date_lastseen` timestamp NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
-    		}
-    		// Copy schedules data to routes table
-    		self::update_schedule();
-    		// Delete schedule table
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
+			}
+			// Copy schedules data to routes table
+			self::update_schedule();
+			// Delete schedule table
 		$query = "DROP TABLE `schedule`";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (delete schedule table) : ".$e->getMessage()."\n";
-    		}
-    		// Add source column
-    		$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (delete schedule table) : ".$e->getMessage()."\n";
+			}
+			// Add source column
+			$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
+			}
 		// Delete unused column
 		$query = "ALTER TABLE `aircraft_modes`  DROP `SerialNo`,  DROP `OperatorFlagCode`,  DROP `Manufacturer`,  DROP `Type`,  DROP `FirstRegDate`,  DROP `CurrentRegDate`,  DROP `Country`,  DROP `PreviousID`,  DROP `DeRegDate`,  DROP `Status`,  DROP `PopularName`,  DROP `GenericName`,  DROP `AircraftClass`,  DROP `Engines`,  DROP `OwnershipStatus`,  DROP `RegisteredOwners`,  DROP `MTOW`,  DROP `TotalHours`,  DROP `YearBuilt`,  DROP `CofACategory`,  DROP `CofAExpiry`,  DROP `UserNotes`,  DROP `Interested`,  DROP `UserTag`,  DROP `InfoUrl`,  DROP `PictureUrl1`,  DROP `PictureUrl2`,  DROP `PictureUrl3`,  DROP `UserBool1`,  DROP `UserBool2`,  DROP `UserBool3`,  DROP `UserBool4`,  DROP `UserBool5`,  DROP `UserString1`,  DROP `UserString2`,  DROP `UserString3`,  DROP `UserString4`,  DROP `UserString5`,  DROP `UserInt1`,  DROP `UserInt2`,  DROP `UserInt3`,  DROP `UserInt4`,  DROP `UserInt5`";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
+			}
 		// Add ModeS column
 		$query = "ALTER TABLE `spotter_output`  ADD `ModeS` VARCHAR(255) NULL";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
+			}
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		// Add auto_increment for aircraft_modes
-    		$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
+			}
+			// Add auto_increment for aircraft_modes
+			$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
+			}
+			$error = '';
 		$error .= create_db::import_file('../db/acars_live.sql');
 		$error .= create_db::import_file('../db/config.sql');
 		// Update schema_version to 2
 		$query = "UPDATE `config` SET `value` = '2' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
-        }
+		}
 
 	private static function update_from_2() {
-    		$Connection = new Connection();
-    		// Add new column decode to acars_live table
+			$Connection = new Connection();
+			// Add new column decode to acars_live table
 		$query = "ALTER TABLE `acars_live` ADD `decode` TEXT";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
-    		// Create table acars_archive
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
+			}
+			$error = '';
+			// Create table acars_archive
 		$error .= create_db::import_file('../db/acars_archive.sql');
 		// Update schema_version to 3
 		$query = "UPDATE `config` SET `value` = '3' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_3() {
-    		$Connection = new Connection();
-    		// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
+			$Connection = new Connection();
+			// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
 		$query = "ALTER TABLE `aircraft_modes` CHANGE `FirstCreated` `FirstCreated` timestamp DEFAULT CURRENT_TIMESTAMP";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
-    		}
-    		// Add image_source_website column to spotter_image
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
+			}
+			// Add image_source_website column to spotter_image
 		$query = "ALTER TABLE `spotter_image` ADD `image_source_website` VARCHAR(999) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
+			}
+			$error = '';
 		// Update schema_version to 4
 		$query = "UPDATE `config` SET `value` = '4' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	
 	private static function update_from_4() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 	
-    		$error = '';
-    		// Create table acars_label
+			$error = '';
+			// Create table acars_label
 		$error .= create_db::import_file('../db/acars_label.sql');
 		if ($error == '') {
-		    // Update schema_version to 5
-		    $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
-        	    try {
-            		$sth = $Connection->db->prepare($query);
+			// Update schema_version to 5
+			$query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
+				try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
-    		    }
-    		}
+				}
+			}
 		return $error;
 	}
 
 	private static function update_from_5() {
-    		$Connection = new Connection();
-    		// Add columns to translation
+			$Connection = new Connection();
+			// Add columns to translation
 		$query = "ALTER TABLE `translation` ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP , ADD `date_modified` timestamp DEFAULT CURRENT_TIMESTAMP ;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
-    		}
-    		// Add aircraft_shadow column to aircraft
-    		$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
-    		}
-    		// Add aircraft_shadow column to spotter_live
-    		$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
-    		// Update table aircraft
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to translation) : ".$e->getMessage()."\n";
+			}
+			// Add aircraft_shadow column to aircraft
+			$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new column to aircraft) : ".$e->getMessage()."\n";
+			}
+			// Add aircraft_shadow column to spotter_live
+			$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
+			}
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/aircraft.sql');
 		$error .= create_db::import_file('../db/spotter_archive.sql');
 
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '6' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_6() {
-    		$Connection = new Connection();
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
-    		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
+			$Connection = new Connection();
+			if (!$Connection->indexExists('spotter_output','flightaware_id')) {
+				$query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
 			ALTER TABLE spotter_output ADD INDEX(date);
 			ALTER TABLE spotter_output ADD INDEX(ident);
 			ALTER TABLE spotter_live ADD INDEX(flightaware_id);
@@ -247,147 +247,147 @@ 
 			ALTER TABLE aircraft ADD INDEX(icao);
 			ALTER TABLE airport ADD INDEX(icao);
 			ALTER TABLE translation ADD INDEX(Operator);";
-        	    try {
-            		$sth = $Connection->db->prepare($query);
+				try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (add some indexes) : ".$e->getMessage()."\n";
-    		    }
-    		}
-    		$error = '';
-    		// Update table countries
-    		if ($Connection->tableExists('airspace')) {
-    		    $error .= update_db::update_countries();
-		    if ($error != '') return $error;
+				}
+			}
+			$error = '';
+			// Update table countries
+			if ($Connection->tableExists('airspace')) {
+				$error .= update_db::update_countries();
+			if ($error != '') return $error;
 		}
 		// Update schema_version to 7
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
-    	}
+		}
 
 	private static function update_from_7() {
 		global $globalDBname, $globalDBdriver;
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
+			$Connection = new Connection();
+			$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
-    		}
-    		if ($globalDBdriver == 'mysql') {
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
-		    try {
-            		$sth = $Connection->db->prepare($query);
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
+			}
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
+			try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
-    		    }
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($row['engine'] == 'ARCHIVE') {
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['engine'] == 'ARCHIVE') {
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
 				ALTER TABLE copy ENGINE=ARCHIVE;
 				ALTER TABLE copy ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
 				INSERT INTO copy SELECT *, '' as pilot_name, '' as pilot_id FROM spotter_archive ORDER BY `spotter_archive_id`;
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
-            	    } else {
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
-            	    }
-                } else {
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
-                }
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
-    		}
+					} else {
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+					}
+				} else {
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+				}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
+			}
 
-    		$error = '';
-    		// Update table aircraft
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/source_location.sql');
 		if ($error != '') return $error;
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_8() {
-    		$Connection = new Connection();
-    		$error = '';
-    		// Update table aircraft
+			$Connection = new Connection();
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/notam.sql');
 		if ($error != '') return $error;
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
                         DELETE FROM config WHERE name = 'last_update_notam_db';
                         INSERT INTO config (name,value) VALUES ('last_update_notam_db',NOW());";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (insert last_update values) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (insert last_update values) : ".$e->getMessage()."\n";
+			}
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_9() {
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
+			$Connection = new Connection();
+			$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
+			}
 		$error = '';
-    		// Update table atc
+			// Update table atc
 		$error .= create_db::import_file('../db/atc.sql');
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_10() {
-    		$Connection = new Connection();
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
-    		}
+			$Connection = new Connection();
+			$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
+			}
 		$error = '';
-    		// Add tables
+			// Add tables
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
 		if ($error != '') return $error;
 		$error .= create_db::import_file('../db/metar.sql');
@@ -398,76 +398,76 @@ 
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_11() {
 		global $globalDBdriver, $globalDBname;
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
-    		}
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		if ($globalDBdriver == 'mysql') {
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
-		    try {
-            		$sth = $Connection->db->prepare($query);
+			$Connection = new Connection();
+			$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
+			try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+			} catch(PDOException $e) {
+			return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
+			}
+			$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
+			}
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+				} catch(PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
-    		    }
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($row['engine'] == 'ARCHIVE') {
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['engine'] == 'ARCHIVE') {
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
 				ALTER TABLE copy ENGINE=ARCHIVE;
 				ALTER TABLE copy ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE;
 				INSERT INTO copy SELECT *, '' as verticalrate, '' as format_source, '0' as ground FROM spotter_archive ORDER BY `spotter_archive_id`;
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
-            	    } else {
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
-            	    }
-                } else {
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
-                }
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
-    		}
+					} else {
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+					}
+				} else {
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+				}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
+			}
 
 		$error = '';
 		
 		$query = "UPDATE `config` SET `value` = '12' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	private static function update_from_12() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
+			// Add tables
 		$error .= create_db::import_file('../db/stats.sql');
 		if ($error != '') return $error;
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
@@ -484,166 +484,166 @@ 
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_13() {
-    		$Connection = new Connection();
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
+			$Connection = new Connection();
+			if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
+				$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-	    		} catch(PDOException $e) {
+				} catch(PDOException $e) {
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
-    			}
+				}
 		}
-    		$error = '';
+			$error = '';
 		$query = "UPDATE `config` SET `value` = '14' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_14() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_flight')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_flight')) {
 			$error .= create_db::import_file('../db/stats_flight.sql');
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 
 	private static function update_from_15() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update stats) : ".$e->getMessage()."\n";
-    		}
+			// Add tables
+			$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update stats) : ".$e->getMessage()."\n";
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_16() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_registration')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_registration')) {
 			$error .= create_db::import_file('../db/stats_registration.sql');
 		}
-    		if (!$Connection->tableExists('stats_callsign')) {
+			if (!$Connection->tableExists('stats_callsign')) {
 			$error .= create_db::import_file('../db/stats_callsign.sql');
 		}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_17() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_country')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_country')) {
 			$error .= create_db::import_file('../db/stats_country.sql');
 		}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	private static function update_from_18() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Modify stats_airport table
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
-    			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
-    	        	try {
-	            	    $sth = $Connection->db->prepare($query);
-			    $sth->execute();
-    			} catch(PDOException $e) {
-			    return "error (update stats) : ".$e->getMessage()."\n";
-    			}
-    		}
+			// Modify stats_airport table
+			if (!$Connection->checkColumnName('stats_airport','airport_name')) {
+				$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
+					try {
+						$sth = $Connection->db->prepare($query);
+				$sth->execute();
+				} catch(PDOException $e) {
+				return "error (update stats) : ".$e->getMessage()."\n";
+				}
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_19() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Update airport table
+			// Update airport table
 		$error .= create_db::import_file('../db/airport.sql');
 		if ($error != '') return 'Import airport.sql : '.$error;
 		// Remove primary key on Spotter_Archive
 		$query = "alter table spotter_archive drop spotter_archive_id";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
+			}
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
+			}
 		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
+				$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
-            			$sth = $Connection->db->prepare($query);
+						$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -651,9 +651,9 @@ 
 		}
 		if (!$Connection->checkColumnName('spotter_live','over_country')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
+				$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
-            			$sth = $Connection->db->prepare($query);
+						$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -661,74 +661,74 @@ 
 		}
 		if (!$Connection->checkColumnName('spotter_output','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
+				$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if (!$Connection->checkColumnName('spotter_live','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
+				$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
+				$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
+				$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_20() {
 		global $globalIVAO, $globalVATSIM, $globalphpVMS;
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Update airline table
-    		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
+			// Update airline table
+			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$error .= create_db::import_file('../db/airlines.sql');
 			if ($error != '') return 'Import airlines.sql : '.$error;
 		}
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
-        		try {
+				$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
+				try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if ($error != '') return $error;
 		/*
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
@@ -738,12 +738,12 @@ 
 		}
 		*/
 		$query = "UPDATE `config` SET `value` = '21' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
@@ -762,35 +762,35 @@ 
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_22() {
 		global $globalDBdriver;
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
 		// Add table stats polar
-    		if (!$Connection->tableExists('stats_source')) {
+			if (!$Connection->tableExists('stats_source')) {
 			if ($globalDBdriver == 'mysql') {
-    				$error .= create_db::import_file('../db/stats_source.sql');
+					$error .= create_db::import_file('../db/stats_source.sql');
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
 			}
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
@@ -821,14 +821,14 @@ 
 		}
 		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
 			// Add aircraft_manufacturer to stats_aircraft
-    			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
+				$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		
 		$query = "UPDATE config SET value = '24' WHERE name = 'schema_version'";
 		try {
@@ -1176,7 +1176,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->checkColumnName('aircraft','mfr')) {
 			// Add mfr to aircraft
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
@@ -1250,7 +1250,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->indexExists('accidents','registration_idx')) {
 			// Add index key
 			$query = "create index registration_idx on accidents (registration)";
@@ -1260,7 +1260,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->indexExists('accidents','rdts')) {
 			// Add index key
 			$query = "create index rdts on accidents (registration,date,type,source)";
@@ -1270,7 +1270,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 
 		$query = "UPDATE config SET value = '31' WHERE name = 'schema_version'";
 		try {
@@ -1360,157 +1360,157 @@ 
 	}
 
 
-    	public static function check_version($update = false) {
-    	    global $globalDBname;
-    	    $version = 0;
-    	    $Connection = new Connection();
-    	    if ($Connection->tableExists('aircraft')) {
-    		if (!$Connection->tableExists('config')) {
-    		    $version = '1';
-    		    if ($update) return self::update_from_1();
-    		    else return $version;
+		public static function check_version($update = false) {
+			global $globalDBname;
+			$version = 0;
+			$Connection = new Connection();
+			if ($Connection->tableExists('aircraft')) {
+			if (!$Connection->tableExists('config')) {
+				$version = '1';
+				if ($update) return self::update_from_1();
+				else return $version;
 		} else {
-    		    $Connection = new Connection();
-		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
-		    try {
-            		$sth = $Connection->db->prepare($query);
-		        $sth->execute();
-		    } catch(PDOException $e) {
+				$Connection = new Connection();
+			$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
+			try {
+					$sth = $Connection->db->prepare($query);
+				$sth->execute();
+			} catch(PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
-    		    }
-    		    $result = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($update) {
-    			if ($result['value'] == '2') {
-    			    $error = self::update_from_2();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '3') {
-    			    $error = self::update_from_3();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '4') {
-    			    $error = self::update_from_4();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '5') {
-    			    $error = self::update_from_5();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '6') {
-    			    $error = self::update_from_6();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '7') {
-    			    $error = self::update_from_7();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '8') {
-    			    $error = self::update_from_8();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '9') {
-    			    $error = self::update_from_9();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '10') {
-    			    $error = self::update_from_10();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '11') {
-    			    $error = self::update_from_11();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '12') {
-    			    $error = self::update_from_12();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '13') {
-    			    $error = self::update_from_13();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '14') {
-    			    $error = self::update_from_14();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '15') {
-    			    $error = self::update_from_15();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '16') {
-    			    $error = self::update_from_16();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '17') {
-    			    $error = self::update_from_17();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '18') {
-    			    $error = self::update_from_18();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '19') {
-    			    $error = self::update_from_19();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '20') {
-    			    $error = self::update_from_20();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '21') {
-    			    $error = self::update_from_21();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '22') {
-    			    $error = self::update_from_22();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '23') {
-    			    $error = self::update_from_23();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '24') {
-    			    $error = self::update_from_24();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '25') {
-    			    $error = self::update_from_25();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '26') {
-    			    $error = self::update_from_26();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '27') {
-    			    $error = self::update_from_27();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '28') {
-    			    $error = self::update_from_28();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '29') {
-    			    $error = self::update_from_29();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '30') {
-    			    $error = self::update_from_30();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '31') {
-    			    $error = self::update_from_31();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '32') {
-    			    $error = self::update_from_32();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} else return '';
-    		    }
-    		    else return $result['value'];
+				}
+				$result = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($update) {
+				if ($result['value'] == '2') {
+					$error = self::update_from_2();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '3') {
+					$error = self::update_from_3();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '4') {
+					$error = self::update_from_4();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '5') {
+					$error = self::update_from_5();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '6') {
+					$error = self::update_from_6();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '7') {
+					$error = self::update_from_7();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '8') {
+					$error = self::update_from_8();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '9') {
+					$error = self::update_from_9();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '10') {
+					$error = self::update_from_10();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '11') {
+					$error = self::update_from_11();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '12') {
+					$error = self::update_from_12();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '13') {
+					$error = self::update_from_13();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '14') {
+					$error = self::update_from_14();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '15') {
+					$error = self::update_from_15();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '16') {
+					$error = self::update_from_16();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '17') {
+					$error = self::update_from_17();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '18') {
+					$error = self::update_from_18();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '19') {
+					$error = self::update_from_19();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '20') {
+					$error = self::update_from_20();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '21') {
+					$error = self::update_from_21();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '22') {
+					$error = self::update_from_22();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '23') {
+					$error = self::update_from_23();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '24') {
+					$error = self::update_from_24();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '25') {
+					$error = self::update_from_25();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '26') {
+					$error = self::update_from_26();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '27') {
+					$error = self::update_from_27();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '28') {
+					$error = self::update_from_28();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '29') {
+					$error = self::update_from_29();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '30') {
+					$error = self::update_from_30();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '31') {
+					$error = self::update_from_31();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '32') {
+					$error = self::update_from_32();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} else return '';
+				}
+				else return $result['value'];
 		}
 		
-	    } else return $version;
-    	}
+		} else return $version;
+		}
     	
 }
 //echo update_schema::check_version();

require/class.Spotter.php

Indentation +1312 added lines, -1312 removed lines

@@ -13,10 +13,10 @@ 
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		$filters = array();
@@ -87,14 +87,14 @@ 
 	}
 
 	/**
-	* Executes the SQL statements to get the spotter information
-	*
-	* @param String $query the SQL query
-	* @param Array $params parameter of the query
-	* @param String $limitQuery the limit query
-	* @return Array the spotter information
-	*
-	*/
+	 * Executes the SQL statements to get the spotter information
+	 *
+	 * @param String $query the SQL query
+	 * @param Array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM;
@@ -258,11 +258,11 @@ 
 					if ($aircraft_array[0]['aircraft_shadow'] != NULL) {
 						$temp_array['aircraft_shadow'] = $aircraft_array[0]['aircraft_shadow'];
 					} else $temp_array['aircraft_shadow'] = 'default.png';
-                                } else {
-                            		$temp_array['aircraft_shadow'] = 'default.png';
+								} else {
+									$temp_array['aircraft_shadow'] = 'default.png';
 					$temp_array['aircraft_name'] = 'N/A';
 					$temp_array['aircraft_manufacturer'] = 'N/A';
-                            	}
+								}
 			}
 			$fromsource = NULL;
 			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
@@ -458,11 +458,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -809,11 +809,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -852,12 +852,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
 	{
 		date_default_timezone_set('UTC');
@@ -885,7 +885,7 @@ 
 				return false;
 			}
 		}
-    		$additional_query = '';
+			$additional_query = '';
 		if ($interval != "")
 		{
 			if (!is_string($interval))
@@ -925,12 +925,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information sorted by the newest aircraft type
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information sorted by the newest aircraft type
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
 	{
 		global $global_query;
@@ -971,11 +971,11 @@ 
     
     
 	/**
-	* Gets all the spotter information sorted by the newest aircraft registration
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest aircraft registration
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAircraftRegistration($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1015,11 +1015,11 @@ 
 
 
 	/**
-	* Gets all the spotter information sorted by the newest airline
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest airline
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
 	{
 		global $global_query;
@@ -1058,12 +1058,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information sorted by the newest departure airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information sorted by the newest departure airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByDepartureAirport($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1105,11 +1105,11 @@ 
 
 
 	/**
-	* Gets all the spotter information sorted by the newest arrival airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest arrival airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByArrivalAirport($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1148,11 +1148,11 @@ 
 	
 
 	/**
-	* Gets all the spotter information based on the spotter id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the spotter id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByID($id = '')
 	{
 		global $global_query;
@@ -1174,11 +1174,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '')
 	{
 		global $global_query;
@@ -1231,11 +1231,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the aircraft type
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the aircraft type
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAircraft($aircraft_type = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1289,11 +1289,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the aircraft registration
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the aircraft registration
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByRegistration($registration = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1350,11 +1350,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the airline
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airline
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1407,11 +1407,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1465,11 +1465,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the date
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the date
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
 	{
 		global $global_query, $globalTimezone, $globalDBdriver;
@@ -1533,11 +1533,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the country name
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the country name
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1591,11 +1591,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the manufacturer name
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the manufacturer name
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByManufacturer($aircraft_manufacturer = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
@@ -1651,13 +1651,13 @@ 
   
   
 	/**
-	* Gets a list of all aircraft that take a route
-	*
-	* @param String $departure_airport_icao ICAO code of departure airport
-	* @param String $arrival_airport_icao ICAO code of arrival airport
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets a list of all aircraft that take a route
+	 *
+	 * @param String $departure_airport_icao ICAO code of departure airport
+	 * @param String $arrival_airport_icao ICAO code of arrival airport
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByRoute($departure_airport_icao = '', $arrival_airport_icao = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
@@ -1726,11 +1726,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the special column in the table
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the special column in the table
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByHighlight($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1769,11 +1769,11 @@ 
 	}
 
 	/**
-	* Gets all the highlight based on a aircraft registration
-	*
-	* @return String the highlight text
-	*
-	*/
+	 * Gets all the highlight based on a aircraft registration
+	 *
+	 * @return String the highlight text
+	 *
+	 */
 	public function getHighlightByRegistration($registration,$filter = array())
 	{
 		global $global_query;
@@ -1795,13 +1795,13 @@ 
 
 	
 	/**
-	* Gets the squawk usage from squawk code
-	*
-	* @param String $squawk squawk code
-	* @param String $country country
-	* @return String usage
-	*
-	*/
+	 * Gets the squawk usage from squawk code
+	 *
+	 * @param String $squawk squawk code
+	 * @param String $country country
+	 * @return String usage
+	 *
+	 */
 	public function getSquawkUsage($squawk = '',$country = 'FR')
 	{
 		
@@ -1822,12 +1822,12 @@ 
 	}
 
 	/**
-	* Gets the airport icao from the iata
-	*
-	* @param String $airport_iata the iata code of the airport
-	* @return String airport iata
-	*
-	*/
+	 * Gets the airport icao from the iata
+	 *
+	 * @param String $airport_iata the iata code of the airport
+	 * @return String airport iata
+	 *
+	 */
 	public function getAirportIcao($airport_iata = '')
 	{
 		
@@ -1847,14 +1847,14 @@ 
 	}
 
 	/**
-	* Gets the airport distance
-	*
-	* @param String $airport_icao the icao code of the airport
-	* @param Float $latitude the latitude
-	* @param Float $longitude the longitude
-	* @return Float distance to the airport
-	*
-	*/
+	 * Gets the airport distance
+	 *
+	 * @param String $airport_icao the icao code of the airport
+	 * @param Float $latitude the latitude
+	 * @param Float $longitude the longitude
+	 * @return Float distance to the airport
+	 *
+	 */
 	public function getAirportDistance($airport_icao,$latitude,$longitude)
 	{
 		
@@ -1875,12 +1875,12 @@ 
 	}
 	
 	/**
-	* Gets the airport info based on the icao
-	*
-	* @param String $airport the icao code of the airport
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airport info based on the icao
+	 *
+	 * @param String $airport the icao code of the airport
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfo($airport = '')
 	{
 		
@@ -1926,12 +1926,12 @@ 
 	}
 	
 	/**
-	* Gets the airport info based on the country
-	*
-	* @param Array $countries Airports countries
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airport info based on the country
+	 *
+	 * @param Array $countries Airports countries
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfobyCountry($countries)
 	{
 		$lst_countries = '';
@@ -1969,12 +1969,12 @@ 
 	}
 	
 	/**
-	* Gets airports info based on the coord
-	*
-	* @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
-	* @return Array airport information
-	*
-	*/
+	 * Gets airports info based on the coord
+	 *
+	 * @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfobyCoord($coord)
 	{
 		global $globalDBdriver;
@@ -2005,12 +2005,12 @@ 
 	}
 
 	/**
-	* Gets waypoints info based on the coord
-	*
-	* @param Array $coord waypoints coord
-	* @return Array airport information
-	*
-	*/
+	 * Gets waypoints info based on the coord
+	 *
+	 * @param Array $coord waypoints coord
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllWaypointsInfobyCoord($coord)
 	{
 		if (is_array($coord)) {
@@ -2044,12 +2044,12 @@ 
 	
 	
 	/**
-	* Gets the airline info based on the icao code or iata code
-	*
-	* @param String $airline_icao the iata code of the airport
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airline info based on the icao code or iata code
+	 *
+	 * @param String $airline_icao the iata code of the airport
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirlineInfo($airline_icao, $fromsource = NULL)
 	{
 		global $globalUseRealAirlines;
@@ -2080,7 +2080,7 @@ 
 			} else {
 				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
 			}
-                        /*
+						/*
 			$airline_array = array();
 			$temp_array = array();
 		
@@ -2110,12 +2110,12 @@ 
 	}
 	
 	/**
-	* Gets the airline info based on the airline name
-	*
-	* @param String $airline_name the name of the airline
-	* @return Array airline information
-	*
-	*/
+	 * Gets the airline info based on the airline name
+	 *
+	 * @param String $airline_name the name of the airline
+	 * @return Array airline information
+	 *
+	 */
 	public function getAllAirlineInfoByName($airline_name, $fromsource = NULL)
 	{
 		global $globalUseRealAirlines;
@@ -2143,12 +2143,12 @@ 
 	
 	
 	/**
-	* Gets the aircraft info based on the aircraft type
-	*
-	* @param String $aircraft_type the aircraft type
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft type
+	 *
+	 * @param String $aircraft_type the aircraft type
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAllAircraftInfo($aircraft_type)
 	{
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2180,12 +2180,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft icao based on the aircraft name/type
-	*
-	* @param String $aircraft_type the aircraft type
-	* @return String aircraft information
-	*
-	*/
+	 * Gets the aircraft icao based on the aircraft name/type
+	 *
+	 * @param String $aircraft_type the aircraft type
+	 * @return String aircraft information
+	 *
+	 */
 	public function getAircraftIcao($aircraft_type)
 	{
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2210,12 +2210,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft info based on the aircraft modes
-	*
-	* @param String $aircraft_modes the aircraft ident (hex)
-	* @return String aircraft type
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft modes
+	 *
+	 * @param String $aircraft_modes the aircraft ident (hex)
+	 * @return String aircraft type
+	 *
+	 */
 	public function getAllAircraftType($aircraft_modes)
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -2233,12 +2233,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft info based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return String aircraft type
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String aircraft type
+	 *
+	 */
 	public function getAllAircraftTypeByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2256,12 +2256,12 @@ 
 	}
 
 	/**
-	* Gets correct aircraft operator corde
-	*
-	* @param String $operator the aircraft operator code (callsign)
-	* @return String aircraft operator code
-	*
-	*/
+	 * Gets correct aircraft operator corde
+	 *
+	 * @param String $operator the aircraft operator code (callsign)
+	 * @return String aircraft operator code
+	 *
+	 */
 	public function getOperator($operator)
 	{
 		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
@@ -2278,16 +2278,16 @@ 
 	}
 
 	/**
-	* Gets the aircraft route based on the aircraft callsign
-	*
-	* @param String $callsign the aircraft callsign
-	* @return Array aircraft type
-	*
-	*/
+	 * Gets the aircraft route based on the aircraft callsign
+	 *
+	 * @param String $callsign the aircraft callsign
+	 * @return Array aircraft type
+	 *
+	 */
 	public function getRouteInfo($callsign)
 	{
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-                if ($callsign == '') return array();
+				if ($callsign == '') return array();
 		$query  = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
 		
 		$sth = $this->db->prepare($query);
@@ -2301,12 +2301,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft info based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAircraftInfoByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2333,12 +2333,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft owner & base based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft owner & base based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAircraftOwnerByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2355,11 +2355,11 @@ 
 	
   
   /**
-	* Gets all flights (but with only little info)
-	*
-	* @return Array basic flight information
-	*
-	*/
+   * Gets all flights (but with only little info)
+   *
+   * @return Array basic flight information
+   *
+   */
 	public function getAllFlightsforSitemap()
 	{
 		//$query  = "SELECT spotter_output.spotter_id, spotter_output.ident, spotter_output.airline_name, spotter_output.aircraft_name, spotter_output.aircraft_icao FROM spotter_output ORDER BY LIMIT ";
@@ -2367,7 +2367,7 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute();
-                  /*
+				  /*
 		$flight_array = array();
 		$temp_array = array();
 		
@@ -2389,11 +2389,11 @@ 
 	}
   
 	/**
-	* Gets a list of all aircraft manufacturers
-	*
-	* @return Array list of aircraft types
-	*
-	*/
+	 * Gets a list of all aircraft manufacturers
+	 *
+	 * @return Array list of aircraft types
+	 *
+	 */
 	public function getAllManufacturers()
 	{
 		/*
@@ -2422,11 +2422,11 @@ 
   
   
   /**
-	* Gets a list of all aircraft types
-	*
-	* @return Array list of aircraft types
-	*
-	*/
+   * Gets a list of all aircraft types
+   *
+   * @return Array list of aircraft types
+   *
+   */
 	public function getAllAircraftTypes($filters = array())
 	{
 		/*
@@ -2461,11 +2461,11 @@ 
 	
 	
 	/**
-	* Gets a list of all aircraft registrations
-	*
-	* @return Array list of aircraft registrations
-	*
-	*/
+	 * Gets a list of all aircraft registrations
+	 *
+	 * @return Array list of aircraft registrations
+	 *
+	 */
 	public function getAllAircraftRegistrations($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2490,12 +2490,12 @@ 
 	}
 
 	/**
-	* Gets all source name
-	*
-	* @param String type format of source
-	* @return Array list of source name
-	*
-	*/
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @return Array list of source name
+	 *
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2526,11 +2526,11 @@ 
 
 
 	/**
-	* Gets a list of all airline names
-	*
-	* @return Array list of airline names
-	*
-	*/
+	 * Gets a list of all airline names
+	 *
+	 * @return Array list of airline names
+	 *
+	 */
 	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
 	{
 		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
@@ -2579,11 +2579,11 @@ 
 	}
 	
 	/**
-	* Gets a list of all alliance names
-	*
-	* @return Array list of alliance names
-	*
-	*/
+	 * Gets a list of all alliance names
+	 *
+	 * @return Array list of alliance names
+	 *
+	 */
 	public function getAllAllianceNames($forsource = NULL,$filters = array())
 	{
 		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
@@ -2608,11 +2608,11 @@ 
 	}
 	
 	/**
-	* Gets a list of all airline countries
-	*
-	* @return Array list of airline countries
-	*
-	*/
+	 * Gets a list of all airline countries
+	 *
+	 * @return Array list of airline countries
+	 *
+	 */
 	public function getAllAirlineCountries($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2640,11 +2640,11 @@ 
 	
 	
 	/**
-	* Gets a list of all departure & arrival names
-	*
-	* @return Array list of airport names
-	*
-	*/
+	 * Gets a list of all departure & arrival names
+	 *
+	 * @return Array list of airport names
+	 *
+	 */
 	public function getAllAirportNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2693,11 +2693,11 @@ 
 	
 	
 	/**
-	* Gets a list of all departure & arrival airport countries
-	*
-	* @return Array list of airport countries
-	*
-	*/
+	 * Gets a list of all departure & arrival airport countries
+	 *
+	 * @return Array list of airport countries
+	 *
+	 */
 	public function getAllAirportCountries($filters = array())
 	{
 		$airport_array = array();
@@ -2745,11 +2745,11 @@ 
 	
 	
 	/**
-	* Gets a list of all countries (airline, departure airport & arrival airport)
-	*
-	* @return Array list of countries
-	*
-	*/
+	 * Gets a list of all countries (airline, departure airport & arrival airport)
+	 *
+	 * @return Array list of countries
+	 *
+	 */
 	public function getAllCountries($filters = array())
 	{
 		$Connection= new Connection($this->db);
@@ -2826,11 +2826,11 @@ 
 	
 	
 	/**
-	* Gets a list of all idents/callsigns
-	*
-	* @return Array list of ident/callsign names
-	*
-	*/
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @return Array list of ident/callsign names
+	 *
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2854,9 +2854,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -2887,9 +2887,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsDepartureByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -2919,9 +2919,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from detected airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from detected airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -2959,9 +2959,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from detected airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from detected airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsDepartureByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3003,9 +3003,9 @@ 
 
 
 	/**
-	* Get a list of flights to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3038,9 +3038,9 @@ 
 
 
 	/**
-	* Get a list of flights detected to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights detected to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3081,9 +3081,9 @@ 
 
 
 	/**
-	* Get a list of flights to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsArrivalByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3115,9 +3115,9 @@ 
 
 
 	/**
-	* Get a list of flights detected to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights detected to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsArrivalByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3161,11 +3161,11 @@ 
 
 
 	/**
-	* Gets a list of all dates
-	*
-	* @return Array list of date names
-	*
-	*/
+	 * Gets a list of all dates
+	 *
+	 * @return Array list of date names
+	 *
+	 */
 	public function getAllDates()
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -3206,11 +3206,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function getAllRoutes()
 	{
 		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao 
@@ -3236,13 +3236,13 @@ 
 	}
 
 	/**
-	* Update ident spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @return String success or false
-	*
-	*/	
+	 * Update ident spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @return String success or false
+	 *
+	 */	
 	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
 	{
 		if (!is_numeric(substr($ident, 0, 3)))
@@ -3263,14 +3263,14 @@ 
 		} else {
 			$airline_array = $this->getAllAirlineInfo("NA");
 		}
-                $airline_name = $airline_array[0]['name'];
-                $airline_icao = $airline_array[0]['icao'];
-                $airline_country = $airline_array[0]['country'];
-                $airline_type = $airline_array[0]['type'];
+				$airline_name = $airline_array[0]['name'];
+				$airline_icao = $airline_array[0]['icao'];
+				$airline_country = $airline_array[0]['country'];
+				$airline_type = $airline_array[0]['type'];
 
 
 		$query = 'UPDATE spotter_output SET ident = :ident, airline_name = :airline_name, airline_icao = :airline_icao, airline_country = :airline_country, airline_type = :airline_type WHERE flightaware_id = :flightaware_id';
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
+				$query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -3283,19 +3283,19 @@ 
 
 	}
 	/**
-	* Update latest spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/	
+	 * Update latest spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */	
 	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
 	{
 		if ($groundspeed == '') $groundspeed = NULL;
 		$query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id';
-                $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
+				$query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -3309,32 +3309,32 @@ 
 	}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @param String $latitude latitude of flight
-	* @param String $longitude latitude of flight
-	* @param String $waypoints waypoints of flight
-	* @param String $altitude altitude of flight
-	* @param String $heading heading of flight
-	* @param String $groundspeed speed of flight
-	* @param String $date date of flight
-	* @param String $departure_airport_time departure time of flight
-	* @param String $arrival_airport_time arrival time of flight
-	* @param String $squawk squawk code of flight
-	* @param String $route_stop route stop of flight
-	* @param String $highlight highlight or not
-	* @param String $ModeS ModesS code of flight
-	* @param String $registration registration code of flight
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
-	* @param String $verticalrate vertival rate of flight
-	* @return String success or false
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $waypoints waypoints of flight
+	 * @param String $altitude altitude of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param String $departure_airport_time departure time of flight
+	 * @param String $arrival_airport_time arrival time of flight
+	 * @param String $squawk squawk code of flight
+	 * @param String $route_stop route stop of flight
+	 * @param String $highlight highlight or not
+	 * @param String $ModeS ModesS code of flight
+	 * @param String $registration registration code of flight
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
+	 * @param String $verticalrate vertival rate of flight
+	 * @return String success or false
+	 */
 	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '')
 	{
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
@@ -3549,8 +3549,8 @@ 
     
 		if ($globalIVAO && $aircraft_icao != '')
 		{
-            		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
-            		else $airline_icao = '';
+					if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
+					else $airline_icao = '';
 			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
 			if (!isset($image_array[0]['registration']))
 			{
@@ -3581,53 +3581,53 @@ 
 	
 		if (count($airline_array) == 0) 
 		{
-                        $airline_array = $this->getAllAirlineInfo('NA');
-                }
-                if (count($aircraft_array) == 0) 
-                {
-                        $aircraft_array = $this->getAllAircraftInfo('NA');
-                }
-                if (count($departure_airport_array) == 0 || $departure_airport_array[0]['icao'] == '' || $departure_airport_icao == '') 
-                {
-                        $departure_airport_array = $this->getAllAirportInfo('NA');
-                }
-                if (count($arrival_airport_array) == 0 || $arrival_airport_array[0]['icao'] == '' || $arrival_airport_icao == '') 
-                {
-                        $arrival_airport_array = $this->getAllAirportInfo('NA');
-                }
-                if ($registration == '') $registration = 'NA';
-                if ($latitude == '' && $longitude == '') {
-            		$latitude = 0;
-            		$longitude = 0;
-            	}
-                if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
-                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                if (!isset($aircraft_owner)) $aircraft_owner = NULL;
-                $query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
+						$airline_array = $this->getAllAirlineInfo('NA');
+				}
+				if (count($aircraft_array) == 0) 
+				{
+						$aircraft_array = $this->getAllAircraftInfo('NA');
+				}
+				if (count($departure_airport_array) == 0 || $departure_airport_array[0]['icao'] == '' || $departure_airport_icao == '') 
+				{
+						$departure_airport_array = $this->getAllAirportInfo('NA');
+				}
+				if (count($arrival_airport_array) == 0 || $arrival_airport_array[0]['icao'] == '' || $arrival_airport_icao == '') 
+				{
+						$arrival_airport_array = $this->getAllAirportInfo('NA');
+				}
+				if ($registration == '') $registration = 'NA';
+				if ($latitude == '' && $longitude == '') {
+					$latitude = 0;
+					$longitude = 0;
+				}
+				if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
+				if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+				if (!isset($aircraft_owner)) $aircraft_owner = NULL;
+				$query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
                 VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)";
 
-                $airline_name = $airline_array[0]['name'];
-                $airline_icao = $airline_array[0]['icao'];
-                $airline_country = $airline_array[0]['country'];
-                $airline_type = $airline_array[0]['type'];
+				$airline_name = $airline_array[0]['name'];
+				$airline_icao = $airline_array[0]['icao'];
+				$airline_country = $airline_array[0]['country'];
+				$airline_type = $airline_array[0]['type'];
 		if ($airline_type == '') {
 			$timeelapsed = microtime(true);
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
 			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 		}
 		if ($airline_type == null) $airline_type = '';
-                $aircraft_type = $aircraft_array[0]['type'];
-                $aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
-                $departure_airport_name = $departure_airport_array[0]['name'];
-	        $departure_airport_city = $departure_airport_array[0]['city'];
-            	$departure_airport_country = $departure_airport_array[0]['country'];
+				$aircraft_type = $aircraft_array[0]['type'];
+				$aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
+				$departure_airport_name = $departure_airport_array[0]['name'];
+			$departure_airport_city = $departure_airport_array[0]['city'];
+				$departure_airport_country = $departure_airport_array[0]['country'];
                 
-                $arrival_airport_name = $arrival_airport_array[0]['name'];
-                $arrival_airport_city = $arrival_airport_array[0]['city'];
-                $arrival_airport_country = $arrival_airport_array[0]['country'];
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
+				$arrival_airport_name = $arrival_airport_array[0]['name'];
+				$arrival_airport_city = $arrival_airport_array[0]['city'];
+				$arrival_airport_country = $arrival_airport_array[0]['country'];
+				$query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
 
 		try {
 		        
@@ -3635,7 +3635,7 @@ 
 			$sth->execute($query_values);
 			$this->db = null;
 		} catch (PDOException $e) {
-		    return "error : ".$e->getMessage();
+			return "error : ".$e->getMessage();
 		}
 		
 		return "success";
@@ -3644,11 +3644,11 @@ 
 	
   
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -3664,11 +3664,11 @@ 
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -3679,11 +3679,11 @@ 
 	
 	
 	/**
-	* Gets the aircraft data from the last 20 seconds
-	*
-	* @return Array the spotter data
-	*
-	*/
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @return Array the spotter data
+	 *
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -3727,11 +3727,11 @@ 
 	
 	
 	 /**
-	* Gets all airlines that have flown over
-	*
-	* @return Array the airline list
-	*
-	*/
+	  * Gets all airlines that have flown over
+	  *
+	  * @return Array the airline list
+	  *
+	  */
 	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -3745,7 +3745,7 @@ 
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
+				if ($sincedate != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
@@ -3772,26 +3772,26 @@ 
 	}
 
 	 /**
-	* Gets all pilots that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all pilots that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
 		 			FROM spotter_output".$filter_query." spotter_output.pilot_id <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3819,25 +3819,25 @@ 
 	}
 	
 		 /**
-	* Gets all pilots that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+		  * Gets all pilots that have flown over
+		  *
+		  * @return Array the pilots list
+		  *
+		  */
 	public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
 	{
 		global $globalDBdriver;
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3866,26 +3866,26 @@ 
 	}
 	
 	 /**
-	* Gets all owner that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all owner that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3911,26 +3911,26 @@ 
 	}
 	
 	 /**
-	* Gets all owner that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all owner that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3957,11 +3957,11 @@ 
 	}
 
 	/**
-	* Gets all airlines that have flown over by aircraft
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by aircraft
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
 	{
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -3993,11 +3993,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by aircraft
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by aircraft
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -4029,11 +4029,11 @@ 
 	
 	
 	/**
-	* Gets all airlines that have flown over by airport
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by airport
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByAirport($airport_icao,$filters = array())
 	{
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -4064,11 +4064,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by airport icao
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by airport icao
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
 	{
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -4098,11 +4098,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by aircraft manufacturer
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4133,11 +4133,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by aircraft manufacturer
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4166,11 +4166,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by date
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by date
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -4214,11 +4214,11 @@ 
 	
 	
 	/**
-	* Gets all airline countries that have flown over by date
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by date
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -4261,11 +4261,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by ident/callsign
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by ident/callsign
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByIdent($ident,$filters = array())
 	{
 		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
@@ -4295,11 +4295,11 @@ 
 	}
 
 	/**
-	* Gets all airlines that have flown over by route
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by route
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4331,11 +4331,11 @@ 
 	}
 
 	/**
-	* Gets all airline countries that have flown over by route
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by route
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4367,11 +4367,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by country
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by country
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByCountry($country,$filters = array())
 	{
 		$country = filter_var($country,FILTER_SANITIZE_STRING);
@@ -4401,11 +4401,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by country
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by country
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4434,11 +4434,11 @@ 
 
 
 	/**
-	* Gets all airlines countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airlines countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountries($limit = true, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4464,11 +4464,11 @@ 
 	}
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -4490,15 +4490,15 @@ 
 		$SpotterLive = new SpotterLive();
 		$filter_query = $SpotterLive->getFilter($filters,true,true);
 		$filter_query .= ' over_country IS NOT NULL';
-                if ($olderthanmonths > 0) {
+				if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
 				$filter_query .= ' AND spotter_live.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$filter_query .= " AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$filter_query .= " AND spotter_live.date > '".$sincedate."' ";
 			} else {
 				$filter_query .= " AND spotter_live.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4528,11 +4528,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft types that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -4575,11 +4575,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by airline
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -4622,11 +4622,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by months
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by months
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -4670,11 +4670,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by aircaft icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by aircaft icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
 	{
 		$Image = new Image($this->db);
@@ -4713,11 +4713,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4746,11 +4746,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4788,11 +4788,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4820,11 +4820,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4853,11 +4853,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by airport icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by airport icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4894,11 +4894,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by airport icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by airport icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4924,11 +4924,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by aircraft manufacturer
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4955,11 +4955,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by aircaft manufacturer
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by aircaft manufacturer
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4995,11 +4995,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by date
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by date
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5041,11 +5041,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by date
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by date
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5096,11 +5096,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by date
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by date
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5142,11 +5142,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by ident/callsign
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5175,11 +5175,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by ident/callsign
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5219,11 +5219,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by ident/callsign
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5249,11 +5249,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by route
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by route
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5282,11 +5282,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by route
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by route
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5328,11 +5328,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by route
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by route
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5366,11 +5366,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft types that have flown over by country
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by country
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5401,11 +5401,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by country
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by country
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5445,11 +5445,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by country
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by country
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5480,17 +5480,17 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturers that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturers that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturers($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
-                $query .= " GROUP BY spotter_output.aircraft_manufacturer
+				$query .= " GROUP BY spotter_output.aircraft_manufacturer
 					ORDER BY aircraft_manufacturer_count DESC
 					LIMIT 10";
       
@@ -5515,11 +5515,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft registrations that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registrations that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -5527,15 +5527,15 @@ 
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
                     FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -5544,7 +5544,7 @@ 
 
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
+				$query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
 		
 		$sth = $this->db->prepare($query);
@@ -5575,11 +5575,11 @@ 
 
 
 	/**
-	* Gets all aircraft registrations that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registrations that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -5587,15 +5587,15 @@ 
 		$Image = new Image($this->db);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -5604,7 +5604,7 @@ 
 
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
 		
 		$sth = $this->db->prepare($query);
@@ -5636,35 +5636,35 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -5688,35 +5688,35 @@ 
 	}
 
 	/**
-	* Gets all departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -5741,37 +5741,37 @@ 
 	}
 
 	/**
-	* Gets all detected departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
 				FROM airport, spotter_output".$filter_query." spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
-    		//echo $query;
+			//echo $query;
 		$sth = $this->db->prepare($query);
 		$sth->execute();
       
@@ -5792,35 +5792,35 @@ 
 	}
 	
 	/**
-	* Gets all detected departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
 				FROM airport, spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -5845,11 +5845,11 @@ 
 	}	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5883,11 +5883,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5918,11 +5918,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5955,11 +5955,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5989,11 +5989,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6026,11 +6026,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6060,11 +6060,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6097,11 +6097,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6132,11 +6132,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6169,11 +6169,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6203,11 +6203,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -6253,11 +6253,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -6300,11 +6300,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a ident/callsign
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a ident/callsign
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6338,11 +6338,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6373,11 +6373,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6411,11 +6411,11 @@ 
 
 
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6445,40 +6445,40 @@ 
 	
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over
-	*
-	* @param Boolean $limit Limit result to 10 or not
-	* @param Integer $olderthanmonths Only show result older than x months
-	* @param String $sincedate Only show result since x date
-	* @param Boolean $icaoaskey Show result by ICAO
-	* @param Array $filters Filter used here
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over
+	 *
+	 * @param Boolean $limit Limit result to 10 or not
+	 * @param Integer $olderthanmonths Only show result older than x months
+	 * @param String $sincedate Only show result since x date
+	 * @param Boolean $icaoaskey Show result by ICAO
+	 * @param Array $filters Filter used here
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 				FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -6507,35 +6507,35 @@ 
 	}
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -6566,34 +6566,34 @@ 
 
 
 	/**
-	* Gets all detected arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
 			FROM airport,spotter_output".$filter_query." spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -6622,35 +6622,35 @@ 
 	}
 	
 	/**
-	* Gets all detected arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
 			FROM airport,spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -6680,11 +6680,11 @@ 
 	}	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6716,11 +6716,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6751,11 +6751,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6789,11 +6789,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6823,11 +6823,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6861,11 +6861,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6896,11 +6896,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an departure airport
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an departure airport
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6933,11 +6933,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6967,11 +6967,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7005,11 +7005,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7040,11 +7040,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7090,11 +7090,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7137,11 +7137,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7174,11 +7174,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7209,11 +7209,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7246,11 +7246,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7281,11 +7281,11 @@ 
 
 
 	/**
-	* Counts all airport departure countries
-	*
-	* @return Array the airport departure list
-	*
-	*/
+	 * Counts all airport departure countries
+	 *
+	 * @return Array the airport departure list
+	 *
+	 */
 	public function countAllDepartureCountries($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7315,11 +7315,11 @@ 
 	
 	
 	/**
-	* Counts all airport arrival countries
-	*
-	* @return Array the airport arrival list
-	*
-	*/
+	 * Counts all airport arrival countries
+	 *
+	 * @return Array the airport arrival list
+	 *
+	 */
 	public function countAllArrivalCountries($limit = true,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7352,11 +7352,11 @@ 
 
 
 	/**
-	* Gets all route combinations
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutes($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7395,11 +7395,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an aircraft
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an aircraft
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7435,11 +7435,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an aircraft registration
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an aircraft registration
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByRegistration($registration, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7477,11 +7477,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an airline
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an airline
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7519,11 +7519,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an airport
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an airport
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7560,11 +7560,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an country
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an country
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByCountry($country, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7600,11 +7600,11 @@ 
 
 
 	/**
-	* Gets all route combinations based on an date
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an date
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7654,11 +7654,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an ident/callsign
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an ident/callsign
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByIdent($ident, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7695,11 +7695,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an manufacturer
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an manufacturer
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7737,11 +7737,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations with waypoints
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations with waypoints
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesWithWaypoints($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7778,11 +7778,11 @@ 
 	}
 	
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -7820,11 +7820,11 @@ 
 	}
 
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
@@ -7865,11 +7865,11 @@ 
 
 
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7914,11 +7914,11 @@ 
 	}
 	
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7963,11 +7963,11 @@ 
 	}	
 	
 	/**
-	* Counts all dates during the last 7 days
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last 7 days
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7989,7 +7989,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -8009,11 +8009,11 @@ 
 	}
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8035,7 +8035,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -8056,11 +8056,11 @@ 
 
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonthByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8083,7 +8083,7 @@ 
 								GROUP BY spotter_output.airline_icao, date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -8105,11 +8105,11 @@ 
 	
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8151,11 +8151,11 @@ 
 	}
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8200,11 +8200,11 @@ 
 	}
 
 	/**
-	* Counts all military month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all military month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMilitaryMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8245,11 +8245,11 @@ 
 	}
 	
 	/**
-	* Counts all month owners
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month owners
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsOwners($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8291,11 +8291,11 @@ 
 	}
 	
 	/**
-	* Counts all month owners
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month owners
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsOwnersByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8338,11 +8338,11 @@ 
 	}
 
 	/**
-	* Counts all month pilot
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month pilot
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsPilots($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8384,11 +8384,11 @@ 
 	}
 	
 	/**
-	* Counts all month pilot
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month pilot
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsPilotsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8431,11 +8431,11 @@ 
 	}
 
 	/**
-	* Counts all month airline
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month airline
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8477,11 +8477,11 @@ 
 	}
 	
 	/**
-	* Counts all month aircraft
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month aircraft
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAircrafts($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8524,11 +8524,11 @@ 
 	
 
 	/**
-	* Counts all month aircraft
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month aircraft
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAircraftsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8571,11 +8571,11 @@ 
 	}
 
 	/**
-	* Counts all month real arrival
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month real arrival
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsRealArrivals($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8618,11 +8618,11 @@ 
 	
 
 	/**
-	* Counts all month real arrival
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month real arrival
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsRealArrivalsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8666,11 +8666,11 @@ 
 	
 
 	/**
-	* Counts all dates during the last year
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last year
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8692,7 +8692,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -8715,11 +8715,11 @@ 
 	
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8780,11 +8780,11 @@ 
 	}
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirlines($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8847,11 +8847,11 @@ 
 
 
 	/**
-	* Counts all hours by airline
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by airline
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirline($airline_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8897,11 +8897,11 @@ 
 	
 	
 	/**
-	* Counts all hours by aircraft
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by aircraft
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8944,11 +8944,11 @@ 
 	
 	
 	/**
-	* Counts all hours by aircraft registration
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by aircraft registration
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByRegistration($registration, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8991,11 +8991,11 @@ 
 	
 	
 	/**
-	* Counts all hours by airport
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by airport
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirport($airport_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9039,11 +9039,11 @@ 
 	
 	
 	/**
-	* Counts all hours by manufacturer
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by manufacturer
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9087,11 +9087,11 @@ 
 	
 	
 	/**
-	* Counts all hours by date
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by date
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9135,11 +9135,11 @@ 
 	
 	
 	/**
-	* Counts all hours by a ident/callsign
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9184,11 +9184,11 @@ 
 	
 	
 	/**
-	* Counts all hours by route
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by route
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9232,11 +9232,11 @@ 
 	
 	
 	/**
-	* Counts all hours by country
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by country
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByCountry($country, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9281,11 +9281,11 @@ 
 
 
 	/**
-	* Counts all aircraft that have flown over
-	*
-	* @return Integer the number of aircrafts
-	*
-	*/
+	 * Counts all aircraft that have flown over
+	 *
+	 * @return Integer the number of aircrafts
+	 *
+	 */
 	public function countOverallAircrafts($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9297,11 +9297,11 @@ 
 	}
 
 	/**
-	* Counts all flight that really arrival
-	*
-	* @return Integer the number of aircrafts
-	*
-	*/
+	 * Counts all flight that really arrival
+	 *
+	 * @return Integer the number of aircrafts
+	 *
+	 */
 	public function countOverallArrival($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9314,11 +9314,11 @@ 
 	}
 
 	/**
-	* Counts all pilots that have flown over
-	*
-	* @return Integer the number of pilots
-	*
-	*/
+	 * Counts all pilots that have flown over
+	 *
+	 * @return Integer the number of pilots
+	 *
+	 */
 	public function countOverallPilots($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9330,11 +9330,11 @@ 
 	}
 
 	/**
-	* Counts all owners that have flown over
-	*
-	* @return Integer the number of owners
-	*
-	*/
+	 * Counts all owners that have flown over
+	 *
+	 * @return Integer the number of owners
+	 *
+	 */
 	public function countOverallOwners($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9347,11 +9347,11 @@ 
 	
 	
 	/**
-	* Counts all flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallFlights($filters = array())
 	{
 		$query  = "SELECT COUNT(spotter_output.spotter_id) AS flight_count  
@@ -9364,11 +9364,11 @@ 
 	}
 	
 	/**
-	* Counts all military flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all military flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallMilitaryFlights($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9383,11 +9383,11 @@ 
 	
 	
 	/**
-	* Counts all airlines that have flown over
-	*
-	* @return Integer the number of airlines
-	*
-	*/
+	 * Counts all airlines that have flown over
+	 *
+	 * @return Integer the number of airlines
+	 *
+	 */
 	public function countOverallAirlines($filters = array())
 	{
 		$query  = "SELECT COUNT(DISTINCT spotter_output.airline_name) AS airline_count 
@@ -9401,11 +9401,11 @@ 
 
   
 	/**
-	* Counts all hours of today
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours of today
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9445,11 +9445,11 @@ 
 	}
     
 	/**
-	* Gets all the spotter information based on calculated upcoming flights
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on calculated upcoming flights
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
 	{
 		global $global_query, $globalDBdriver, $globalTimezone;
@@ -9524,12 +9524,12 @@ 
 	}
     
     
-     /**
-	* Gets the Barrie Spotter ID based on the FlightAware ID
-	*
-	* @return Integer the Barrie Spotter ID
+	 /**
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
+	  *
+	  * @return Integer the Barrie Spotter ID
 q	*
-	*/
+	  */
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
 	{
 		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
@@ -9550,13 +9550,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return Array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return Array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -9592,12 +9592,12 @@ 
 	
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return Array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return Array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -9676,12 +9676,12 @@ 
 	
 	
 	/**
-	* Gets the aircraft registration
-	*
-	* @param String $flightaware_id the flight aware id
-	* @return String the aircraft registration
-	*
-	*/
+	 * Gets the aircraft registration
+	 *
+	 * @param String $flightaware_id the flight aware id
+	 * @return String the aircraft registration
+	 *
+	 */
 	
 	public function getAircraftRegistration($flightaware_id)
 	{
@@ -9710,12 +9710,12 @@ 
 
 
 	/**
-	* Gets the aircraft registration from ModeS
-	*
-	* @param String $aircraft_modes the flight ModeS in hex
-	* @return String the aircraft registration
-	*
-	*/
+	 * Gets the aircraft registration from ModeS
+	 *
+	 * @param String $aircraft_modes the flight ModeS in hex
+	 * @return String the aircraft registration
+	 *
+	 */
 	public function getAircraftRegistrationBymodeS($aircraft_modes)
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -9728,19 +9728,19 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (count($row) > 0) {
-		    //return $row['Registration'];
-		    return $row['registration'];
+			//return $row['Registration'];
+			return $row['registration'];
 		} else return '';
 	
 	}
 
 	/**
-	* Gets the aircraft type from ModeS
-	*
-	* @param String $aircraft_modes the flight ModeS in hex
-	* @return String the aircraft type
-	*
-	*/
+	 * Gets the aircraft type from ModeS
+	 *
+	 * @param String $aircraft_modes the flight ModeS in hex
+	 * @return String the aircraft type
+	 *
+	 */
 	public function getAircraftTypeBymodeS($aircraft_modes)
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -9753,19 +9753,19 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (count($row) > 0) {
-		    if ($row['type_flight'] == null) return '';
-		    else return $row['type_flight'];
+			if ($row['type_flight'] == null) return '';
+			else return $row['type_flight'];
 		} else return '';
 	
 	}
 
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countrie
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countrie
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -9802,11 +9802,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countrie
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countrie
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -9834,12 +9834,12 @@ 
 	}
 
 	/**
-	* converts the registration code using the country prefix
-	*
-	* @param String $registration the aircraft registration
-	* @return String the aircraft registration
-	*
-	*/
+	 * converts the registration code using the country prefix
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the aircraft registration
+	 *
+	 */
 	public function convertAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -9891,12 +9891,12 @@ 
 	}
 
 	/**
-	* Country from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the country
-	*
-	*/
+	 * Country from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the country
+	 *
+	 */
 	public function countryFromAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -9915,8 +9915,8 @@ 
 				$country = $row['country'];
 			}
 		} else {
-    			$registration_1 = substr($registration, 0, 1);
-		        $registration_2 = substr($registration, 0, 2);
+				$registration_1 = substr($registration, 0, 1);
+				$registration_2 = substr($registration, 0, 2);
 
 			$country = '';
 			//first get the prefix based on two characters
@@ -9952,12 +9952,12 @@ 
 	}
 
 	/**
-	* Registration prefix from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the registration prefix
-	*
-	*/
+	 * Registration prefix from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the registration prefix
+	 *
+	 */
 	public function registrationPrefixFromAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -9976,8 +9976,8 @@ 
 				//$country = $row['country'];
 			}
 		} else {
-    			$registration_1 = substr($registration, 0, 1);
-		        $registration_2 = substr($registration, 0, 2);
+				$registration_1 = substr($registration, 0, 1);
+				$registration_2 = substr($registration, 0, 2);
 
 			//first get the prefix based on two characters
 			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
@@ -10013,12 +10013,12 @@ 
 
 
 	/**
-	* Country from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the country
-	*
-	*/
+	 * Country from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the country
+	 *
+	 */
 	public function countryFromAircraftRegistrationCode($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -10035,11 +10035,11 @@ 
 	}
 	
 	/**
-	* Set a new highlight value for a flight
-	*
-	* @param String $flightaware_id flightaware_id from spotter_output table
-	* @param String $highlight New highlight value
-	*/
+	 * Set a new highlight value for a flight
+	 *
+	 * @param String $flightaware_id flightaware_id from spotter_output table
+	 * @param String $highlight New highlight value
+	 */
 	public function setHighlightFlight($flightaware_id,$highlight) {
 		
 		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
@@ -10048,12 +10048,12 @@ 
 	}
 	
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;
@@ -10342,11 +10342,11 @@ 
 			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance 
 	                      FROM airport WHERE longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
-                } else {
+				} else {
 			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance 
 	                      FROM airport WHERE CAST(longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
-    		}
+			}
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 		return $sth->fetchAll(PDO::FETCH_ASSOC);

index.php

Indentation +77 added lines, -77 removed lines

@@ -36,12 +36,12 @@ 
 <div id="showdetails" class="showdetails"></div>
 <div id="infobox" class="infobox"><h4><?php echo _("Aircrafts detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div>
 <?php
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
 
 ?>
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script>
 <?php
-    }
+	}
 ?>
 <div id="dialog" title="<?php echo _("Session has timed-out"); ?>">
   <p><?php echo _("In order to save data consumption web page times out after 30 minutes. Close this dialog to continue."); ?></p>
@@ -55,34 +55,34 @@ 
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
 <?php
 	}
-    }
+	}
 ?>
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
 <?php
-    if (isset($globalMap3D) && $globalMap3D) {
+	if (isset($globalMap3D) && $globalMap3D) {
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 	<li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
 <?php
-        } else {
-    	    if (isset($globalMapSatellites) && $globalMapSatellites) {
+		} else {
+			if (isset($globalMapSatellites) && $globalMapSatellites) {
 ?>
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
 <?php
-	    }
+		}
 ?>
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
 <?php
 	}
-    }
+	}
 ?>
     </ul>
 
@@ -156,7 +156,7 @@ 
 ?>
         </div>
 <?php
-    if (isset($globalArchive) && $globalArchive == TRUE) {
+	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
         <div class="sidebar-pane" id="archive">
 	    <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -216,7 +216,7 @@ 
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
         <div class="sidebar-pane" id="settings">
 	    <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -227,56 +227,56 @@ 
 			    <?php
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
 				else $MapType = $_COOKIE['MapType'];
-			    ?>
+				?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
-			    ?>
+				?>
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
-			        if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
-			    ?>
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+				?>
 			    <?php
-				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
-			    ?>
+					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
+				?>
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <?php
-				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
-			    ?>
+					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
+				?>
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <?php
-				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
-			    ?>
+					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
+				?>
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
 					else $MapBoxId = $_COOKIE['MapTypeId'];
-			    ?>
+				?>
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -290,13 +290,13 @@ 
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
 			</select>
 		    </li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -306,10 +306,10 @@ 
 			</select>
 		    </li>
 <?php
-    }
+	}
 ?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 		    
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
@@ -317,59 +317,59 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 <?php
-    }
+	}
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
-    }
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
+	}
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
 <?php
-    }
+	}
 ?>
 
 		    <?php
 			if (function_exists('array_column')) {
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
-		    ?>
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
+			?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
-			    }
+				}
 			} elseif (isset($globalSources)) {
-			    $dispolar = false;
-			    foreach ($globalSources as $testsource) {
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
-			    }
-			    if ($dispolar) {
-		    ?>
+				$dispolar = false;
+				foreach ($globalSources as $testsource) {
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
+				}
+				if ($dispolar) {
+			?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 
 		    <?php
-		        if (extension_loaded('gd') && function_exists('gd_info')) {
-		    ?>
+				if (extension_loaded('gd') && function_exists('gd_info')) {
+			?>
 		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 			if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
-		    ?>
+			?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
 			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
 			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
@@ -377,7 +377,7 @@ 
 			</div>
 		    </li>
 <?php
-    }
+	}
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -410,16 +410,16 @@ 
 		    <ul>
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
 			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
 			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
 			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
@@ -428,7 +428,7 @@ 
 			<?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines:"); ?>
 		    <br/>
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -448,14 +448,14 @@ 
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			$Spotter = new Spotter();
 			$allalliancenames = $Spotter->getAllAllianceNames();
 			if (!empty($allalliancenames)) {
-		    ?>
+			?>
 		    <li><?php echo _("Display alliance:"); ?>
 		    <br/>
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -469,15 +469,15 @@ 
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (isset($globalAPRS) && $globalAPRS) {
-		    ?>
+			?>
 		    <li><?php echo _("Display APRS sources name:"); ?>
 			<select class="selectpicker" multiple onchange="sources(this);">
 			    <?php
@@ -489,15 +489,15 @@ 
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
 			<select class="selectpicker" onchange="airlinestype(this);">
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -508,7 +508,7 @@ 
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li>
 			<?php echo _("Display flight with ident:"); ?>
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
@@ -521,7 +521,7 @@ 
 	    </form>
     	</div>
 <?php
-    if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
         <div class="sidebar-pane" id="satellites">
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -561,14 +561,14 @@ 
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		</ul>
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>