Ysurac / FlightAirMap

require/class.MarineArchive.php

Spacing +104 added lines, -104 removed lines

@@ -14,33 +14,33 @@ 
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -68,42 +68,42 @@ 
 					$filter_query_date .= " AND EXTRACT(DAY FROM marine_archive_output.date) = '".$filter['day']."'";
 				}
 			}
-			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id";
+			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
 
 	// marine_archive
-	public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') {
+	public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') {
 		require_once(dirname(__FILE__).'/class.Marine.php');
 		if ($over_country == '') {
 			$Marine = new Marine($this->db);
-			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude);
+			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude, $longitude);
 			if (!empty($data_country)) $country = $data_country['iso2'];
 			else $country = '';
 		} else $country = $over_country;
 		
 		//$country = $over_country;
 		// Route is not added in marine_archive
-		$query  = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) 
+		$query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)';
 
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date);
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date);
 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 			$sth->closeCursor();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return "success";
@@ -123,9 +123,9 @@ 
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
                 //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+                $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-                $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
+                $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident));
 
                 return $spotter_array;
         }
@@ -144,7 +144,7 @@ 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
                 //$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
                 //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
+                $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
                   /*
@@ -157,7 +157,7 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-                $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
+                $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id));
 
                 return $spotter_array;
         }
@@ -172,14 +172,14 @@ 
 	{
                 date_default_timezone_set('UTC');
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
+                $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -198,14 +198,14 @@ 
         {
                 date_default_timezone_set('UTC');
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
+                $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -227,12 +227,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -253,12 +253,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -279,12 +279,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
+                $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -306,13 +306,13 @@ 
                 date_default_timezone_set('UTC');
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+                $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -329,12 +329,12 @@ 
         * @return Array the spotter information
         *
         */
-	public function getMarineArchiveData($ident,$fammarine_id,$date)
+	public function getMarineArchiveData($ident, $fammarine_id, $date)
 	{
 		$Marine = new Marine($this->db);
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate";
-		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%'));
+		$spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':fammarine_id' => $fammarine_id, ':date' => $date.'%'));
 		return $spotter_array;
 	}
 
@@ -353,7 +353,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -365,24 +365,24 @@ 
         * @return Array the spotter information
         *
         */
-        public function getMinLiveMarineData($begindate,$enddate,$filter = array())
+        public function getMinLiveMarineData($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 // Use spotter_output also ?
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -401,14 +401,14 @@ 
 						GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id 
 				    AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
 */
-			$query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+			$query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
 				    FROM marine_archive 
 				    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
 				    WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY fammarine_id';
                 } else {
                         //$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
-                        $query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+                        $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM marine_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
                         	    WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".'
@@ -418,7 +418,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -433,24 +433,24 @@ 
         * @return Array the spotter information
         *
         */
-        public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
+        public function getMinLiveMarineDataPlayback($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 // Should use spotter_output also ?
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -460,7 +460,7 @@ 
                     		    FROM marine_archive 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
 			*/
-			$query  = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk 
+			$query = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk 
 				    FROM marine_archive_output 
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive_output.aircraft_icao = a.icao 
 				    WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
@@ -475,7 +475,7 @@ 
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
                         */
-                        $query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
+                        $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
                         	    FROM marine_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
@@ -487,7 +487,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -502,23 +502,23 @@ 
         * @return Array the spotter information
         *
         */
-        public function getLiveMarineCount($begindate,$enddate,$filter = array())
+        public function getLiveMarineCount($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -533,7 +533,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -553,7 +553,7 @@ 
     * @return Array the spotter information
     *
     */
-    public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
+    public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
     {
 	global $globalTimezone, $globalDBdriver;
 	require_once(dirname(__FILE__).'/class.Translation.php');
@@ -575,7 +575,7 @@ 
 	        
 		$q_array = explode(" ", $q);
 		
-		foreach ($q_array as $q_item){
+		foreach ($q_array as $q_item) {
 		    $additional_query .= " AND (";
 		    $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
 		    $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -607,7 +607,7 @@ 
 	
 	if ($registration != "")
 	{
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
+	    $registration = filter_var($registration, FILTER_SANITIZE_STRING);
 	    if (!is_string($registration))
 	    {
 		return false;
@@ -618,7 +618,7 @@ 
 	
 	if ($aircraft_icao != "")
 	{
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+	    $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_icao))
 	    {
 		return false;
@@ -629,7 +629,7 @@ 
 	
 	if ($aircraft_manufacturer != "")
 	{
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+	    $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_manufacturer))
 	    {
 		return false;
@@ -650,7 +650,7 @@ 
 	
 	if ($airline_icao != "")
 	{
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+	    $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_icao))
 	    {
 		return false;
@@ -661,7 +661,7 @@ 
 	
 	if ($airline_country != "")
 	{
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+	    $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_country))
 	    {
 		return false;
@@ -672,7 +672,7 @@ 
 	
 	if ($airline_type != "")
 	{
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+	    $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_type))
 	    {
 		return false;
@@ -694,7 +694,7 @@ 
 	
 	if ($airport != "")
 	{
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
+	    $airport = filter_var($airport, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport))
 	    {
 		return false;
@@ -705,7 +705,7 @@ 
 	
 	if ($airport_country != "")
 	{
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+	    $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport_country))
 	    {
 		return false;
@@ -716,7 +716,7 @@ 
     
 	if ($callsign != "")
 	{
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+	    $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 	    if (!is_string($callsign))
 	    {
 		return false;
@@ -724,7 +724,7 @@ 
 		$translate = $Translation->ident2icao($callsign);
 		if ($translate != $callsign) {
 			$additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)";
-			$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
+			$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
 		} else {
 			$additional_query .= " AND (marine_archive_output.ident = '".$callsign."')";
 		}
@@ -733,7 +733,7 @@ 
 
 	if ($owner != "")
 	{
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
+	    $owner = filter_var($owner, FILTER_SANITIZE_STRING);
 	    if (!is_string($owner))
 	    {
 		return false;
@@ -744,7 +744,7 @@ 
 
 	if ($pilot_name != "")
 	{
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+	    $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
 	    if (!is_string($pilot_name))
 	    {
 		return false;
@@ -755,7 +755,7 @@ 
 	
 	if ($pilot_id != "")
 	{
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+	    $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
 	    if (!is_string($pilot_id))
 	    {
 		return false;
@@ -766,7 +766,7 @@ 
 	
 	if ($departure_airport_route != "")
 	{
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+	    $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($departure_airport_route))
 	    {
 		return false;
@@ -777,7 +777,7 @@ 
 	
 	if ($arrival_airport_route != "")
 	{
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+	    $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($arrival_airport_route))
 	    {
 		return false;
@@ -790,8 +790,8 @@ 
 	{
 	    $altitude_array = explode(",", $altitude);
 	    
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	    
 
 	    if ($altitude_array[1] != "")
@@ -809,8 +809,8 @@ 
 	{
 	    $date_array = explode(",", $date_posted);
 	    
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+	    $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+	    $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 	    
 	    if ($globalTimezone != '') {
 		date_default_timezone_set($globalTimezone);
@@ -842,8 +842,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -854,8 +854,8 @@ 
 	
 
 	if ($origLat != "" && $origLon != "" && $dist != "") {
-		$dist = number_format($dist*0.621371,2,'.','');
-		$query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+		$dist = number_format($dist*0.621371, 2, '.', '');
+		$query = "SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
                           FROM marine_archive_output, marine_archive WHERE spotter_output_archive.fammarine_id = marine_archive.fammarine_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
 	} else {
@@ -872,12 +872,12 @@ 
 			$additional_query .= " AND (marine_archive_output.waypoints <> '')";
 		}
 
-		$query  = "SELECT marine_archive_output.* FROM marine_archive_output 
+		$query = "SELECT marine_archive_output.* FROM marine_archive_output 
 		    WHERE marine_archive_output.ident <> '' 
 		    ".$additional_query."
 		    ".$filter_query.$orderby_query;
 	}
-	$spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query);
+	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
     }
@@ -894,7 +894,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error";
                 }
 	}
@@ -931,8 +931,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -973,7 +973,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($owner != "")
 	{
@@ -990,8 +990,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1031,7 +1031,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($pilot != "")
 	{
@@ -1043,8 +1043,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1074,7 +1074,7 @@ 
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1103,7 +1103,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['flight_count'] = $row['nb'];
 	    $temp_array['flight_country'] = $row['name'];
@@ -1120,7 +1120,7 @@ 
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1149,7 +1149,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['airline_icao'] = $row['airline_icao'];
 	    $temp_array['flight_count'] = $row['nb'];
@@ -1167,14 +1167,14 @@ 
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveMarineDataById($id,$date)
+    public function getDateArchiveMarineDataById($id, $date)
     {
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
 	$query  = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date));
+	$date = date('c', $date);
+	$spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1184,14 +1184,14 @@ 
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveMarineDataByIdent($ident,$date)
+    public function getDateArchiveMarineDataByIdent($ident, $date)
     {
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 	$query  = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+	$date = date('c', $date);
+	$spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1201,7 +1201,7 @@ 
     * @return Array the spotter information
     *
     */
-    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
     {
 	global $global_query;
 	$Marine = new Marine($this->db);
@@ -1209,7 +1209,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filters,true,true);
+	$filter_query = $this->getFilter($filters, true, true);
 	
 	if ($airport != "")
 	{
@@ -1226,8 +1226,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {

statistics-country.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 } else {
 	$title = _("Statistics").' - '._("Most common Country a flight was over");
 }
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -48,7 +48,7 @@ 
 }
 
 if ($type == 'aircraft') {
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name);
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name);
 } elseif ($type == 'marine') {
 	$flightover_array = $Marine->countAllMarineOverCountries();
 } elseif ($type == 'tracker') {
@@ -62,7 +62,7 @@ 
 print '<div id="chart" class="chart" width="100%"></div><script>';
 print 'var series = [';
 $flightover_data = '';
-foreach($flightover_array as $flightover_item)
+foreach ($flightover_array as $flightover_item)
 {
 	if ($type == 'aircraft') $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 	elseif ($type == 'marine') $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
@@ -113,8 +113,8 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	array_splice($flightover_array,10);
-	foreach($flightover_array as $flightover_item)
+	array_splice($flightover_array, 10);
+	foreach ($flightover_array as $flightover_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

install/class.update_schema.php

Spacing +235 added lines, -235 removed lines

@@ -14,11 +14,11 @@ 
             try {
             	$sth = $Connection->db->prepare($query);
 		$sth->execute();
-    	    } catch(PDOException $e) {
+    	    } catch (PDOException $e) {
 		return "error : ".$e->getMessage()."\n";
     	    }
     	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
+    		$Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']);
     	    }
 	
 	}
@@ -50,7 +50,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
     		}
     		// Copy schedules data to routes table
@@ -60,7 +60,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (delete schedule table) : ".$e->getMessage()."\n";
     		}
     		// Add source column
@@ -68,7 +68,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
     		}
 		// Delete unused column
@@ -76,7 +76,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
     		}
 		// Add ModeS column
@@ -84,14 +84,14 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
     		}
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
     		}
     		// Add auto_increment for aircraft_modes
@@ -99,7 +99,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -110,7 +110,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -123,7 +123,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -134,7 +134,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -147,7 +147,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
     		}
     		// Add image_source_website column to spotter_image
@@ -155,7 +155,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -164,7 +164,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -182,7 +182,7 @@ 
         	    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
     		    }
     		}
@@ -196,7 +196,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
     		}
     		// Add aircraft_shadow column to aircraft
@@ -204,7 +204,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
     		}
     		// Add aircraft_shadow column to spotter_live
@@ -212,7 +212,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -225,7 +225,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -233,7 +233,7 @@ 
 
 	private static function update_from_6() {
     		$Connection = new Connection();
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
+    		if (!$Connection->indexExists('spotter_output', 'flightaware_id')) {
     		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
 			ALTER TABLE spotter_output ADD INDEX(date);
 			ALTER TABLE spotter_output ADD INDEX(ident);
@@ -250,7 +250,7 @@ 
         	    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (add some indexes) : ".$e->getMessage()."\n";
     		    }
     		}
@@ -265,7 +265,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -274,12 +274,12 @@ 
 	private static function update_from_7() {
 		global $globalDBname, $globalDBdriver;
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
+    		$query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
     		}
     		if ($globalDBdriver == 'mysql') {
@@ -287,7 +287,7 @@ 
 		    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
     		    }
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -299,15 +299,15 @@ 
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
             	    } else {
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+    			$query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
             	    }
                 } else {
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+    		    $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
                 }
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
     		}
 
@@ -320,7 +320,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -339,14 +339,14 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (insert last_update values) : ".$e->getMessage()."\n";
     		}
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -354,12 +354,12 @@ 
 
 	private static function update_from_9() {
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
+    		$query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
     		}
 		$error = '';
@@ -371,7 +371,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -379,11 +379,11 @@ 
 
 	private static function update_from_10() {
     		$Connection = new Connection();
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
+    		$query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
     		}
 		$error = '';
@@ -401,7 +401,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -410,18 +410,18 @@ 
 	private static function update_from_11() {
 		global $globalDBdriver, $globalDBname;
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
+    		$query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
     		}
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    		$query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
     		}
     		if ($globalDBdriver == 'mysql') {
@@ -429,7 +429,7 @@ 
 		    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
     		    }
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -441,15 +441,15 @@ 
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
             	    } else {
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    			$query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
             	    }
                 } else {
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    		    $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
                 }
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
     		}
 
@@ -459,7 +459,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -487,7 +487,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -495,12 +495,12 @@ 
 
 	private static function update_from_13() {
     		$Connection = new Connection();
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
+    		if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) {
+    			$query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-	    		} catch(PDOException $e) {
+	    		} catch (PDOException $e) {
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
     			}
 		}
@@ -509,7 +509,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -527,7 +527,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -538,11 +538,11 @@ 
     		$Connection = new Connection();
 		$error = '';
     		// Add tables
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
+    		$query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update stats) : ".$e->getMessage()."\n";
     		}
 		if ($error != '') return $error;
@@ -550,7 +550,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -571,7 +571,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -589,7 +589,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -598,12 +598,12 @@ 
     		$Connection = new Connection();
 		$error = '';
     		// Modify stats_airport table
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
+    		if (!$Connection->checkColumnName('stats_airport', 'airport_name')) {
     			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
     	        	try {
 	            	    $sth = $Connection->db->prepare($query);
 			    $sth->execute();
-    			} catch(PDOException $e) {
+    			} catch (PDOException $e) {
 			    return "error (update stats) : ".$e->getMessage()."\n";
     			}
     		}
@@ -612,7 +612,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -629,73 +629,73 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
     		}
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
     		}
-		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'over_country')) {
 			// Add column over_country
     			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
             			$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_live','over_country')) {
+		if (!$Connection->checkColumnName('spotter_live', 'over_country')) {
 			// Add column over_country
     			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
             			$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_output','source_name')) {
+		if (!$Connection->checkColumnName('spotter_output', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_live','source_name')) {
+		if (!$Connection->checkColumnName('spotter_live', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
+		if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
@@ -704,7 +704,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -719,13 +719,13 @@ 
 			$error .= create_db::import_file('../db/airlines.sql');
 			if ($error != '') return 'Import airlines.sql : '.$error;
 		}
-		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
+		if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) {
 			// Add column over_country
     			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
         		try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
     			}
     		}
@@ -741,7 +741,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -750,13 +750,13 @@ 
 	private static function update_from_21() {
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_airport','stats_type')) {
+		if (!$Connection->checkColumnName('stats_airport', 'stats_type')) {
 			// Rename type to stats_type
 			$query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
 			}
 			if ($error != '') return $error;
@@ -765,7 +765,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -788,7 +788,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -814,17 +814,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (create index on spotter_archive) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
+		if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) {
 			// Add aircraft_manufacturer to stats_aircraft
     			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
     			}
     		}
@@ -833,7 +833,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -849,23 +849,23 @@ 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
 		}
 		if ($error != '') return 'Import airlines.sql : '.$error;
-		if (!$Connection->checkColumnName('airlines','forsource')) {
+		if (!$Connection->checkColumnName('airlines', 'forsource')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add forsource column) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -877,17 +877,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_airport','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -899,17 +899,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_airport) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_country','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_country', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -921,36 +921,36 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_airline) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_flight','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats','stats_airline')) {
+		if (!$Connection->checkColumnName('stats', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n";
 			}
-			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) {
+			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) {
 				// Add unique key
 				$query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
 				}
 			} else {
@@ -963,18 +963,18 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
 				}
 			}
 		}
-		if (!$Connection->checkColumnName('stats_registration','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -986,17 +986,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_registration) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_callsign','filter_name')) {
+		if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1008,17 +1008,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_airline','filter_name')) {
+		if (!$Connection->checkColumnName('stats_airline', 'filter_name')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1030,7 +1030,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1039,7 +1039,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1049,13 +1049,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_owner','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1067,17 +1067,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_owner) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_pilot','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1089,7 +1089,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1097,7 +1097,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1107,12 +1107,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('atc','format_source')) {
+		if (!$Connection->checkColumnName('atc', 'format_source')) {
 			$query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1120,7 +1120,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1130,13 +1130,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_pilot','format_source')) {
+		if (!$Connection->checkColumnName('stats_pilot', 'format_source')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1148,7 +1148,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1156,7 +1156,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1166,23 +1166,23 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) {
+		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) {
 			// Add unique key
 			$query = "alter table spotter_live add index(latitude,longitude)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->checkColumnName('aircraft','mfr')) {
+		if (!$Connection->checkColumnName('aircraft', 'mfr')) {
 			// Add mfr to aircraft
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add mfr column in aircraft) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1198,7 +1198,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1208,13 +1208,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if ($Connection->checkColumnName('aircraft','mfr')) {
+		if ($Connection->checkColumnName('aircraft', 'mfr')) {
 			// drop mfr to aircraft
 			$query = "ALTER TABLE aircraft DROP COLUMN mfr";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1230,7 +1230,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1240,33 +1240,33 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->indexExists('notam','ref_idx')) {
+		if (!$Connection->indexExists('notam', 'ref_idx')) {
 			// Add index key
 			$query = "create index ref_idx on notam (ref)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->indexExists('accidents','registration_idx')) {
+		if (!$Connection->indexExists('accidents', 'registration_idx')) {
 			// Add index key
 			$query = "create index registration_idx on accidents (registration)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->indexExists('accidents','rdts')) {
+		if (!$Connection->indexExists('accidents', 'rdts')) {
 			// Add index key
 			$query = "create index rdts on accidents (registration,date,type,source)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1275,7 +1275,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1285,23 +1285,23 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('accidents','airline_name')) {
+		if (!$Connection->checkColumnName('accidents', 'airline_name')) {
 			// Add airline_name to accidents
 			$query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add airline_name column in accidents) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('accidents','airline_icao')) {
+		if (!$Connection->checkColumnName('accidents', 'airline_icao')) {
 			// Add airline_icao to accidents
 			$query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1309,7 +1309,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1319,13 +1319,13 @@ 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('airlines','alliance')) {
+		if (!$Connection->checkColumnName('airlines', 'alliance')) {
 			// Add alliance to airlines
 			$query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add alliance column in airlines) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1352,7 +1352,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1362,13 +1362,13 @@ 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('airlines','ban_eu')) {
+		if (!$Connection->checkColumnName('airlines', 'ban_eu')) {
 			// Add ban_eu to airlines
 			$query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1376,7 +1376,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1387,19 +1387,19 @@ 
 		$Connection = new Connection();
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
-			if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') {
+			if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') {
 				$query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
 				}
 				$query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n";
 				}
 				
@@ -1407,7 +1407,7 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
 				}
 				/*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150";
@@ -1458,7 +1458,7 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (fix date) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1543,7 +1543,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1552,13 +1552,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->indexExists('accidents','type')) {
+		if (!$Connection->indexExists('accidents', 'type')) {
 			// Add index key
 			$query = "create index type on accidents (type,date)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1566,7 +1566,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1576,12 +1576,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('aircraft_modes','source_type')) {
+		if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) {
 			$query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1647,7 +1647,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1699,7 +1699,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
 			}
 			$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -1708,18 +1708,18 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n";
 				}
 			}
 		}
-		if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) {
+		if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) {
 			// Add index key
 			$query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1727,7 +1727,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1738,148 +1738,148 @@ 
 		$Connection = new Connection();
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
 		} else {
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1888,7 +1888,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1903,14 +1903,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			$query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
 			}
 		} else {
@@ -1918,14 +1918,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			$query = "alter table marine_identity alter column mmsi type varchar(255)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1933,7 +1933,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1943,32 +1943,32 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('source_location','last_seen')) {
+		if (!$Connection->checkColumnName('source_location', 'last_seen')) {
 			$query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column last_seen in source_location) : ".$e->getMessage()."\n";
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			if (!$Connection->checkColumnName('source_location','location_id')) {
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
 				$query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
 				}
 			}
 		} else {
-			if (!$Connection->checkColumnName('source_location','location_id')) {
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
 				$query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1977,7 +1977,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1987,12 +1987,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('source_location','description')) {
+		if (!$Connection->checkColumnName('source_location', 'description')) {
 			$query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column description in source_location) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2000,7 +2000,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2010,39 +2010,39 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('spotter_live','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_output','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_archive','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2050,7 +2050,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2072,14 +2072,14 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n";
 		}
 		$query = "UPDATE config SET value = '44' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2120,7 +2120,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2143,7 +2143,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2193,7 +2193,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2216,7 +2216,7 @@ 
 					try {
 						$sth = $Connection->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error (check_version): ".$e->getMessage()."\n";
 					}
 					$result = $sth->fetch(PDO::FETCH_ASSOC);

search.php

Spacing +102 added lines, -102 removed lines

@@ -26,24 +26,24 @@ 
 $sql_date = '';
 if (isset($_GET['start_date'])) {
 	//for the date manipulation into the query
-	if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+	if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false && strtotime($_GET['end_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			//$end_date = $_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $start_date.",".$end_date;
 		}
-	} else if($_GET['start_date'] != ""){
+	} else if ($_GET['start_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			$sql_date = $start_date;
 		}
-	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+	} else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['end_date']) !== false) {
 			//$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $end_date;
 		}
 	} else $sql_date = '';
@@ -51,21 +51,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
-	if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $start_altitude.",".$end_altitude;
-	} else if($_GET['highest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	} else if ($_GET['highest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $end_altitude;
-	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
+	} else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
 	} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	if (!isset($_GET['number_results']))
 	{
@@ -73,17 +73,17 @@ 
 		$limit_end = 25;
 		$absolute_difference = 25;
 	} else {
-		if ($_GET['number_results'] > 1000){
+		if ($_GET['number_results'] > 1000) {
 			$_GET['number_results'] = 1000;
 		}
 		$limit_start = 0;
-		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
-		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+		$limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
+		$absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
-	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
-	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
+	$limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
+	$limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
 }
 $absolute_difference = abs($limit_start - $limit_end);
 $limit_next = $limit_end + $absolute_difference;
@@ -112,31 +112,31 @@ 
     ((isset($_GET['origlat']) && $_GET['origlat'] != '') &&
     (isset($_GET['origlon']) && $_GET['origlon'] != '') &&
     (isset($_GET['dist']) && $_GET['dist'] != ''))
-    ){  
-	$q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING);
-	$registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING);
-	$aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING);
-	$manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING);
-	$highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING);
-	$airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING);
-	$airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING);
-	$airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING);
-	$airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING);
-	$airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING);
-	$callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING);
-	$owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING);
-	$pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING);
-	$pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING);
-	$mmsi = filter_input(INPUT_GET, 'mmsi',FILTER_SANITIZE_NUMBER_INT);
-	$imo = filter_input(INPUT_GET, 'imo',FILTER_SANITIZE_NUMBER_INT);
-	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING);
-	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING);
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-	$archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT);
-	$origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_NUMBER_FLOAT);
-	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT);
-	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
-	$number_results = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+    ) {  
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
+	$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
+	$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+	$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+	$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+	$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+	$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+	$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+	$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+	$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+	$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+	$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+	$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+	$mmsi = filter_input(INPUT_GET, 'mmsi', FILTER_SANITIZE_NUMBER_INT);
+	$imo = filter_input(INPUT_GET, 'imo', FILTER_SANITIZE_NUMBER_INT);
+	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+	$archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT);
+	$origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_NUMBER_FLOAT);
+	$origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_NUMBER_FLOAT);
+	$dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT);
+	$number_results = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	if ($dist != '') {
 		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
 		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
@@ -145,15 +145,15 @@ 
 	if ($archive == 1) {
 		if ($type == 'aircraft') {
 			$SpotterArchive = new SpotterArchive();
-			$spotter_array = $SpotterArchive->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $SpotterArchive->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'tracker') {
-			$spotter_array = $Tracker->searchTrackerData($q,$callsign,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Tracker->searchTrackerData($q, $callsign, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'marine') {
-			$spotter_array = $Marine->searchMarineData($q,$callsign,$mmsi,$imo,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Marine->searchMarineData($q, $callsign, $mmsi, $imo, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		}
 	}
 	 
@@ -189,12 +189,12 @@ 
 	//remove 3D=true parameter
 	$no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']);
 	$kmlURL = str_replace("http://", "kml://", $globalURL);
-	if (!isset($_GET['3D'])){
+	if (!isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>';
 	} else {
 		print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>';
 	}
-	if (isset($_GET['3D'])){
+	if (isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>';
 	} else {
 		print '<li ><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="notablet nomobile"><i class="fa fa-globe"></i> '._("3D Map").'</a><a href="'.$kmlURL.'/search/kml?'.htmlentities($_SERVER['QUERY_STRING']).'" class="tablet mobile"><i class="fa fa-globe"></i> 3D Map</a></li>';
@@ -215,32 +215,32 @@ 
 		print '<div class="column">';
 		print '<div class="info">';
 		print '<h1>'._("Search Results for").' ';
-		if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$q.'</span> '; }
-		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
-		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
-		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; }
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; }
-		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; }
-		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; }
-		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; }
-		if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$airport.'</span> '; }
-		if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$airport_country.'</span> '; }
-		if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$callsign.'</span> '; }
-		if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$owner.'</span> '; }
-		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
-		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
-		if (isset($_GET['mmsi']) && $_GET['mmsi'] != ""){ print _("MMSI:").' <span>'.$mmsi.'</span> '; }
-		if (isset($_GET['imo']) && $_GET['imo'] != ""){ print _("IMO:").' <span>'.$imo.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$start_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$end_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$number_results.'</span> '; }
+		if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$q.'</span> '; }
+		if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
+		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
+		if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$registration.'</span> '; }
+		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$highlights.'</span> '; }
+		if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$airline.'</span> '; }
+		if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$airline_country.'</span> '; }
+		if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$airline_type.'</span> '; }
+		if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$airport.'</span> '; }
+		if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$airport_country.'</span> '; }
+		if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$callsign.'</span> '; }
+		if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$owner.'</span> '; }
+		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
+		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
+		if (isset($_GET['mmsi']) && $_GET['mmsi'] != "") { print _("MMSI:").' <span>'.$mmsi.'</span> '; }
+		if (isset($_GET['imo']) && $_GET['imo'] != "") { print _("IMO:").' <span>'.$imo.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$start_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$end_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$number_results.'</span> '; }
 		print '</h1>';
 		print '</div>';
 
@@ -374,7 +374,7 @@ 
 					    </select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
+				<script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
 						<div class="col-sm-10">
@@ -383,7 +383,7 @@ 
 							</select>
 						</div>
 				</div>
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label> 
 					<div class="col-sm-10">
@@ -406,7 +406,7 @@ 
 					</div>
 				</div>
 <?php
-	}else {
+	} else {
 ?>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> 
@@ -419,8 +419,8 @@ 
 ?>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
-					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
+					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -434,7 +434,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script>
+				<script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $airline; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -443,7 +443,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script>
+				<script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $airline_country; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> 
 					<div class="col-sm-10">
@@ -452,10 +452,10 @@ 
 				</div>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all") { print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger") { print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "cargo") { print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "military") { print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -469,7 +469,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
+				<script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -478,7 +478,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script>
+				<script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $airport_country; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend><?php echo _("Route"); ?></legend>
@@ -490,7 +490,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> 
 					<div class="col-sm-10">
@@ -499,7 +499,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend>Altitude</legend>
@@ -510,9 +510,9 @@ 
 							<option></option>
 <?php
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-foreach($altitude_array as $altitude)
+foreach ($altitude_array as $altitude)
 {
-	if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
+	if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
 	{
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 	} else {
@@ -530,9 +530,9 @@ 
 							<option></option>
 <?php
 	$altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-	foreach($altitude_array as $altitude)
+	foreach ($altitude_array as $altitude)
 	{
-		if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
+		if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
 		{
 			print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 		} else {
@@ -655,10 +655,10 @@ 
 				<div class="col-sm-10">
 					<select class="form-control" name="number_results">
 <?php
-$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500,  600, 700, 800, 900, 1000);
-foreach($number_results_array as $number)
+$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000);
+foreach ($number_results_array as $number)
 {
-	if(isset($_GET['number_results']) && $_GET['number_results'] == $number)
+	if (isset($_GET['number_results']) && $_GET['number_results'] == $number)
 	{
 		print '<option value="'.$number.'" selected="selected">'.$number.'</option>';
 	} else {
@@ -677,7 +677,7 @@ 
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 					<p class="help-block">Disabled in demo</p>
 				</div>
 			</div>
@@ -688,7 +688,7 @@ 
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 				</div>
 			</div>
 		</fieldset>

require/class.Connection.php

Spacing +29 added lines, -29 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 require_once(dirname(__FILE__).'/settings.php');
 
-class Connection{
+class Connection {
 	public $db = null;
 	public $dbs = array();
 	public $latest_schema = 47;
 
-	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
+	public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) {
 		global $globalNoDB;
 		if (isset($globalNoDB) && $globalNoDB === TRUE) {
 			$this->db = null;
@@ -16,7 +16,7 @@ 
 					if ($user === null && $pass === null) {
 						$this->createDBConnection();
 					} else {
-						$this->createDBConnection(null,$user,$pass);
+						$this->createDBConnection(null, $user, $pass);
 					}
 				} else {
 					$this->createDBConnection($dbname);
@@ -100,14 +100,14 @@ 
 		while (true) {
 			try {
 				if ($globalDBSdriver == 'mysql') {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -117,19 +117,19 @@ 
 					$this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"');
 					//$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"');
 				} else {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass);
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
 				}
 				break;
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				$i++;
 				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
 				//exit;
@@ -154,10 +154,10 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
-		if($results->rowCount()>0) {
+		if ($results->rowCount() > 0) {
 		    return true; 
 		}
 		else return false;
@@ -179,8 +179,8 @@ 
 			     return false;
 			}
 			
-		} catch(PDOException $e) {
-			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
+		} catch (PDOException $e) {
+			if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
             			throw $e;
 	                }
 	                //echo 'error ! '.$e->getMessage();
@@ -192,7 +192,7 @@ 
 	/*
 	* Check if index exist
 	*/
-	public function indexExists($table,$index)
+	public function indexExists($table, $index)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -203,11 +203,11 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
-		if($nb[0]['nb'] > 0) {
+		if ($nb[0]['nb'] > 0) {
 			return true; 
 		}
 		else return false;
@@ -222,7 +222,7 @@ 
 		$query = "SELECT * FROM ".$table." LIMIT 0";
 		try {
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
 		}
 		$columns = array();
@@ -234,7 +234,7 @@ 
 		return $columns;
 	}
 
-	public function getColumnType($table,$column) {
+	public function getColumnType($table, $column) {
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
 		$tomet = $select->getColumnMeta(0);
 		return $tomet['native_type'];
@@ -244,7 +244,7 @@ 
 	* Check if a column name exist in a table
 	* @return Boolean column exist or not
 	*/
-	public function checkColumnName($table,$name)
+	public function checkColumnName($table, $name)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -254,8 +254,8 @@ 
 		}
 			try {
 				$sth = $this->db()->prepare($query);
-				$sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage()."\n";
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
@@ -294,7 +294,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage()."\n";
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);

require/class.Elevation.php

Spacing +28 added lines, -28 removed lines

@@ -41,7 +41,7 @@ 
 			default:
 				throw new \Exception("bad resolution can be only one of 1,3");
 		}
-		register_shutdown_function(function () {
+		register_shutdown_function(function() {
 			$this->closeAllFiles();
 		});
 	}
@@ -55,10 +55,10 @@ 
 
 	private function getElevationAtPosition($fileName, $row, $column) {
 		if (!array_key_exists($fileName, $this->openedFiles)) {
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 				throw new \Exception("File '{$fileName}' not exists.");
 			}
-			$file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r");
+			$file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r");
 			if ($file === false) {
 				throw new \Exception("Cant open file '{$fileName}' for reading.");
 			}
@@ -72,7 +72,7 @@ 
 			throw new \Exception("Not implemented yet");
 		}
 		$aRow     = $this->measPerDeg - $row;
-		$position = ($this->measPerDeg * ($aRow - 1)) + $column;
+		$position = ($this->measPerDeg*($aRow - 1)) + $column;
 		$position *= 2;
 		fseek($file, $position);
 		$short  = fread($file, 2);
@@ -100,8 +100,8 @@ 
 		$latSec = $this->getSec($lat);
 		$lonSec = $this->getSec($lon);
 
-		$Xn = round($latSec / $this->resolution, 3);
-		$Yn = round($lonSec / $this->resolution, 3);
+		$Xn = round($latSec/$this->resolution, 3);
+		$Yn = round($lonSec/$this->resolution, 3);
 
 		$a1 = round($Xn);
 		$a2 = round($Yn);
@@ -133,55 +133,55 @@ 
 		$b3 = $this->getElevationAtPosition($fName, $b1, $b2);
 		$c3 = $this->getElevationAtPosition($fName, $c1, $c2);
 
-		$n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2);
-		$n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3);
-		$n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1);
+		$n1 = ($c2 - $a2)*($b3 - $a3) - ($c3 - $a3)*($b2 - $a2);
+		$n2 = ($c3 - $a3)*($b1 - $a1) - ($c1 - $a1)*($b3 - $a3);
+		$n3 = ($c1 - $a1)*($b2 - $a2) - ($c2 - $a2)*($b1 - $a1);
 
-		$d  = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3;
-		$zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3;
+		$d  = -$n1*$a1 - $n2*$a2 - $n3*$a3;
+		$zN = (-$n1*$Xn - $n2*$Yn - $d)/$n3;
 
 		return $zN;
 	}
 
 	private function getDeg($deg, $numPrefix) {
 		$deg = abs($deg);
-		$d   = floor($deg);     // round degrees
+		$d   = floor($deg); // round degrees
 		if ($numPrefix >= 3) {
 			if ($d < 100) {
-				$d = '0' . $d;
+				$d = '0'.$d;
 			}
 		} // pad with leading zeros
 		if ($d < 10) {
-			$d = '0' . $d;
+			$d = '0'.$d;
 		}
 		return $d;
 	}
 
 	private function getSec($deg) {
 		$deg = abs($deg);
-		$sec = round($deg * 3600, 4);
-		$m   = fmod(floor($sec / 60), 60);
+		$sec = round($deg*3600, 4);
+		$m   = fmod(floor($sec/60), 60);
 		$s   = round(fmod($sec, 60), 4);
-		return ($m * 60) + $s;
+		return ($m*60) + $s;
 	}
 
-	public function download($lat,$lon, $debug = false) {
+	public function download($lat, $lon, $debug = false) {
 		$N      = $this->getDeg($lat, 2);
 		$E      = $this->getDeg($lon, 3);
-		$fileName  = "N{$N}E{$E}.hgt";
-		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+		$fileName = "N{$N}E{$E}.hgt";
+		if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 			$Common = new Common();
 			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
-			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
+			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) {
 				if ($debug) echo "File '{$fileName}.gz' not exists.";
 				return false;
 			}
 			if ($debug) echo 'Done'."\n";
 			if ($debug) echo 'Decompress '.$fileName.' ....';
-			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
+			$Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName);
 			if ($debug) echo 'Done'."\n";
-			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
+			unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
 		}
 		return true;
 	}
@@ -194,22 +194,22 @@ 
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 		$query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 10';
 		$query_values = array();
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 	}
 }

require/class.Common.php

Spacing +86 added lines, -86 removed lines

@@ -14,12 +14,12 @@ 
 	* @param Array $headers header to submit with the form
 	* @return String the result
 	*/
-	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '') {
+	public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '') {
 		global $globalProxy, $globalForceIPv4;
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 			}
 		}
@@ -29,7 +29,7 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLINFO_HEADER_OUT, true); 
-		curl_setopt($ch,CURLOPT_ENCODING , "gzip");
+		curl_setopt($ch, CURLOPT_ENCODING, "gzip");
 		//curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 //		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0');
 		if ($useragent == '') {
@@ -39,13 +39,13 @@ 
 		}
 		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
 		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
-		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
+		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common', "curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
 			if (is_array($data)) {
 				curl_setopt($ch, CURLOPT_POST, count($data));
 				$data_string = '';
-				foreach($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
+				foreach ($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
 				rtrim($data_string, '&');
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
 			} else {
@@ -57,7 +57,7 @@ 
 		}
 		if ($cookie != '') {
 			if (is_array($cookie)) {
-				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie,';'));
+				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie, ';'));
 			} else {
 				curl_setopt($ch, CURLOPT_COOKIE, $cookie);
 			}
@@ -69,13 +69,13 @@ 
 		$info = curl_getinfo($ch);
 		//var_dump($info);
 		curl_close($ch);
-		if ($info['http_code'] == '503' && strstr($result,'DDoS protection by CloudFlare')) {
+		if ($info['http_code'] == '503' && strstr($result, 'DDoS protection by CloudFlare')) {
 			echo "Cloudflare Detected\n";
 			require_once(dirname(__FILE__).'/libs/cloudflare-bypass/libraries/cloudflareClass.php');
 			$useragent = UAgent::random();
 			cloudflare::useUserAgent($useragent);
 			if ($clearanceCookie = cloudflare::bypass($url)) {
-				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
+				return $this->getData($url, 'get', $data, $headers, $clearanceCookie, $referer, $timeout, $useragent);
 			}
 		} else {
 			return $result;
@@ -106,20 +106,20 @@ 
 		fclose($fp);
 	}
 
-	public static function gunzip($in_file,$out_file_name = '') {
+	public static function gunzip($in_file, $out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
 		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
+			if (function_exists('gzopen')) $file = gzopen($in_file, 'rb');
+			elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb');
 			else {
 				echo 'gzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!gzeof($file)) {
+			while (!gzeof($file)) {
 				fwrite($out_file, gzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -127,19 +127,19 @@ 
 		}
 	}
 
-	public static function bunzip2($in_file,$out_file_name = '') {
+	public static function bunzip2($in_file, $out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
 		if ($out_file_name == '') $out_file_name = str_replace('.bz2', '', $in_file); 
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('bzopen')) $file = bzopen($in_file,'rb');
+			if (function_exists('bzopen')) $file = bzopen($in_file, 'rb');
 			else {
 				echo 'bzopen not available';
 				die;
 			}
 			$out_file = fopen($out_file_name, 'wb'); 
-			while(!feof($file)) {
+			while (!feof($file)) {
 				fwrite($out_file, bzread($file, $buffer_size));
 			}  
 			fclose($out_file);
@@ -157,27 +157,27 @@ 
 		if ($data == '') return array();
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('tr') as $element)
+		$tabledata = array();
+		foreach ($html->find('tr') as $element)
 		{
 			$td = array();
-			foreach( $element->find('th') as $row)
+			foreach ($element->find('th') as $row)
 			{
 				$td [] = trim($row->plaintext);
 			}
-			$td=array_filter($td);
+			$td = array_filter($td);
 			$tabledata[] = $td;
 
 			$td = array();
 			$tdi = array();
-			foreach( $element->find('td') as $row)
+			foreach ($element->find('td') as $row)
 			{
 				$td [] = trim($row->plaintext);
 				$tdi [] = trim($row->innertext);
 			}
-			$td=array_filter($td);
-			$tdi=array_filter($tdi);
-			$tabledata[]=array_merge($td,$tdi);
+			$td = array_filter($td);
+			$tdi = array_filter($tdi);
+			$tabledata[] = array_merge($td, $tdi);
 		}
 		$html->clear();
 		unset($html);
@@ -192,8 +192,8 @@ 
 	public function text2array($data) {
 		$html = str_get_html($data);
 		if ($html === false) return array();
-		$tabledata=array();
-		foreach($html->find('p') as $element)
+		$tabledata = array();
+		foreach ($html->find('p') as $element)
 		{
 			$tabledata [] = trim($element->plaintext);
 		}
@@ -213,11 +213,11 @@ 
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
-		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
+		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc))) + cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon) - floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
-			return round($dist * 1.609344);
+			return round($dist*1.609344);
 		} elseif ($unit == "m") {
-			return round($dist * 1.609344 * 1000);
+			return round($dist*1.609344*1000);
 		} elseif ($unit == "mile" || $unit == "mi") {
 			return round($dist);
 		} elseif ($unit == "nm") {
@@ -233,7 +233,7 @@ 
 	* @param float $distance distance covered
 	* @return whether distance is realistic
 	*/
-	public function withinThreshold ($timeDifference, $distance) {
+	public function withinThreshold($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
 		if ($x == 0 || $d == 0) return true;
@@ -249,12 +249,12 @@ 
 		return ($array !== array_values($array));
 	}
 
-	public function isInteger($input){
+	public function isInteger($input) {
 	    return(ctype_digit(strval($input)));
 	}
 
 
-	public function convertDec($dms,$latlong) {
+	public function convertDec($dms, $latlong) {
 		if ($latlong == 'latitude') {
 			$deg = substr($dms, 0, 2);
 			$min = substr($dms, 2, 4);
@@ -262,10 +262,10 @@ 
 			$deg = substr($dms, 0, 3);
 			$min = substr($dms, 3, 5);
 		}
-		return $deg+(($min*60)/3600);
+		return $deg + (($min*60)/3600);
 	}
 	
-	public function convertDM($coord,$latlong) {
+	public function convertDM($coord, $latlong) {
 		if ($latlong == 'latitude') {
 			if ($coord < 0) $NSEW = 'S';
 			else $NSEW = 'N';
@@ -275,9 +275,9 @@ 
 		}
 		$coord = abs($coord);
 		$deg = floor($coord);
-		$coord = ($coord-$deg)*60;
+		$coord = ($coord - $deg)*60;
 		$min = $coord;
-		return array('deg' => $deg,'min' => $min,'NSEW' => $NSEW);
+		return array('deg' => $deg, 'min' => $min, 'NSEW' => $NSEW);
 	}
 	
 	/**
@@ -289,8 +289,8 @@ 
 	public function xcopy($source, $dest)
 	{
 		$files = glob($source.'*.*');
-		foreach($files as $file){
-			$file_to_go = str_replace($source,$dest,$file);
+		foreach ($files as $file) {
+			$file_to_go = str_replace($source, $dest, $file);
 			copy($file, $file_to_go);
 		}
 		return true;
@@ -301,9 +301,9 @@ 
 	* @param	String $url url to check
 	* @return	bool Return true on succes false on failure
 	*/
-	public function urlexist($url){
-		$headers=get_headers($url);
-		return stripos($headers[0],"200 OK")?true:false;
+	public function urlexist($url) {
+		$headers = get_headers($url);
+		return stripos($headers[0], "200 OK") ? true : false;
 	}
 	
 	/**
@@ -314,7 +314,7 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for ($i = 0; $i < $hexln; $i += 2) $str .= chr(hexdec(substr($hex, $i, 2)));
 		return $str;
 	}
 	
@@ -324,7 +324,7 @@ 
 	* @return	String Return result
 	*/
 	public function hex2rgb($hex) {
-		$hex = str_replace('#','',$hex);
+		$hex = str_replace('#', '', $hex);
 		return sscanf($hex, "%02x%02x%02x"); 
 	}
 	
@@ -332,33 +332,33 @@ 
 		//difference in longitudinal coordinates
 		$dLon = deg2rad($lon2) - deg2rad($lon1);
 		//difference in the phi of latitudinal coordinates
-		$dPhi = log(tan(deg2rad($lat2) / 2 + pi() / 4) / tan(deg2rad($lat1) / 2 + pi() / 4));
+		$dPhi = log(tan(deg2rad($lat2)/2 + pi()/4)/tan(deg2rad($lat1)/2 + pi()/4));
 		//we need to recalculate $dLon if it is greater than pi
-		if(abs($dLon) > pi()) {
-			if($dLon > 0) {
-				$dLon = (2 * pi() - $dLon) * -1;
+		if (abs($dLon) > pi()) {
+			if ($dLon > 0) {
+				$dLon = (2*pi() - $dLon)*-1;
 			} else {
-				$dLon = 2 * pi() + $dLon;
+				$dLon = 2*pi() + $dLon;
 			}
 		}
 		//return the angle, normalized
-		return (rad2deg(atan2($dLon, $dPhi)) + 360) % 360;
+		return (rad2deg(atan2($dLon, $dPhi)) + 360)%360;
 	}
 	
-	public function checkLine($lat1,$lon1,$lat2,$lon2,$lat3,$lon3,$approx = 0.15) {
+	public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.15) {
 		//$a = ($lon2-$lon1)*$lat3+($lat2-$lat1)*$lon3+($lat1*$lon2+$lat2*$lon1);
-		$a = -($lon2-$lon1);
+		$a = -($lon2 - $lon1);
 		$b = $lat2 - $lat1;
-		$c = -($a*$lat1+$b*$lon1);
-		$d = $a*$lat3+$b*$lon3+$c;
+		$c = -($a*$lat1 + $b*$lon1);
+		$d = $a*$lat3 + $b*$lon3 + $c;
 		if ($d > -$approx && $d < $approx) return true;
 		else return false;
 	}
 	
 	public function array_merge_noappend() {
 		$output = array();
-		foreach(func_get_args() as $array) {
-			foreach($array as $key => $value) {
+		foreach (func_get_args() as $array) {
+			foreach ($array as $key => $value) {
 				$output[$key] = isset($output[$key]) ?
 				array_merge($output[$key], $value) : $value;
 			}
@@ -422,7 +422,7 @@ 
 		return $result;
 	}
 
-	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = ''){
+	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = '') {
 		global $globalMapRefresh;
 		if ($seconds == '') {
 			$distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000;
@@ -433,27 +433,27 @@ 
 		$latitude = deg2rad($latitude);
 		$longitude = deg2rad($longitude);
 		$bearing = deg2rad($heading); 
-		$latitude2 =  asin( (sin($latitude) * cos($distance/$r)) + (cos($latitude) * sin($distance/$r) * cos($bearing)) );
-		$longitude2 = $longitude + atan2( sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r)-(sin($latitude)*sin($latitude2)) );
-		return array('latitude' => number_format(rad2deg($latitude2),5,'.',''),'longitude' => number_format(rad2deg($longitude2),5,'.',''));
+		$latitude2 = asin((sin($latitude)*cos($distance/$r)) + (cos($latitude)*sin($distance/$r)*cos($bearing)));
+		$longitude2 = $longitude + atan2(sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r) - (sin($latitude)*sin($latitude2)));
+		return array('latitude' => number_format(rad2deg($latitude2), 5, '.', ''), 'longitude' => number_format(rad2deg($longitude2), 5, '.', ''));
 	}
 	
-	public function getCoordfromDistanceBearing($latitude,$longitude,$bearing,$distance) {
+	public function getCoordfromDistanceBearing($latitude, $longitude, $bearing, $distance) {
 		// distance in meter
 		$R = 6378.14;
-		$latitude1 = $latitude * (M_PI/180);
-		$longitude1 = $longitude * (M_PI/180);
-		$brng = $bearing * (M_PI/180);
+		$latitude1 = $latitude*(M_PI/180);
+		$longitude1 = $longitude*(M_PI/180);
+		$brng = $bearing*(M_PI/180);
 		$d = $distance;
 
 		$latitude2 = asin(sin($latitude1)*cos($d/$R) + cos($latitude1)*sin($d/$R)*cos($brng));
-		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1),cos($d/$R)-sin($latitude1)*sin($latitude2));
+		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1), cos($d/$R) - sin($latitude1)*sin($latitude2));
 
-		$latitude2 = $latitude2 * (180/M_PI);
-		$longitude2 = $longitude2 * (180/M_PI);
+		$latitude2 = $latitude2*(180/M_PI);
+		$longitude2 = $longitude2*(180/M_PI);
 
-		$flat = round ($latitude2,6);
-		$flong = round ($longitude2,6);
+		$flat = round($latitude2, 6);
+		$flong = round($longitude2, 6);
 /*
 		$dx = $distance*cos($bearing);
 		$dy = $distance*sin($bearing);
@@ -462,7 +462,7 @@ 
 		$flong = $longitude + $dlong;
 		$flat = $latitude + $dlat;
 */
-		return array('latitude' => $flat,'longitude' => $flong);
+		return array('latitude' => $flat, 'longitude' => $flong);
 	}
 
 	/**
@@ -476,14 +476,14 @@ 
 	 * @param integer $level GZIP compression level (default: 9)
 	 * @return string New filename (with .gz appended) if success, or false if operation fails
 	 */
-	public function gzCompressFile($source, $level = 9){ 
-		$dest = $source . '.gz'; 
-		$mode = 'wb' . $level; 
+	public function gzCompressFile($source, $level = 9) { 
+		$dest = $source.'.gz'; 
+		$mode = 'wb'.$level; 
 		$error = false; 
 		if ($fp_out = gzopen($dest, $mode)) { 
-			if ($fp_in = fopen($source,'rb')) { 
+			if ($fp_in = fopen($source, 'rb')) { 
 				while (!feof($fp_in)) 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512)); 
+					gzwrite($fp_out, fread($fp_in, 1024*512)); 
 				fclose($fp_in); 
 			} else {
 				$error = true; 
@@ -499,7 +499,7 @@ 
 	} 
 	
 	public function remove_accents($string) {
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
+		if (!preg_match('/[\x80-\xff]/', $string)) return $string;
 		$chars = array(
 		    // Decompositions for Latin-1 Supplement
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
@@ -556,7 +556,7 @@ 
 		    chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
 		    chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
 		    chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		    chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+		    chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
 		    chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
 		    chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
 		    chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
@@ -572,13 +572,13 @@ 
 		    chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
 		    chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
 		    chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		    chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		    chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		    chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		    chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		    chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		    chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		    chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+		    chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
+		    chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
+		    chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
+		    chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
+		    chr(197).chr(154) => 'S', chr(197).chr(155) => 's',
+		    chr(197).chr(156) => 'S', chr(197).chr(157) => 's',
+		    chr(197).chr(158) => 'S', chr(197).chr(159) => 's',
 		    chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
 		    chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
 		    chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
@@ -612,7 +612,7 @@ 
 		for ($i = 0, $int = '', $concat_flag = true; $i < $length; $i++) {
 			if (is_numeric($string[$i]) && $concat_flag) {
 				$int .= $string[$i];
-			} elseif(!$concat && $concat_flag && strlen($int) > 0) {
+			} elseif (!$concat && $concat_flag && strlen($int) > 0) {
 				$concat_flag = false;
 			}
 		}
@@ -658,7 +658,7 @@ 
 			$slice = array_slice($arr, $offset + 1, $length);
 			return implode("", $slice);
 		} else {
-			return mb_substr($string,$offset,$length,'UTF-8');
+			return mb_substr($string, $offset, $length, 'UTF-8');
 		}
 	}
 
@@ -668,14 +668,14 @@ 
 		//NOTE: use a trailing slash for folders!!!
 		//see http://bugs.php.net/bug.php?id=27609
 		//see http://bugs.php.net/bug.php?id=30931
-		if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
+		if ($path{strlen($path) - 1} == '/') // recursively return a temporary file path
 			return $this->is__writable($path.uniqid(mt_rand()).'.tmp');
 		else if (is_dir($path))
 			return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
 		// check tmp file for read/write capabilities
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
-		if ($f===false)
+		if ($f === false)
 			return false;
 		fclose($f);
 		if (!$rm)

airline-statistics-aircraft.php

Spacing +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@ 
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 //	$spotter_array = $Spotter->getSpotterDataByAirline('',"0,1","",array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Aircraft from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Aircraft from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Aircraft from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Aircraft from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -32,10 +32,10 @@ 
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>────────────────</option>';
@@ -43,9 +43,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -79,12 +79,12 @@ 
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -95,9 +95,9 @@ 
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft").'</h2>';
 	if ($alliance === false) {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	}
 
 	/*
@@ -107,7 +107,7 @@ 
 		$aircraft_array = $Spotter->countAllAircraftTypesByAirline($airline);
 	}
 	*/
-	$aircraft_array = $Stats->countAllAircraftTypes(true,$airline);
+	$aircraft_array = $Stats->countAllAircraftTypes(true, $airline);
 	if (!empty($aircraft_array))
 	{
 		print '<div class="table-responsive">';
@@ -120,7 +120,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

owner-statistics-departure-airport-country.php

Spacing +12 added lines, -12 removed lines

@@ -7,18 +7,18 @@ 
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$owner = urldecode(filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING));
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$owner = urldecode(filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING));
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
-$spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
+if ($year != '') $filter = array_merge($filter, array('year' => $year));
+if ($month != '') $filter = array_merge($filter, array('month' => $month));
+$spotter_array = $Spotter->getSpotterDataByOwner($owner, "0,1", $sort, $filter);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Owner of %s"),$spotter_array[0]['aircraft_owner']);
+	$title = sprintf(_("Most Common Departure Airports by Owner of %s"), $spotter_array[0]['aircraft_owner']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['aircraft_owner'].'</h1>';
@@ -28,16 +28,16 @@ 
 	include('owner-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights owned by <strong>%s</strong>."),$spotter_array[0]['aircraft_owner']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights owned by <strong>%s</strong>."), $spotter_array[0]['aircraft_owner']).'</p>';
 
-	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByOwner($owner,$filter);
+	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByOwner($owner, $filter);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['airport_departure_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -84,7 +84,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';