Ysurac / FlightAirMap

require/class.SpotterLive.php

Indentation +204 added lines, -204 removed lines

@@ -12,10 +12,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();
@@ -83,11 +83,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 getLiveSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -126,11 +126,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -181,11 +181,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -199,7 +199,7 @@ 
 			$query  = 'SELECT a.aircraft_shadow, a.engine_type, a.engine_count, a.wake_category, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
-                } else {
+				} else {
 /*
 			$query  = "SELECT a.aircraft_shadow, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date 
@@ -211,7 +211,7 @@ 
 //			echo $query;
 		}
 
-    		try {
+			try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 		} catch(PDOException $e) {
@@ -223,11 +223,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveSpotterCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -254,11 +254,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -283,11 +283,11 @@ 
 	}
 
 	/**
-	* 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)
 	{
 		$Spotter = new Spotter($this->db);
@@ -297,145 +297,145 @@ 
 				return false;
 			}
 		}
-        if ($lng != '')
-                {
-                        if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+		if ($lng != '')
+				{
+						if (!is_numeric($lng))
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
 		$additional_query = '';
-        if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-			        return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
-        }
-
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
+		if ($interval != '')
+				{
+						if (!is_string($interval))
+						{
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+					return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
+		}
+
+				$query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
                    WHERE spotter_live.latitude <> '' 
                                    AND spotter_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+				$spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataByIdent($ident)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveSpotterDataByIdent($ident,$date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-                $date = date('c',$date);
+				$date = date('c',$date);
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataById($id)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveSpotterDataById($id,$date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets altitude information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAltitudeLiveSpotterDataByIdent($ident)
 	{
 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
+				$query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
 
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -448,12 +448,12 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -481,18 +481,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -506,23 +506,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date";
 			$query  = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date';
-            		//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
+					//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
 		} else {
 			$query  = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -534,18 +534,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -553,8 +553,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -562,20 +562,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['flightaware_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -586,9 +586,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -632,17 +632,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -654,17 +654,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -677,11 +677,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;
@@ -707,14 +707,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -740,14 +740,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by id
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by id
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -773,14 +773,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by ModeS
-	*
-	* @return String the ModeS
-	*
-	*/
+	 * Check recent aircraft by ModeS
+	 *
+	 * @return String the ModeS
+	 *
+	 */
 	public function checkModeSRecent($modes)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -807,19 +807,19 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* 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
-	* @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
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveSpotterData($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 = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -954,10 +954,10 @@ 
 		$arrival_airport_country = '';
 		
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
             	
 		$query  = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, 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, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,: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,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country)';
@@ -967,14 +967,14 @@ 
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-                } catch(PDOException $e) {
-                	return "error : ".$e->getMessage();
-                }
+				} catch(PDOException $e) {
+					return "error : ".$e->getMessage();
+				}
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-		    if ($globalDebug) echo '(Add to SBS archive : ';
-		    $SpotterArchive = new SpotterArchive($this->db);
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+			if ($globalDebug) echo '(Add to SBS archive : ';
+			$SpotterArchive = new SpotterArchive($this->db);
+			$result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
+			if ($globalDebug) echo $result.')';
 		}
 		return "success";
 

install/class.update_db.php

Indentation +404 added lines, -404 removed lines

@@ -75,38 +75,38 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		if ($globalDebug) echo " - Add routes to DB -";
-    		update_db::connect_sqlite($database_file);
+			if ($globalDebug) echo " - Add routes to DB -";
+			update_db::connect_sqlite($database_file);
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,ToAirport_ICAO,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$sth_dest->execute($query_dest_values);
-            		}
+					}
 			if ($globalTransaction) $Connection->db->commit();
 		} catch(PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack(); 
 			return "error : ".$e->getMessage();
 		}
-                return '';
+				return '';
 	}
 	public static function retrieve_route_oneworld($database_file) {
 		global $globalDebug, $globalTransaction;
@@ -117,12 +117,12 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'oneworld'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'oneworld'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+			if ($globalDebug) echo " - Add routes to DB -";
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
 		if ($fh = fopen($database_file,"r")) {
@@ -146,7 +146,7 @@ 
 			}
 			if ($globalTransaction) $Connection->db->commit();
 		}
-                return '';
+				return '';
 	}
 	
 	public static function retrieve_route_skyteam($database_file) {
@@ -158,12 +158,12 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'skyteam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'skyteam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+			if ($globalDebug) echo " - Add routes to DB -";
 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
@@ -189,7 +189,7 @@ 
 				return "error : ".$e->getMessage();
 			}
 		}
-                return '';
+				return '';
 	}
 	public static function retrieve_modes_sqlite_to_dest($database_file) {
 		global $globalTransaction;
@@ -198,27 +198,27 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		update_db::connect_sqlite($database_file);
+			update_db::connect_sqlite($database_file);
 		$query = 'select * from Aircraft';
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 		$query_dest = 'INSERT INTO aircraft_modes (LastModified, ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type,:source)';
 		
@@ -229,17 +229,17 @@ 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 				if ($values['UserString4'] == 'M') $type = 'military';
 				else $type = null;
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
 				$sth_dest->execute($query_dest_values);
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
-				    $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
-				    $sth_dest_owner->execute($query_dest_owner_values);
+					$query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
+					$sth_dest_owner->execute($query_dest_owner_values);
 				}
-            		}
+					}
 			if ($globalTransaction) $Connection->db->commit();
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
@@ -250,10 +250,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -265,10 +265,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -278,26 +278,26 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-            			while (!feof($fh)) {
-            				$values = array();
-            				$line = $Common->hex2str(fgets($fh,9999));
+						while (!feof($fh)) {
+							$values = array();
+							$line = $Common->hex2str(fgets($fh,9999));
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
-            				$values['ModeS'] = substr($line,0,6);
-            				$values['Registration'] = trim(substr($line,69,6));
-            				$aircraft_name = trim(substr($line,48,6));
-            				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
-            				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = substr($line,0,6);
+							$values['Registration'] = trim(substr($line,69,6));
+							$aircraft_name = trim(substr($line,48,6));
+							// Check if we can find ICAO, else set it to GLID
+							$aircraft_name_split = explode(' ',$aircraft_name);
+							$search_more = '';
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
+							$sth_search = $Connection->db->prepare($query_search);
 					try {
-                                    		$sth_search->execute();
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				//if (count($result) > 0) {
-	            				if (isset($result['icao']) && $result['icao'] != '') {
-	            				    $values['ICAOTypeCode'] = $result['icao'];
-	            				} 
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								//if (count($result) > 0) {
+								if (isset($result['icao']) && $result['icao'] != '') {
+									$values['ICAOTypeCode'] = $result['icao'];
+								} 
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -320,10 +320,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -334,10 +334,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -348,24 +348,24 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',',"'");
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',',"'");
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',',"'");
             				
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
 					//print_r($line);
-            				$values['ModeS'] = $line[1];
-            				$values['Registration'] = $line[3];
-            				$aircraft_name = $line[2];
-            				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
-            				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = $line[1];
+							$values['Registration'] = $line[3];
+							$aircraft_name = $line[2];
+							// Check if we can find ICAO, else set it to GLID
+							$aircraft_name_split = explode(' ',$aircraft_name);
+							$search_more = '';
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
+							$sth_search = $Connection->db->prepare($query_search);
 					try {
-                                    		$sth_search->execute();
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -388,10 +388,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -402,10 +402,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -416,95 +416,95 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',','"');
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',','"');
-            				$values = array();
-            				//print_r($line);
-            				if ($country == 'F') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = $line[4];
-            				    $values['owner'] = $line[5];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
-					    $values['cancel'] = $line[7];
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',','"');
+							$values = array();
+							//print_r($line);
+							if ($country == 'F') {
+								$values['registration'] = $line[0];
+								$values['base'] = $line[4];
+								$values['owner'] = $line[5];
+								if ($line[6] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+						$values['cancel'] = $line[7];
 					} elseif ($country == 'EI') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = $line[3];
-            				    $values['owner'] = $line[2];
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = $line[3];
+								$values['owner'] = $line[2];
+								if ($line[1] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+						$values['cancel'] = '';
 					} elseif ($country == 'HB') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[5];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[5];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'OK') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[3];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[5];
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[3];
+								$values['base'] = null;
+								$values['owner'] = $line[5];
+								if ($line[18] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+						$values['cancel'] = '';
 					} elseif ($country == 'VH') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[12];
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
-
-					    $values['cancel'] = $line[39];
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[12];
+								if ($line[28] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+
+						$values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'CC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[6];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[6];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'HJ') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[8];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[8];
+								if ($line[7] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+						$values['cancel'] = '';
 					} elseif ($country == 'PP') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
-					    $values['cancel'] = $line[7];
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								if ($line[6] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+						$values['cancel'] = $line[7];
 					} elseif ($country == 'E7') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								if ($line[5] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+						$values['cancel'] = '';
 					} elseif ($country == '8Q') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[3];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[3];
+								if ($line[7] == '') $values['date_first_reg'] = null;
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+						$values['cancel'] = '';
 					} elseif ($country == 'ZK' || $country == 'OM' || $country == 'TF') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[3];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[3];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					}
 					if ($values['cancel'] == '' && $values['registration'] != null) {
 						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
@@ -626,20 +626,20 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		$query = 'ALTER TABLE airport DROP INDEX icaoidx';
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$query_dest = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image_thumb`,`image`)
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
@@ -705,10 +705,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		if ($globalDebug) echo "Insert Not available Airport...\n";
@@ -718,10 +718,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$i++;
 /*
 		$query = 'DELETE FROM airport WHERE airport_id IN (SELECT * FROM (SELECT min(a.airport_id) FROM airport a GROUP BY a.icao) x)';
@@ -835,7 +835,7 @@ 
 
 
 
-                return "success";
+				return "success";
 	}
 	
 	public static function translation() {
@@ -851,10 +851,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'translation.csv'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'translation.csv'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -873,21 +873,21 @@ 
 					$data = $row;
 					$operator = $data[2];
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
-                                                //echo substr($operator, 0, 2)."\n";;
-                                                if (count($airline_array) > 0) {
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
+												//echo substr($operator, 0, 2)."\n";;
+												if (count($airline_array) > 0) {
 							//print_r($airline_array);
 							$operator = $airline_array[0]['icao'].substr($operator,2);
-                                                }
-                                        }
+												}
+										}
 					
 					$operator_correct = $data[3];
 					if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
-                                                if (count($airline_array) > 0) {
-                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
-                                            	}
-                                        }
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
+												if (count($airline_array) > 0) {
+													$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
+												}
+										}
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -901,7 +901,7 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function translation_fam() {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -911,10 +911,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -943,7 +943,7 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function modes_faa() {
 		global $tmp_dir, $globalTransaction;
@@ -951,19 +951,19 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_faa'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source = :source";
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_faa'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_faa'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//$aircrafts_icao = array('7102811' => 'P28R',...
@@ -1001,17 +1001,17 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	public static function modes_fam() {
 		global $tmp_dir, $globalTransaction;
 		$query = "DELETE FROM aircraft_modes WHERE Source = '' OR Source = :source";
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -1040,7 +1040,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
         
 	public static function owner_fam() {
 		global $tmp_dir, $globalTransaction;
@@ -1048,10 +1048,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$delimiter = "\t";
 		$Connection = new Connection();
@@ -1077,7 +1077,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function routes_fam() {
 		global $tmp_dir, $globalTransaction;
@@ -1085,10 +1085,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -1117,7 +1117,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function tle($filename,$tletype) {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -1128,10 +1128,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $filename));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $filename));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		$Connection = new Connection();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
@@ -1166,54 +1166,54 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	/**
-        * Convert a HTML table to an array
-        * @param String $data HTML page
-        * @return Array array of the tables in HTML page
-        */
-        private static function table2array($data) {
-                $html = str_get_html($data);
-                $tabledata=array();
-                foreach($html->find('tr') as $element)
-                {
-                        $td = array();
-                        foreach( $element->find('th') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                        }
-                        $td=array_filter($td);
-                        $tabledata[] = $td;
-
-                        $td = array();
-                        $tdi = array();
-                        foreach( $element->find('td') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                                $tdi [] = trim($row->innertext);
-                        }
-                        $td=array_filter($td);
-                        $tdi=array_filter($tdi);
-                    //    $tabledata[]=array_merge($td,$tdi);
-                        $tabledata[]=$td;
-                }
-                return(array_filter($tabledata));
-        }
-
-       /**
-        * Get data from form result
-        * @param String $url form URL
-        * @return String the result
-        */
-        private static function getData($url) {
-                $ch = curl_init();
-                curl_setopt($ch, CURLOPT_URL, $url);
-                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-                curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
-                return curl_exec($ch);
-        }
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
+		private static function table2array($data) {
+				$html = str_get_html($data);
+				$tabledata=array();
+				foreach($html->find('tr') as $element)
+				{
+						$td = array();
+						foreach( $element->find('th') as $row)
+						{
+								$td [] = trim($row->plaintext);
+						}
+						$td=array_filter($td);
+						$tabledata[] = $td;
+
+						$td = array();
+						$tdi = array();
+						foreach( $element->find('td') as $row)
+						{
+								$td [] = trim($row->plaintext);
+								$tdi [] = trim($row->innertext);
+						}
+						$td=array_filter($td);
+						$tdi=array_filter($tdi);
+					//    $tabledata[]=array_merge($td,$tdi);
+						$tabledata[]=$td;
+				}
+				return(array_filter($tabledata));
+		}
+
+	   /**
+	    * Get data from form result
+	    * @param String $url form URL
+	    * @return String the result
+	    */
+		private static function getData($url) {
+				$ch = curl_init();
+				curl_setopt($ch, CURLOPT_URL, $url);
+				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+				curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
+				return curl_exec($ch);
+		}
 /*
 	public static function waypoints() {
 		$data = update_db::getData('http://www.fallingrain.com/world/FR/waypoints.html');
@@ -1296,7 +1296,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function ivao_airlines($filename) {
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -1306,10 +1306,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$header = NULL;
 		$delimiter = ':';
@@ -1333,7 +1333,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function update_airspace() {
 		global $tmp_dir, $globalDBdriver;
@@ -1343,11 +1343,11 @@ 
 			$query = 'DROP TABLE airspace';
 			try {
 				$sth = $Connection->db->prepare($query);
-                    		$sth->execute();
-	                } catch(PDOException $e) {
+							$sth->execute();
+					} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
-	                }
-	        }
+					}
+			}
 
 
 		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
@@ -1402,10 +1402,10 @@ 
 			$query = 'DROP TABLE countries';
 			try {
 				$sth = $Connection->db->prepare($query);
-            	        	$sth->execute();
-	                } catch(PDOException $e) {
-    	                	echo "error : ".$e->getMessage();
-	                }
+							$sth->execute();
+					} catch(PDOException $e) {
+							echo "error : ".$e->getMessage();
+					}
 		}
 		if ($globalDBdriver == 'mysql') {
 			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
@@ -1865,11 +1865,11 @@ 
 						$query = 'DROP TABLE airspace';
 						try {
 							$sth = $Connection->db->prepare($query);
-    	    	    					$sth->execute();
-			            		} catch(PDOException $e) {
+										$sth->execute();
+								} catch(PDOException $e) {
 							return "error : ".$e->getMessage();
-		            			}
-		    			}
+								}
+						}
 					$error = create_db::import_file($tmp_dir.'airspace.sql');
 					update_db::insert_airspace_version($airspace_md5);
 				} else $error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
@@ -1989,12 +1989,12 @@ 
 		echo $data;
 		*/
 		if (file_exists($tmp_dir.'aircrafts.html')) {
-		    //var_dump(file_get_html($tmp_dir.'aircrafts.html'));
-		    $fh = fopen($tmp_dir.'aircrafts.html',"r");
-		    $result = fread($fh,100000000);
-		    //echo $result;
-		    //var_dump(str_get_html($result));
-		    //print_r(self::table2array($result));
+			//var_dump(file_get_html($tmp_dir.'aircrafts.html'));
+			$fh = fopen($tmp_dir.'aircrafts.html',"r");
+			$result = fread($fh,100000000);
+			//echo $result;
+			//var_dump(str_get_html($result));
+			//print_r(self::table2array($result));
 		}
 
 	}
@@ -2008,10 +2008,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$error = '';
 		if ($globalDebug) echo "Notam : Download...";
@@ -2067,8 +2067,8 @@ 
 					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
 					$data['permanent'] = 0;
 				} else {
-				    $data['date_end'] = NULL;
-				    $data['permanent'] = 1;
+					$data['date_end'] = NULL;
+					$data['permanent'] = 1;
 				}
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
 				$NOTAM = new NOTAM();
@@ -2127,13 +2127,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_update() {
@@ -2142,10 +2142,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_airspace_version($version) {
@@ -2153,13 +2153,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+						$sth->execute(array(':version' => $version));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return true;
+				else return false;
 	}
 
 
@@ -2169,10 +2169,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':version' => $version));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':version' => $version));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_notam_update() {
@@ -2185,13 +2185,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_notam_update() {
@@ -2200,10 +2200,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function check_last_airspace_update() {
 		global $globalDBdriver;
@@ -2215,13 +2215,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_airspace_update() {
@@ -2230,10 +2230,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_owner_update() {
@@ -2246,13 +2246,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_owner_update() {
@@ -2261,10 +2261,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function check_last_schedules_update() {
 		global $globalDBdriver;
@@ -2276,13 +2276,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_schedules_update() {
@@ -2291,10 +2291,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function check_last_tle_update() {
 		global $globalDBdriver;
@@ -2306,13 +2306,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_tle_update() {
@@ -2321,10 +2321,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function delete_duplicatemodes() {
 		global $globalDBdriver;
@@ -2336,10 +2336,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	public static function delete_duplicateowner() {
 		global $globalDBdriver;
@@ -2351,10 +2351,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	
 	public static function update_all() {

table-output.php

Indentation +25 added lines, -25 removed lines

@@ -388,17 +388,17 @@ 
 				else {
 					$planespotter_url_array = explode("_", $spotter_item['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
-                                        $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
+										$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 				}
 				if (isset($spotter_item['airline_name'])) {
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				}
-                        } else {
-                    		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+						} else {
+							if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
+							$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+							} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
@@ -413,7 +413,7 @@ 
 		}
 	} elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest"){
 		if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) {
-		    $spotter_item['squawk'] = '-';
+			$spotter_item['squawk'] = '-';
 		}
 		if ($spotter_item['image_thumbnail'] != "")
 		{
@@ -424,7 +424,7 @@ 
 				else {
 					$planespotter_url_array = explode("_", $spotter_array[0]['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
-                                        $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
+										$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 				}
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -436,9 +436,9 @@ 
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				}
 			} else {
-                    		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+							if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
+							$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+							} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -452,7 +452,7 @@ 
 			print '</td>'."\n";
 		} else {
 			print '<td class="aircraft_thumbnail">'."\n";
-       //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
+	   //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
 	//}
 			if (!isset($spotter_item['airline_name']) && !isset($spotter_item['aircraft_name'])) {
 				print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '._("Not available").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n";
@@ -557,13 +557,13 @@ 
 				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
 			} else $distance = '';
 			if ($distance != '') {
-			    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-				    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
-			    } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-				    echo '<br/><i>'.round($distance*0.621371).' mi</i>';
-			    } elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
-				    echo '<br/><i>'.$distance.' km</i>';
-			    }
+				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+					echo '<br/><i>'.round($distance*0.539957).' nm</i>';
+				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+					echo '<br/><i>'.round($distance*0.621371).' mi</i>';
+				} elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+					echo '<br/><i>'.$distance.' km</i>';
+				}
 			}
 		}
 		print '</td>'."\n";
@@ -624,13 +624,13 @@ 
 				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
 			} else $distance = '';
 				if ($distance != '') {
-				    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
-				    } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					    echo '<br/><i>'.round($distance*0.621371).' mi</i>';
-				    } elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
-					    echo '<br/><i>'.$distance.' km</i>';
-				    }
+					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+						echo '<br/><i>'.round($distance*0.539957).' nm</i>';
+					} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+						echo '<br/><i>'.round($distance*0.621371).' mi</i>';
+					} elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+						echo '<br/><i>'.$distance.' km</i>';
+					}
 				}
 			}
 			print '</td>'."\n";

require/class.ATC.php

Indentation +73 added lines, -73 removed lines

@@ -10,100 +10,100 @@
 	}
 	
 	
-    /**
-    * 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) {
+	/**
+	 * 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;
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
-	    if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
+		if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 		foreach($globalStatsFilters[$globalFilterName] as $source) {
 			if (isset($source['source'])) $filter['source'][] = $source['source'];
 		}
-	    } else {
+		} else {
 		$filter = $globalStatsFilters[$globalFilterName];
-	    }
+		}
 	}
 	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
 	$filter_query_join = '';
 	$filter_query_where = '';
 	if (isset($filter['source']) && !empty($filter['source'])) {
-	    $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
+		$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
 	}
 	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 	$filter_query = $filter_query_join.$filter_query_where;
 	return $filter_query;
-    }
+	}
 
-       public function getAll() {
-    		$filter_query = $this->getFilter(array());
-                $query = "SELECT * FROM atc".$filter_query;
-                $query_values = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+	   public function getAll() {
+			$filter_query = $this->getFilter(array());
+				$query = "SELECT * FROM atc".$filter_query;
+				$query_values = array();
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 
-       public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
-    		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-    		$info = str_replace('^','<br />',$info);
-    		$info = str_replace('&amp;sect;','',$info);
-    		$info = str_replace('"','',$info);
-    		if ($type == '') $type = NULL;
-                $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
-                $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
+			$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
+			$info = str_replace('^','<br />',$info);
+			$info = str_replace('&amp;sect;','',$info);
+			$info = str_replace('"','',$info);
+			if ($type == '') $type = NULL;
+				$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
+				$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteById($id) {
-                $query = "DELETE FROM atc WHERE atc_id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteById($id) {
+				$query = "DELETE FROM atc WHERE atc_id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteAll() {
-                $query = "DELETE FROM atc";
-                $query_values = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteAll() {
+				$query = "DELETE FROM atc";
+				$query_values = array();
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 	public function deleteOldATC() {
-                global $globalDBdriver;
-                if ($globalDBdriver == 'mysql') {
-                        $query  = "DELETE FROM atc WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= atc.atc_lastseen";
-                } else {
-                        $query  = "DELETE FROM atc WHERE NOW() AT TIME ZONE 'UTC' - '1 HOUR'->INTERVAL >= atc.atc_lastseen";
-                }
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error";
-                }
-                return "success";
-        }
+				global $globalDBdriver;
+				if ($globalDBdriver == 'mysql') {
+						$query  = "DELETE FROM atc WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= atc.atc_lastseen";
+				} else {
+						$query  = "DELETE FROM atc WHERE NOW() AT TIME ZONE 'UTC' - '1 HOUR'->INTERVAL >= atc.atc_lastseen";
+				}
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error";
+				}
+				return "success";
+		}
 }
 ?>
\ No newline at end of file

header.php

Indentation +46 added lines, -46 removed lines

@@ -28,7 +28,7 @@ 
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
 	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+		return strpos($key,'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
@@ -167,16 +167,16 @@ 
 	}
 ?>
 <?php 
-    if (isset($_POST['archive'])) {
+	if (isset($_POST['archive'])) {
 ?>
 <?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 print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script>
 <?php    
-	    }
-    } else {
+		}
+	} else {
 ?>
 <?php
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -188,7 +188,7 @@ 
 */
 ?>
 <?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($globalBeta) && $globalBeta) {
@@ -199,13 +199,13 @@ 
 ?>
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>"></script>
 <?php
-	    }
+		}
 ?>
 <?php
 //	}
 ?>
 <?php
-    }
+	}
 }
 ?>
 <?php
@@ -365,32 +365,32 @@ 
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
             <?php
-        	if ($globalACARS) {
-        	    if (isset($globalDemo) && $globalDemo) {
-    	    ?>
+			if ($globalACARS) {
+				if (isset($globalDemo) && $globalDemo) {
+			?>
             <li><hr /></li>
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
             <?php
-        	    } else {
-    	    ?>
+				} else {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
             <?php
-        	    }
-        	}
-    	    ?>
+				}
+			}
+			?>
     	    <?php
-    	        if (isset($globalAccidents) && $globalAccidents) {
-    	    ?>
+				if (isset($globalAccidents) && $globalAccidents) {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident messages"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident messages"); ?></a></li>
             <?php
-        	}
-    	    ?>
+			}
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -432,14 +432,14 @@ 
   	    <form>
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
   		    <?php
-  		        $Language = new Language();
-  		        $alllang = $Language->getLanguages();
-  		        foreach ($alllang as $key => $lang) {
-  		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
-  		            print '>'.$lang[0].'</option>';
-  		        }
-  		    ?>
+  				$Language = new Language();
+  				$alllang = $Language->getLanguages();
+  				foreach ($alllang as $key => $lang) {
+  					print '<option value="'.$key.'"';
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  					print '>'.$lang[0].'</option>';
+  				}
+  			?>
   		</select>
   	    </form>
   	</div>
@@ -470,18 +470,18 @@ 
 ?>
     <div class="top-header clear" role="main">
 <?php
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
 ?>
     <div id="archive-map"></div>
 <?php
-    }
+	}
 ?>
     </div>
 <?php
 }
 if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
 {
-    ?>
+	?>
     <div class="top-header clear" role="main">
         <div id="map"></div>
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -492,15 +492,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -508,22 +508,22 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    }
+	}
 ?>
   //initialize the layer group for the aircrft markers
   var layer_data = L.layerGroup();
 
   //a few title layers
 <?php
-    if ($globalMapProvider == 'Mapbox') {
+	if ($globalMapProvider == 'Mapbox') {
 ?>
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
     maxZoom: 18,
@@ -534,7 +534,7 @@ 
     token : '<?php print $globalMapboxToken; ?>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'OpenStreetMap') {
+	} elseif ($globalMapProvider == 'OpenStreetMap') {
 ?>
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -542,7 +542,7 @@ 
       '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -551,7 +551,7 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -560,27 +560,27 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
 ?>
     var googleLayer = new L.Google('ROADMAP');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Satellite') {
+	} elseif ($globalMapProvider == 'Google-Satellite') {
 ?>
     var googleLayer = new L.Google('SATELLITE');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
 ?>
     var googleLayer = new L.Google('HYBRID');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Terrain') {
+	} elseif ($globalMapProvider == 'Google-Terrain') {
 ?>
     var googleLayer = new L.Google('Terrain');
     map.addLayer(googleLayer);
 <?php
-    }
+	}
 ?>
         </script>
     </div>

require/class.METAR.php

Indentation +261 added lines, -261 removed lines

@@ -7,109 +7,109 @@ 
 	public $db;
 	
 	protected $texts = Array(
-	    'MI' => 'Shallow',
-	    'PR' => 'Partial',
-	    'BC' => 'Low drifting',
-	    'BL' => 'Blowing',
-	    'SH' => 'Showers',
-	    'TS' => 'Thunderstorm',
-	    'FZ' => 'Freezing',
-	    'DZ' => 'Drizzle',
-	    'RA' => 'Rain',
-	    'SN' => 'Snow',
-	    'SG' => 'Snow Grains',
-	    'IC' => 'Ice crystals',
-	    'PL' => 'Ice pellets',
-	    'GR' => 'Hail',
-	    'GS' => 'Small hail',
-	    'UP' => 'Unknown',
-	    'BR' => 'Mist',
-	    'FG' => 'Fog',
-	    'FU' => 'Smoke',
-	    'VA' => 'Volcanic ash',
-	    'DU' => 'Widespread dust',
-	    'SA' => 'Sand',
-	    'HZ' => 'Haze',
-	    'PY' => 'Spray',
-	    'PO' => 'Well developed dust / sand whirls',
-	    'SQ' => 'Squalls',
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
-	    'SS' => 'Sandstorm',
-	    'DS' => 'Duststorm'
+		'MI' => 'Shallow',
+		'PR' => 'Partial',
+		'BC' => 'Low drifting',
+		'BL' => 'Blowing',
+		'SH' => 'Showers',
+		'TS' => 'Thunderstorm',
+		'FZ' => 'Freezing',
+		'DZ' => 'Drizzle',
+		'RA' => 'Rain',
+		'SN' => 'Snow',
+		'SG' => 'Snow Grains',
+		'IC' => 'Ice crystals',
+		'PL' => 'Ice pellets',
+		'GR' => 'Hail',
+		'GS' => 'Small hail',
+		'UP' => 'Unknown',
+		'BR' => 'Mist',
+		'FG' => 'Fog',
+		'FU' => 'Smoke',
+		'VA' => 'Volcanic ash',
+		'DU' => 'Widespread dust',
+		'SA' => 'Sand',
+		'HZ' => 'Haze',
+		'PY' => 'Spray',
+		'PO' => 'Well developed dust / sand whirls',
+		'SQ' => 'Squalls',
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
+		'SS' => 'Sandstorm',
+		'DS' => 'Duststorm'
 	);
 	
 	public function __construct($dbc = null) {
-                $Connection = new Connection($dbc);
-                $this->db = $Connection->db;
-        }
+				$Connection = new Connection($dbc);
+				$this->db = $Connection->db;
+		}
 
-       public static function check_last_update() {
-    		global $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
+	   public static function check_last_update() {
+			global $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value > DATE_SUB(NOW(), INTERVAL 20 MINUTE)";
 		} else {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value::timestamp > CURRENT_TIMESTAMP - INTERVAL '20 MINUTES'";
 		}
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                $sth->closeCursor();
-                if ($row['nb'] > 0) return false;
-                else return true;
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				$sth->closeCursor();
+				if ($row['nb'] > 0) return false;
+				else return true;
+		}
 
-        public static function insert_last_update() {
-                $query = "DELETE FROM config WHERE name = 'last_update_metar';
+		public static function insert_last_update() {
+				$query = "DELETE FROM config WHERE name = 'last_update_metar';
                         INSERT INTO config (name,value) VALUES ('last_update_metar',NOW());";
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 
         
-        public function parse($data) {
-    		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
-    		$codes = implode('|', array_keys($this->texts));
-    		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
-    		//$pieces = explode(' ',$data);
-    		$pieces = preg_split('/\s/',$data);
-    		$pos = 0;
-    		if ($pieces[0] == 'METAR') $pos++;
-    		elseif ($pieces[0] == 'SPECI') $pos++;
-    		if (strlen($pieces[$pos]) != 4) $pos++;
-    		$result = array();
-    		$result['location'] = $pieces[$pos];
-    		$pos++;
-    		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-    		$result['time'] = substr($pieces[$pos],2,4);
-    		$c = count($pieces);
-    		for($pos++; $pos < $c; $pos++) {
-    			$piece = $pieces[$pos];
-    			if ($piece == 'RMK') break;
-    			if ($piece == 'AUTO') $result['auto'] = true;
-    			if ($piece == 'COR') $result['correction'] = true;
-    			// Wind Speed
-    			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-    				$result['wind']['direction'] = (float)$matches[1];
+		public function parse($data) {
+			//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
+			$codes = implode('|', array_keys($this->texts));
+			$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+			//$pieces = explode(' ',$data);
+			$pieces = preg_split('/\s/',$data);
+			$pos = 0;
+			if ($pieces[0] == 'METAR') $pos++;
+			elseif ($pieces[0] == 'SPECI') $pos++;
+			if (strlen($pieces[$pos]) != 4) $pos++;
+			$result = array();
+			$result['location'] = $pieces[$pos];
+			$pos++;
+			$result['dayofmonth'] = substr($pieces[$pos],0,2);
+			$result['time'] = substr($pieces[$pos],2,4);
+			$c = count($pieces);
+			for($pos++; $pos < $c; $pos++) {
+				$piece = $pieces[$pos];
+				if ($piece == 'RMK') break;
+				if ($piece == 'AUTO') $result['auto'] = true;
+				if ($piece == 'COR') $result['correction'] = true;
+				// Wind Speed
+				if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
+					$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+					if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+					elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+					elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
 				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
-    			}
+				}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
     				$result['wind_direction'] = (float)$matches[1];
@@ -126,35 +126,35 @@ 
     				}
     			}
     			*/
-    			// Temperature
-    			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-    				$temp = (float)$matches[1];
+				// Temperature
+				if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
+					$temp = (float)$matches[1];
 				if ($matches[1]{0} == 'M') {
 					$temp = ((float)substr($matches[1], 1)) * -1;
 				}
-    				$result['temperature'] = $temp;
-    				$dew = (float)$matches[2];
+					$result['temperature'] = $temp;
+					$dew = (float)$matches[2];
 				if ($matches[2]{0} == 'M') {
 					$dew = ((float)substr($matches[2], 1)) * -1;
 				}
 				$result['dew'] = $dew;
-    			}
-    			// QNH
-    			if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
-    			// #^(Q|A)(////|[0-9]{4})( )#
-    				if ($matches[1] == 'Q') {
-    					// hPa
-    					$result['QNH'] = $matches[2];
-    				} else {
-    					// inHg
-    					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
 				}
-    				/*
+				// QNH
+				if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
+				// #^(Q|A)(////|[0-9]{4})( )#
+					if ($matches[1] == 'Q') {
+						// hPa
+						$result['QNH'] = $matches[2];
+					} else {
+						// inHg
+						$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+				}
+					/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
     				*/
-    			}
-                     /*
+				}
+					 /*
     			// Wind Direction
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
     				$result['wind_direction'] = $matches[1];
@@ -165,9 +165,9 @@ 
     				$result['speed_variable'] = $matches[1];
     			}
     			*/
-    			// Visibility
-    			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
-    				if (isset($matches[3]) && strlen($matches[3]) > 0) {
+				// Visibility
+				if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
+					if (isset($matches[3]) && strlen($matches[3]) > 0) {
 					$result['visibility'] = (float)$matches[3] * 1609.34;
 				} else {
 					if ($matches[1] == '9999') {
@@ -180,28 +180,28 @@ 
 					$result['visibility'] = '> 10000';
 					$result['weather'] = "CAVOK";
 				}
-    			}
-    			// Cloud Coverage
-    			if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
-    				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
-    				$type = $matches[1];
-    				$cloud = array();
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
-    				$cloud['type_code'] = $type;
-    				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
-    				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
-    				$result['cloud'][] = $cloud;
-    			}
-    			// RVR
-    			 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
-    				$rvr = array();
+				}
+				// Cloud Coverage
+				if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
+					//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
+					$type = $matches[1];
+					$cloud = array();
+					if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
+					elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
+					elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
+					elseif ($type == 'FEW') $cloud['type'] = 'Few';
+					elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
+					elseif ($type == 'BKN') $cloud['type'] = 'Broken';
+					elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
+					elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+					$cloud['type_code'] = $type;
+					$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+					$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
+					$result['cloud'][] = $cloud;
+				}
+				// RVR
+				 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
+					$rvr = array();
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
@@ -210,33 +210,33 @@ 
 				$result['RVR'] = $rvr;
 			}
     			
-    			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    			if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
-    				//print_r($matches);
-    				// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
-    				$result['RVR']['runway'] = $matches[1];
-        			$result['RVR']['deposits'] = $matches[2];
-        			$result['RVR']['extent'] = $matches[3];
-        			$result['RVR']['depth'] = $matches[4];
-        			$result['RVR']['friction'] = $matches[5];
-    			}
-    			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    				//echo $piece;
-    				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+				if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
+					//print_r($matches);
+					// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
+					$result['RVR']['runway'] = $matches[1];
+					$result['RVR']['deposits'] = $matches[2];
+					$result['RVR']['extent'] = $matches[3];
+					$result['RVR']['depth'] = $matches[4];
+					$result['RVR']['friction'] = $matches[5];
+				}
+				if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+					//echo $piece;
+					//print_r($matches);
+					if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+					else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
-					    'unit' => $matches[5] ? 'FT' : 'M'
+						'from' => (float)$matches[2],
+						'to'   => (float)$matches[4],
+						'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
 				$result['RVR'] = $matches[1];
 				$result['RVR_range'] = $range;
-    			}
-    			// Weather
-    			if (preg_match($regWeather, $piece, $matches)) {
+				}
+				// Weather
+				if (preg_match($regWeather, $piece, $matches)) {
 				$text = Array();
 				switch ($matches[1]) {
 					case '+':
@@ -259,35 +259,35 @@ 
 				}
 				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
 				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
-    			}
-    		}
-    		return $result;
+				}
+			}
+			return $result;
         
-        }
+		}
         
 	public function getMETAR($icao) {
-    		global $globalMETARcycle, $globalDBdriver;
-    		if (isset($globalMETARcycle) && $globalMETARcycle) {
-            		$query = "SELECT * FROM metar WHERE metar_location = :icao";
-                } else {
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-            		else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
-                }
-                $query_values = array(':icao' => $icao);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) {
-            		$all = $this->downloadMETAR($icao);
-                }
-                return $all;
-        }
+			global $globalMETARcycle, $globalDBdriver;
+			if (isset($globalMETARcycle) && $globalMETARcycle) {
+					$query = "SELECT * FROM metar WHERE metar_location = :icao";
+				} else {
+					if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+					else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+				}
+				$query_values = array(':icao' => $icao);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) {
+					$all = $this->downloadMETAR($icao);
+				}
+				return $all;
+		}
 
-       public function addMETAR($location,$metar,$date) {
+	   public function addMETAR($location,$metar,$date) {
 		global $globalDBdriver;
 		$date = date('Y-m-d H:i:s',strtotime($date));
 		if ($globalDBdriver == 'mysql') {
@@ -295,104 +295,104 @@ 
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-                $query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteMETAR($id) {
-                $query = "DELETE FROM metar WHERE id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
-       public function deleteAllMETARLocation() {
-                $query = "DELETE FROM metar";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteMETAR($id) {
+				$query = "DELETE FROM metar WHERE id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
+	   public function deleteAllMETARLocation() {
+				$query = "DELETE FROM metar";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function addMETARCycle() {
-    		global $globalDebug, $globalIVAO;
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		if (isset($globalIVAO) && $globalIVAO) {
-        		//$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
+		public function addMETARCycle() {
+			global $globalDebug, $globalIVAO;
+			if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			if (isset($globalIVAO) && $globalIVAO) {
+				//$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
 			$Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt');
-    			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r");
-    		} else {
+				$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r");
+			} else {
 			//$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT');
 			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
-    			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
-    		}
-    		if ($handle) {
+				$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
+			}
+			if ($handle) {
 			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
 			$date = '';
-    			//foreach(explode("\n",$cycle) as $line) {
-	    		while(($line = fgets($handle,4096)) !== false) {
+				//foreach(explode("\n",$cycle) as $line) {
+				while(($line = fgets($handle,4096)) !== false) {
 				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
 					$date = $line;
-    				} elseif ($line != '') {
-    				    //$this->parse($line);
-    				    if ($date == '') $date = date('Y/m/d H:m');
-        			    $pos = 0;
-        			    $pieces = preg_split('/\s/',$line);
-        			    if ($pieces[0] == 'METAR') $pos++;
-        			    if (strlen($pieces[$pos]) != 4) $pos++;
-		        	    $location = $pieces[$pos];
-        	        	    echo $this->addMETAR($location,$line,$date);
-    				}
-    			}
-    			fclose($handle);
-    		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
+					} elseif ($line != '') {
+						//$this->parse($line);
+						if ($date == '') $date = date('Y/m/d H:m');
+						$pos = 0;
+						$pieces = preg_split('/\s/',$line);
+						if ($pieces[0] == 'METAR') $pos++;
+						if (strlen($pieces[$pos]) != 4) $pos++;
+						$location = $pieces[$pos];
+							echo $this->addMETAR($location,$line,$date);
+					}
+				}
+				fclose($handle);
+			}
+			if (isset($globalDebug) && $globalDebug) echo "Done\n";
         
-        }
-        public function downloadMETAR($icao) {
-    		global $globalMETARurl;
-    		if ($globalMETARurl == '') return array();
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		$url = str_replace('{icao}',$icao,$globalMETARurl);
-    		$cycle = $Common->getData($url);
-    		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
-    				//echo "date : ".$line."\n";
-    				$date = $line;
-    			} 
-    			if ($line != '') {
-    			    //$this->parse($line);
-    			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
-    			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
-	        	    $location = $pieces[$pos];
-	        	    if (strlen($location == 4)) {
-	        		$this->addMETAR($location,$line,$date);
-	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-	        	    } else return array();
-    			}
-    			//echo $line."\n";
-    		}
-    		return array();
+		}
+		public function downloadMETAR($icao) {
+			global $globalMETARurl;
+			if ($globalMETARurl == '') return array();
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			$url = str_replace('{icao}',$icao,$globalMETARurl);
+			$cycle = $Common->getData($url);
+			$date = '';
+			foreach(explode("\n",$cycle) as $line) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+					//echo "date : ".$line."\n";
+					$date = $line;
+				} 
+				if ($line != '') {
+					//$this->parse($line);
+					//echo $line;
+					if ($date == '') $date = date('Y/m/d H:m');
+					$pos = 0;
+					$pieces = preg_split('/\s/',$line);
+					if ($pieces[0] == 'METAR') $pos++;
+					if (strlen($pieces[$pos]) != 4) $pos++;
+					$location = $pieces[$pos];
+					if (strlen($location == 4)) {
+					$this->addMETAR($location,$line,$date);
+					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
+					} else return array();
+				}
+				//echo $line."\n";
+			}
+			return array();
         
-        }
+		}
 }
 /*
 $METAR = new METAR();

require/class.Scheduler.php

Indentation +160 added lines, -160 removed lines

@@ -8,29 +8,29 @@ 
 
 class Schedule {
 	protected $cookies = array();
-        public $db;
+		public $db;
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-        }
+		}
 	
 	/**
-	* Add schedule data to database
-	* @param String $ident aircraft ident
-	* @param String $departure_airport_icao departure airport icao
-	* @param String $departure_airport_time departure airport time
-	* @param String $arrival_airport_icao arrival airport icao
-	* @param String $arrival_airport_time arrival airport time
+	 * Add schedule data to database
+	 * @param String $ident aircraft ident
+	 * @param String $departure_airport_icao departure airport icao
+	 * @param String $departure_airport_time departure airport time
+	 * @param String $arrival_airport_icao arrival airport icao
+	 * @param String $arrival_airport_time arrival airport time
 	/ @param String $source source of data
-	*/
+	 */
 	
 	public function addSchedule($ident,$departure_airport_icao,$departure_airport_time,$arrival_airport_icao,$arrival_airport_time,$source = 'website') {
 		date_default_timezone_set('UTC');
 		$date = date("Y-m-d H:i:s",time());
-	        //if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
-	        //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
-	        $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
-	        $query_values = array(':ident' => $ident);
+			//if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
+			//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
+			$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
+			$query_values = array(':ident' => $ident);
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -39,18 +39,18 @@ 
 		}
 		if ($sth->fetchColumn() > 0) {
 			if ($departure_airport_time == '' && $arrival_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($arrival_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($departure_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
 			} else {
-			    //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+				//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
 			}
 			try {
 				$sth = $this->db->prepare($query);
@@ -61,17 +61,17 @@ 
 			if ($sth->fetchColumn() == 0) {
 				//$query = 'UPDATE schedule SET departure_airport_icao = :departure_airport_icao, departure_airport_time = :departure_airport_time, arrival_airport_icao = :arrival_airport_icao, arrival_airport_time = :arrival_airport_time, date_modified = :date, source = :source WHERE ident = :ident';
 				if ($departure_airport_time == '' && $arrival_airport_time == '') {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($arrival_airport_time == '') {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($departure_airport_time == '') {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				} else {
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				}
 				 try {
 					$sth = $this->db->prepare($query);
@@ -104,15 +104,15 @@ 
 	}
 
 	public function getSchedule($ident) {
-	        $Translation = new Translation($this->db);
-	        $operator = $Translation->checkTranslation($ident,false);
-	        if ($ident != $operator) {
-	    		$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1";
-	    		$query_values = array(':ident' => $ident,'operator' => $operator);
-	    	} else {
-		        $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1";
-	    		$query_values = array(':ident' => $ident);
-	    	}
+			$Translation = new Translation($this->db);
+			$operator = $Translation->checkTranslation($ident,false);
+			if ($ident != $operator) {
+				$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1";
+				$query_values = array(':ident' => $ident,'operator' => $operator);
+			} else {
+				$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1";
+				$query_values = array(':ident' => $ident);
+			}
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -128,15 +128,15 @@ 
 
 	public function checkSchedule($ident) {
 		global $globalDBdriver;
-	        //$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
-	        if ($globalDBdriver == 'mysql') {
+			//$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident AND ((date_added BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) AND DATE(NOW()) and date_modified IS NULL) OR (date_modified BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 15 DAY)) AND DATE(NOW()))) LIMIT 1";
 		} else {
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident 
 			AND ((date_added::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) and date_modified::timestamp IS NULL)
 			     OR (date_modified::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) LIMIT 1";
 		}
-	        $query_values = array(':ident' => $ident);
+			$query_values = array(':ident' => $ident);
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -149,12 +149,12 @@ 
 	}
 
 	/**
-	* Get flight info from Air France
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @param String $carrier IATA code
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air France
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @param String $carrier IATA code
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
@@ -190,11 +190,11 @@ 
 	}
 
 	/**
-	* Get flight info from EasyJet
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from EasyJet
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getEasyJet($callsign, $date = 'NOW') {
 		global $globalTimezone;
 		$Common = new Common();
@@ -218,10 +218,10 @@ 
 	}
 
 	/**
-	* Get flight info from Ryanair
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Ryanair
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getRyanair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -244,10 +244,10 @@ 
 	}
 
 	/**
-	* Get flight info from Swiss
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Swiss
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getSwiss($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -276,11 +276,11 @@ 
 	}
 	
 	/**
-	* Get flight info from British Airways API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from British Airways API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getBritishAirways($callsign, $date = 'NOW') {
 		global $globalBritishAirwaysKey;
 		$Common = new Common();
@@ -304,11 +304,11 @@ 
 	}
 
 	/**
-	* Get flight info from Lutfhansa API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Lutfhansa API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getLufthansa($callsign, $date = 'NOW') {
 		global $globalLufthansaKey;
 		$Common = new Common();
@@ -338,11 +338,11 @@ 
 	}
 
 	/**
-	* Get flight info from Transavia API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Transavia API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getTransavia($callsign, $date = 'NOW') {
 		global $globalTransaviaKey;
 		$Common = new Common();
@@ -368,10 +368,10 @@ 
 	}
 
 	/**
-	* Get flight info from Tunisair
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Tunisair
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getTunisair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -388,10 +388,10 @@ 
 	}
 
 	/**
-	* Get flight info from Vueling
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Vueling
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getVueling($callsign,$date = 'NOW') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
@@ -413,11 +413,11 @@ 
 	}
 
 	/**
-	* Get flight info from Iberia
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Iberia
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getIberia($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -447,11 +447,11 @@ 
 	}
 
 	/**
-	* Get flight info from Star Alliance
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Star Alliance
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 
 	private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') {
 		$Common = new Common();
@@ -483,11 +483,11 @@ 
 
 
 	/**
-	* Get flight info from Alitalia
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Alitalia
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAlitalia($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -506,11 +506,11 @@ 
 	}
 
 	/**
-	* Get flight info from Brussels airlines
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Brussels airlines
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getBrussels($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -520,24 +520,24 @@ 
 		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
-		    //echo $data;
-		    $parsed_json = json_decode($data,true);
-		    if (isset($parsed_json[0]['FromAirportCode'])) {
+			//echo $data;
+			$parsed_json = json_decode($data,true);
+			if (isset($parsed_json[0]['FromAirportCode'])) {
 			$DepartureAirportIata = $parsed_json[0]['FromAirportCode'];
 			$ArrivalAirportIata = $parsed_json[0]['ToAirportCode'];
 			$departureTime = date('H:i',strtotime($parsed_json[0]['ScheduledDepatureDate']));
 			$arrivalTime = date('H:i',strtotime($parsed_json[0]['ScheduledArrivalDate']));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels');
-		    }
+			}
 		}
 	}
 
 	/**
-	* Get flight info from FlightRadar24
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from FlightRadar24
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 /*
 	public function getFlightRadar24($callsign, $date = 'NOW') {
 		$Common = new Common();
@@ -566,11 +566,11 @@ 
 	}
   */
 	/**
-	* Get flight info from Lufthansa
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Lufthansa
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 
 /*	private function getLufthansa($callsign, $date = 'NOW') {
 		$Common = new Common();
@@ -598,10 +598,10 @@ 
 	}
   */
 	/**
-	* Get flight info from flytap
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flytap
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getFlyTap($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -624,10 +624,10 @@ 
 	}
 
 	/**
-	* Get flight info from flightmapper
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flightmapper
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getFlightMapper($callsign) {
 		$Common = new Common();
 		$airline_icao = '';
@@ -655,11 +655,11 @@ 
 				$aarr = '';
 				$n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$aarr);
 				if ($n == 7) {
-				    $departureTime = $dhour;
-				    $arrivalTime = $ahour;
-				    $DepartureAirportIata = str_replace(array('(',')'),'',$darr);
-				    $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
-				    return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
+					$departureTime = $dhour;
+					$arrivalTime = $ahour;
+					$DepartureAirportIata = str_replace(array('(',')'),'',$darr);
+					$ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
+					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
 				}
 			}
 		}
@@ -667,10 +667,10 @@ 
 	}
 
 	/**
-	* Get flight info from flightaware
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flightaware
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getFlightAware($callsign) {
 		$Common = new Common();
 		/*
@@ -703,10 +703,10 @@ 
 	}
 
 	/**
-	* Get flight info from CostToTravel
-	* @param String $callsign The callsign
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from CostToTravel
+	 * @param String $callsign The callsign
+	 * @return Flight departure and arrival airports and time
+	 */
 	public function getCostToTravel($callsign) {
 		$Common = new Common();
 		$url= "http://www.costtotravel.com/flight-number/".$callsign;
@@ -728,11 +728,11 @@ 
 	}
 
 	/**
-	* Get flight info from Air Canada
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air Canada
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAirCanada($callsign,$date = 'NOW') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
@@ -756,11 +756,11 @@ 
 	}
 
 	/**
-	* Get flight info from Vietnam Airlines
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Vietnam Airlines
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getVietnamAirlines($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -782,12 +782,12 @@ 
 	}
 
 	/**
-	* Get flight info from Air Berlin
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @param String $carrier airline code
-	* @return Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air Berlin
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @param String $carrier airline code
+	 * @return Flight departure and arrival airports and time
+	 */
 	private function getAirBerlin($callsign, $date = 'NOW',$carrier = 'AB') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
@@ -816,11 +816,11 @@ 
 			$table = $Common->table2array($data);
 			$flight = $table;
 			if (isset($flight[5][4])) {
-			    $arrivalTime = $flight[5][4];
-			    $arrivalAirport = $flight[5][3];
+				$arrivalTime = $flight[5][4];
+				$arrivalAirport = $flight[5][3];
 			} else {
-			    $arrivalTime = '';
-			    $arrivalAirport = '';
+				$arrivalTime = '';
+				$arrivalAirport = '';
 			}
 		} else return array();
 		$url = 'http://www.airberlin.com/en-US/site/json/suggestAirport.php?searchfor=departures&searchflightid=0&departures%5B%5D=&suggestsource%5B0%5D=activeairports&withcountries=0&withoutroutings=0&promotion%5Bid%5D=&promotion%5Btype%5D=&routesource%5B0%5D=airberlin&routesource%5B1%5D=partner';
@@ -1088,7 +1088,7 @@ 
 					}
 			}
 		}
-	        return array();
+			return array();
 	}
 }
 

require/class.Accident.php

Indentation +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@
 	}
 	
 	/**
-	* Get Accidents data from DB
-	*
-	* @return Array Return Accidents data in array
-	*/
+	 * Get Accidents data from DB
+	 *
+	 * @return Array Return Accidents data in array
+	 */
 	public function getAccidentData($limit = '',$type = '',$date = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);

require/class.Stats.php

Indentation +833 added lines, -833 removed lines

@@ -15,33 +15,33 @@ 
 		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-        }
+		}
               
 	public function addLastStatsUpdate($type,$stats_date) {
-                $query = "DELETE FROM config WHERE name = :type;
+				$query = "DELETE FROM config WHERE name = :type;
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array('type' => $type,':stats_date' => $stats_date);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 	public function getLastStatsUpdate($type = 'last_update_stats') {
-                $query = "SELECT value FROM config WHERE name = :type";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':type' => $type));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
-        public function deleteStats($filter_name = '') {
-        	/*
+				$query = "SELECT value FROM config WHERE name = :type";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':type' => $type));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
+		public function deleteStats($filter_name = '') {
+			/*
         	$query = "DELETE FROM config WHERE name = 'last_update_stats'";
                  try {
                         $sth = $this->db->prepare($query);
@@ -50,80 +50,80 @@ 
                         return "error : ".$e->getMessage();
                 }
                 */
-        	$query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
-        public function deleteOldStats($filter_name = '') {
+			$query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
+		public function deleteOldStats($filter_name = '') {
         	
-        	$query = "DELETE FROM config WHERE name = 'last_update_stats'";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+			$query = "DELETE FROM config WHERE name = 'last_update_stats'";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
                 
-        	$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+			$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function getAllAirlineNames($filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-                $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-                $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-                $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-                $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 
 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '') {
@@ -131,66 +131,66 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            	    $filters = array('airlines' => array($stats_airline));
-            	    if ($filter_name != '') {
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-            	    }
-            	    $Spotter = new Spotter($this->db);
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$filters = array('airlines' => array($stats_airline));
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					}
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllAirlineCountries($limit = true,$filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-			}
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+			}
+					$all = $Spotter->countAllAirlineCountries($limit,$filters);
+				}
+				return $all;
 	}
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$filters = array('airlines' => array($stats_airline));
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$filters = array('airlines' => array($stats_airline));
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
+					$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllAircraftManufacturers($filters);
-                }
-                return $all;
+				}
+				return $all;
 	}
 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '') {
@@ -198,44 +198,44 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllArrivalCountries($limit,$filters);
-                }
-                return $all;
+				}
+				return $all;
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDepartureCountries($filters);
-                }
-                return $all;
+				}
+				return $all;
 	}
 
 	public function countAllAirlines($limit = true,$filter_name = '') {
@@ -243,45 +243,45 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-	                $Spotter = new Spotter($this->db);
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
-                }
-                return $all;
+					$all = $Spotter->countAllAirlines($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-	                $Spotter = new Spotter($this->db);
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
@@ -318,7 +318,7 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                /*
+				/*
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
     		        $all = $Spotter->countAllFlightOverCountries($limit);
@@ -334,84 +334,84 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllPilots($limit,0,'',$filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllPilots($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllOwners($limit,0,'',$filters);
+				}
+				return $all;
 	}
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-			}
-            		$Spotter = new Spotter($this->db);
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
-        		$all = array();
-        		foreach ($pall as $value) {
-        			$icao = $value['airport_departure_icao'];
-        			$all[$icao] = $value;
-        		}
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+			}
+					$Spotter = new Spotter($this->db);
+					$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
+				$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
+				$all = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_departure_icao'];
+					$all[$icao] = $value;
+				}
         		
-        		foreach ($dall as $value) {
-        			$icao = $value['airport_departure_icao'];
-        			if (isset($all[$icao])) {
-        				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        			} else $all[$icao] = $value;
-        		}
-        		$count = array();
-        		foreach ($all as $key => $row) {
-        			$count[$key] = $row['airport_departure_icao_count'];
-        		}
-        		array_multisort($count,SORT_DESC,$all);
-                }
-                return $all;
+				foreach ($dall as $value) {
+					$icao = $value['airport_departure_icao'];
+					if (isset($all[$icao])) {
+						$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
+					} else $all[$icao] = $value;
+				}
+				$count = array();
+				foreach ($all as $key => $row) {
+					$count[$key] = $row['airport_departure_icao_count'];
+				}
+				array_multisort($count,SORT_DESC,$all);
+				}
+				return $all;
 	}
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
@@ -433,26 +433,26 @@ 
 			$Spotter = new Spotter($this->db);
 			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
 			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
-        		$all = array();
-        		foreach ($pall as $value) {
-        			$icao = $value['airport_arrival_icao'];
-        			$all[$icao] = $value;
-        		}
+				$all = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					$all[$icao] = $value;
+				}
         		
-        		foreach ($dall as $value) {
-        			$icao = $value['airport_arrival_icao'];
-        			if (isset($all[$icao])) {
-        				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-        			} else $all[$icao] = $value;
-        		}
-        		$count = array();
-        		foreach ($all as $key => $row) {
-        			$count[$key] = $row['airport_arrival_icao_count'];
-        		}
-        		array_multisort($count,SORT_DESC,$all);
-                }
+				foreach ($dall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					if (isset($all[$icao])) {
+						$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
+					} else $all[$icao] = $value;
+				}
+				$count = array();
+				foreach ($all as $key => $row) {
+					$count[$key] = $row['airport_arrival_icao_count'];
+				}
+				array_multisort($count,SORT_DESC,$all);
+				}
  
-                return $all;
+				return $all;
 	}
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
@@ -465,23 +465,23 @@ 
 			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		}
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllMonthsLastYear($filters);
-                }
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllMonthsLastYear($filters);
+				}
                 
-                return $all;
+				return $all;
 	}
 	
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
@@ -489,22 +489,22 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDatesLastMonth($filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDatesLastMonth($filters);
+				}
+				return $all;
 	}
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
@@ -515,108 +515,108 @@ 
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		}
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDatesLast7Days($filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDatesLast7Days($filters);
+				}
+				return $all;
 	}
 	public function countAllDates($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDates($filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDates($filters);
+				}
+				return $all;
 	}
 	public function countAllDatesByAirlines($filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
 		$query_data = array('filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDatesByAirlines($filters);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+			}
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDatesByAirlines($filters);
+				}
+				return $all;
 	}
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllMonths($filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllMonths($filters);
+				}
+				return $all;
 	}
 	public function countAllMilitaryMonths($filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
-			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllMilitaryMonths($filters);
-                }
-                return $all;
+			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+			}
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllMilitaryMonths($filters);
+				}
+				return $all;
 	}
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
@@ -632,22 +632,22 @@ 
 			$query .= " ORDER BY CAST(flight_date AS integer) ASC";
 		}
 		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline));
 			if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllHours($orderby,$filters);
-                }
-                return $all;
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllHours($orderby,$filters);
+				}
+				return $all;
 	}
 	
 	public function countOverallFlights($stats_airline = '', $filter_name = '') {
@@ -669,9 +669,9 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name);
 		if (empty($all)) {
-		        $filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallMilitaryFlights($filters);
@@ -710,19 +710,19 @@ 
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $result = $sth->fetchAll(PDO::FETCH_ASSOC);
-                $all = $result[0]['nb_airline'];
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
+				$all = $result[0]['nb_airline'];
 		//$all = $this->getSumStats('airlines_bymonth',date('Y'));
 		if (empty($all)) {
-            		$filters = array();
-            		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					$filters = array();
+					if ($filter_name != '') {
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countOverallAirlines($filters);
@@ -773,166 +773,166 @@ 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
 	}
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-                $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
+				$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		global $globalArchiveMonths, $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
-	                $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-	        } else {
-            		$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-                }
-                $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+			global $globalArchiveMonths, $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			} else {
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
+				}
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		if ($globalDBdriver == 'mysql') {
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		} else {
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-                }
-                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		if ($globalDBdriver == 'mysql') {
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
-                } else {
+				} else {
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
-                }
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsAirlineTotal($filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		if ($globalDBdriver == 'mysql') {
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
-                } else {
+				} else {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
-                }
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsOwnerTotal($filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		if ($globalDBdriver == 'mysql') {
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
 		} else {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
-                }
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsPilotTotal($filter_name = '') {
-    		global $globalArchiveMonths, $globalDBdriver;
+			global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-    		if ($globalDBdriver == 'mysql') {
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
-            	} else {
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
-            	}
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':filter_name' => $filter_name));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+			if ($globalDBdriver == 'mysql') {
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
+				} else {
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':filter_name' => $filter_name));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
-                } else {
+				} else {
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 		} else {
-            		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
+					//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
-                }
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				}
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function getStatsSource($date,$stats_type = '') {
 		if ($stats_type == '') {
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
@@ -941,15 +941,15 @@ 
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date AND stats_type = :stats_type ORDER BY source_name";
 			$query_values = array(':date' => $date,':stats_type' => $stats_type);
 		}
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 
 	public function addStatSource($data,$source_name,$stats_type,$date) {
 		global $globalDBdriver;
@@ -957,25 +957,25 @@ 
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
 		} else {
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
-                }
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				}
+				$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
-                $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
+				$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -983,14 +983,14 @@ 
 		} else {
 			$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -998,14 +998,14 @@ 
 		} else {
 			$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatCountry($iso2,$iso3,$name,$cnt,$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1013,14 +1013,14 @@ 
 		} else {
 			$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1028,14 +1028,14 @@ 
 		} else {
 			$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1043,14 +1043,14 @@ 
 		} else {
 			$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1058,14 +1058,14 @@ 
 		} else {
 			$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -1073,14 +1073,14 @@ 
 		} else {
 			$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
 		}
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
@@ -1096,8 +1096,8 @@ 
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
-                }
-        }
+				}
+		}
 	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
@@ -1113,8 +1113,8 @@ 
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
-                }
-        }
+				}
+		}
 	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
@@ -1123,15 +1123,15 @@ 
 			} else {
 				$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 			}
-	                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+					$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
 			 try {
-                    		$sth = $this->db->prepare($query);
-	                        $sth->execute($query_values);
-    		        } catch(PDOException $e) {
-            		        return "error : ".$e->getMessage();
-	                }
-	        }
-        }
+							$sth = $this->db->prepare($query);
+							$sth->execute($query_values);
+					} catch(PDOException $e) {
+							return "error : ".$e->getMessage();
+					}
+			}
+		}
 	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
@@ -1147,46 +1147,46 @@ 
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
-                }
-        }
+				}
+		}
 
 	public function deleteStat($id) {
-                $query = "DELETE FROM stats WHERE stats_id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "DELETE FROM stats WHERE stats_id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function deleteStatFlight($type) {
-                $query = "DELETE FROM stats_flight WHERE stats_type = :type";
-                $query_values = array(':type' => $type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "DELETE FROM stats_flight WHERE stats_type = :type";
+				$query_values = array(':type' => $type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function deleteStatAirport($type) {
-                $query = "DELETE FROM stats_airport WHERE stats_type = :type";
-                $query_values = array(':type' => $type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "DELETE FROM stats_airport WHERE stats_type = :type";
+				$query_values = array(':type' => $type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function addOldStats() {
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats;
-    		$Common = new Common();
-    		$Connection = new Connection();
-    		date_default_timezone_set('UTC');
-    		$last_update = $this->getLastStatsUpdate('last_update_stats');
+		public function addOldStats() {
+			global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats;
+			$Common = new Common();
+			$Connection = new Connection();
+			date_default_timezone_set('UTC');
+			$last_update = $this->getLastStatsUpdate('last_update_stats');
 		//print_r($last_update);
 		/*
 		$flightsbymonth = $this->getStats('flights_by_month');
@@ -1448,24 +1448,24 @@ 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
+				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
 			if ($globalDebug) echo 'Order departure airports...'."\n";
-	        	$alldata = array();
+				$alldata = array();
 	        	
-    			foreach ($pall as $value) {
-	        		$icao = $value['airport_departure_icao'];
-    				$alldata[$icao] = $value;
-	        	}
-	        	foreach ($dall as $value) {
-    				$icao = $value['airport_departure_icao'];
-        			if (isset($alldata[$icao])) {
-    					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        			} else $alldata[$icao] = $value;
-			}
-    			$count = array();
-    			foreach ($alldata as $key => $row) {
-    				$count[$key] = $row['airport_departure_icao_count'];
-        		}
+				foreach ($pall as $value) {
+					$icao = $value['airport_departure_icao'];
+					$alldata[$icao] = $value;
+				}
+				foreach ($dall as $value) {
+					$icao = $value['airport_departure_icao'];
+					if (isset($alldata[$icao])) {
+						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
+					} else $alldata[$icao] = $value;
+			}
+				$count = array();
+				foreach ($alldata as $key => $row) {
+					$count[$key] = $row['airport_departure_icao_count'];
+				}
 			array_multisort($count,SORT_DESC,$alldata);
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
@@ -1473,25 +1473,25 @@ 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
+				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
-	        	$alldata = array();
-    			foreach ($pall as $value) {
-	        		$icao = $value['airport_arrival_icao'];
-    				$alldata[$icao] = $value;
-	        	}
-	        	foreach ($dall as $value) {
-    				$icao = $value['airport_arrival_icao'];
-        			if (isset($alldata[$icao])) {
-        				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-	        		} else $alldata[$icao] = $value;
-    			}
-        		$count = array();
-        		foreach ($alldata as $key => $row) {
-        			$count[$key] = $row['airport_arrival_icao_count'];
-	        	}
-    			array_multisort($count,SORT_DESC,$alldata);
-                        foreach ($alldata as $number) {
+				$alldata = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					$alldata[$icao] = $value;
+				}
+				foreach ($dall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					if (isset($alldata[$icao])) {
+						$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
+					} else $alldata[$icao] = $value;
+				}
+				$count = array();
+				foreach ($alldata as $key => $row) {
+					$count[$key] = $row['airport_arrival_icao_count'];
+				}
+				array_multisort($count,SORT_DESC,$alldata);
+						foreach ($alldata as $number) {
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
 			}
 			if ($Connection->tableExists('countries')) {
@@ -1551,8 +1551,8 @@ 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 			$pall = $Spotter->getLast7DaysAirportsDeparture();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
-        		/*
+				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
+				/*
 	        	$alldata = array();
     			foreach ($pall as $value) {
 	        		$icao = $value['departure_airport_icao'];
@@ -1571,29 +1571,29 @@ 
 	        	}
     			array_multisort($count,SORT_DESC,$alldata);
     			*/
-    			foreach ($dall as $value) {
-    				$icao = $value['departure_airport_icao'];
-    				$ddate = $value['date'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				foreach ($dall as $value) {
+					$icao = $value['departure_airport_icao'];
+					$ddate = $value['date'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
 			}
 			echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrival();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
-        		/*
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
+				/*
 	        	$alldata = array();
     			foreach ($pall as $value) {
 	        		$icao = $value['arrival_airport_icao'];
@@ -1613,22 +1613,22 @@ 
     			*/
 
 
-    			foreach ($dall as $value) {
-    				$icao = $value['arrival_airport_icao'];
-    				$ddate = $value['date'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				foreach ($dall as $value) {
+					$icao = $value['arrival_airport_icao'];
+					$ddate = $value['date'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
 			}
@@ -1695,51 +1695,51 @@ 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
+	   			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
-	        	//$alldata = array();
-    			foreach ($dall as $value) {
-    				$icao = $value['airport_departure_icao'];
-    				$dicao = $value['airline_icao'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
-    						$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				//$alldata = array();
+				foreach ($dall as $value) {
+					$icao = $value['airport_departure_icao'];
+					$dicao = $value['airline_icao'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
+							$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
+				$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
-	        	//$alldata = array();
-    			foreach ($dall as $value) {
-    				$icao = $value['airport_arrival_icao'];
-    				$dicao = $value['airline_icao'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
-    						$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
-                        foreach ($alldata as $number) {
+				//$alldata = array();
+				foreach ($dall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					$dicao = $value['airline_icao'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
+							$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
+						foreach ($alldata as $number) {
 				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao']);
 			}
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
@@ -1772,47 +1772,47 @@ 
 			}
 			if ($globalDebug) echo '...Departure'."\n";
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
-    			foreach ($dall as $value) {
-    				$icao = $value['departure_airport_icao'];
-    				$airline = $value['airline_icao'];
-    				$ddate = $value['date'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
+				foreach ($dall as $value) {
+					$icao = $value['departure_airport_icao'];
+					$airline = $value['airline_icao'];
+					$ddate = $value['date'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
 			}
 			if ($globalDebug) echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
-    			foreach ($dall as $value) {
-    				$icao = $value['arrival_airport_icao'];
-    				$airline = $value['airline_icao'];
-    				$ddate = $value['date'];
-    				$find = false;
-    				foreach ($pall as $pvalue) {
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
-    						$find = true;
-    						break;
-    					}
-    				}
-    				if ($find === false) {
-    					$pall[] = $value;
-    				}
-    			}
-    			$alldata = $pall;
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
+				foreach ($dall as $value) {
+					$icao = $value['arrival_airport_icao'];
+					$airline = $value['airline_icao'];
+					$ddate = $value['date'];
+					$find = false;
+					foreach ($pall as $pvalue) {
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
+							$find = true;
+							break;
+						}
+					}
+					if ($find === false) {
+						$pall[] = $value;
+					}
+				}
+				$alldata = $pall;
 			foreach ($alldata as $number) {
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
 			}
@@ -1881,44 +1881,44 @@ 
 					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source']);
 				}
 				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
-		        	$alldata = array();
-	    			foreach ($pall as $value) {
-		        		$icao = $value['airport_departure_icao'];
-    					$alldata[$icao] = $value;
-	    			}
-		        	foreach ($dall as $value) {
-	    				$icao = $value['airport_departure_icao'];
-        				if (isset($alldata[$icao])) {
-    						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        				} else $alldata[$icao] = $value;
-				}
-	    			$count = array();
-    				foreach ($alldata as $key => $row) {
-    					$count[$key] = $row['airport_departure_icao_count'];
-    				}
+		   			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
+					$alldata = array();
+					foreach ($pall as $value) {
+						$icao = $value['airport_departure_icao'];
+						$alldata[$icao] = $value;
+					}
+					foreach ($dall as $value) {
+						$icao = $value['airport_departure_icao'];
+						if (isset($alldata[$icao])) {
+							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
+						} else $alldata[$icao] = $value;
+				}
+					$count = array();
+					foreach ($alldata as $key => $row) {
+						$count[$key] = $row['airport_departure_icao_count'];
+					}
 				array_multisort($count,SORT_DESC,$alldata);
 				foreach ($alldata as $number) {
-    					echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name);
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name);
 				}
 				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
+					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
 				$alldata = array();
-    				foreach ($pall as $value) {
-		        		$icao = $value['airport_arrival_icao'];
-    					$alldata[$icao] = $value;
-	    			}
-		        	foreach ($dall as $value) {
-	    				$icao = $value['airport_arrival_icao'];
-        				if (isset($alldata[$icao])) {
-        					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-		        		} else $alldata[$icao] = $value;
-	    			}
-        			$count = array();
-        			foreach ($alldata as $key => $row) {
-    					$count[$key] = $row['airport_arrival_icao_count'];
-		        	}
-        			array_multisort($count,SORT_DESC,$alldata);
+					foreach ($pall as $value) {
+						$icao = $value['airport_arrival_icao'];
+						$alldata[$icao] = $value;
+					}
+					foreach ($dall as $value) {
+						$icao = $value['airport_arrival_icao'];
+						if (isset($alldata[$icao])) {
+							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
+						} else $alldata[$icao] = $value;
+					}
+					$count = array();
+					foreach ($alldata as $key => $row) {
+						$count[$key] = $row['airport_arrival_icao_count'];
+					}
+					array_multisort($count,SORT_DESC,$alldata);
 				foreach ($alldata as $number) {
 					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name);
 				}
@@ -1951,45 +1951,45 @@ 
 				}
 				echo '...Departure'."\n";
 				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
 				foreach ($dall as $value) {
-    					$icao = $value['departure_airport_icao'];
-    					$ddate = $value['date'];
-    					$find = false;
-    					foreach ($pall as $pvalue) {
-    						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
-    							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
-	    						$find = true;
-    							break;
-    						}
-    					}
-    					if ($find === false) {
-    						$pall[] = $value;
-	    				}
-    				}
-	    			$alldata = $pall;
+						$icao = $value['departure_airport_icao'];
+						$ddate = $value['date'];
+						$find = false;
+						foreach ($pall as $pvalue) {
+							if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
+								$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
+								$find = true;
+								break;
+							}
+						}
+						if ($find === false) {
+							$pall[] = $value;
+						}
+					}
+					$alldata = $pall;
 				foreach ($alldata as $number) {
 					$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
 				}
 				echo '...Arrival'."\n";
 				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
 				foreach ($dall as $value) {
 					$icao = $value['arrival_airport_icao'];
 					$ddate = $value['date'];
-    					$find = false;
+						$find = false;
 					foreach ($pall as $pvalue) {
-    						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
-    							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
-    							$find = true;
-    							break;
-	    					}
-    					}
-    					if ($find === false) {
-    						$pall[] = $value;
-	    				}
-    				}
-    				$alldata = $pall;
+							if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
+								$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
+								$find = true;
+								break;
+							}
+						}
+						if ($find === false) {
+							$pall[] = $value;
+						}
+					}
+					$alldata = $pall;
 				foreach ($alldata as $number) {
 					$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
 				}