View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 8d4415...1bf6ad )
by Yannick
72:06 queued 32:47
created
Status
Category
Toggle Patches
require/class.Stats.php 4 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -405,17 +405,17 @@  discard block
 
 block discarded – undo
405 405 
 			}
406 406 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
407 407 
 		} else $all = array();
408 
-                if (empty($all)) {
409 
-	                $Spotter = new Spotter($this->db);
410 
-            		$filters = array();
408 
+				if (empty($all)) {
409 
+					$Spotter = new Spotter($this->db);
410 
+					$filters = array();
411 411 
 			$filters = array('year' => $year,'month' => $month);
412 
-            		if ($filter_name != '') {
413 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
412 
+					if ($filter_name != '') {
413 
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
414 414 
 			}
415 415 
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
416 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
417 
-                }
418 
-                return $all;
416 
+					$all = $Spotter->countAllAirlines($limit,0,'',$filters);
417 
+				}
418 
+				return $all;
419 419 
 	}
420 420 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
421 421 
 		global $globalStatsFilters;
 
@@ -1612,7 +1612,7 @@  discard block
 
 block discarded – undo
1612 1612 
 			return "error : ".$e->getMessage();
1613 1613 
 		}
1614 1614 
 	}
1615 
-        /*
1615 
+		/*
1616 1616 
 	public function getStatsSource($date,$stats_type = '') {
1617 1617 
 		if ($stats_type == '') {
1618 1618 
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
 
@@ -2574,8 +2574,8 @@  discard block
 
 block discarded – undo
2574 2574 
 					}
2575 2575 
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2576 2576 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2577 
-				    	foreach ($alldata as $number) {
2578 
-			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2577 
+						foreach ($alldata as $number) {
2578 
+							$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2579 2579 
 					}
2580 2580 
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2581 2581 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
Please login to merge, or discard this patch.
Doc Comments   +51 added lines patch added patch discarded remove patch 
@@ -21,6 +21,10 @@  discard block
 
 block discarded – undo
21 21 
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
22 22 
 	}
23 23
24 
+	/**
25 
+	 * @param string $type
26 
+	 * @param string $stats_date
27 
+	 */
24 28 
 	public function addLastStatsUpdate($type,$stats_date) {
25 29 
 		$query = "DELETE FROM config WHERE name = :type;
26 30 
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
 
@@ -1415,6 +1419,10 @@  discard block
 
 block discarded – undo
1415 1419 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1416 1420 
 		return $all;
1417 1421 
 	}
1422 
+
1423 
+	/**
1424 
+	 * @param string $type
1425 
+	 */
1418 1426 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1419 1427 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1420 1428 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1426,6 +1434,11 @@  discard block
 
 block discarded – undo
1426 1434 
 			echo "error : ".$e->getMessage();
1427 1435 
 		}
1428 1436 
 	}
1437 
+
1438 
+	/**
1439 
+	 * @param string $type
1440 
+	 * @param string $year
1441 
+	 */
1429 1442 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1430 1443 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1431 1444 
 		global $globalArchiveMonths, $globalDBdriver;
 
@@ -1625,6 +1638,10 @@  discard block
 
 block discarded – undo
1625 1638 
 		else return 0;
1626 1639 
 	}
1627 1640
1641 
+	/**
1642 
+	 * @param string $type
1643 
+	 * @param string $stats_date
1644 
+	 */
1628 1645 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1629 1646 
 		global $globalDBdriver;
1630 1647 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 
@@ -1678,6 +1695,9 @@  discard block
 
 block discarded – undo
1678 1695 
         }
1679 1696 
         */
1680 1697
1698 
+	/**
1699 
+	 * @param string $stats_type
1700 
+	 */
1681 1701 
 	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1682 1702 
 		global $globalDBdriver;
1683 1703 
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
 
@@ -1721,6 +1741,9 @@  discard block
 
 block discarded – undo
1721 1741 
 		return $all;
1722 1742 
 	}
1723 1743
1744 
+	/**
1745 
+	 * @param string $stats_type
1746 
+	 */
1724 1747 
 	public function addStatSource($data,$source_name,$stats_type,$date) {
1725 1748 
 		global $globalDBdriver;
1726 1749 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1736,6 +1759,10 @@  discard block
 
 block discarded – undo
1736 1759 
 			return "error : ".$e->getMessage();
1737 1760 
 		}
1738 1761 
 	}
1762 
+
1763 
+	/**
1764 
+	 * @param string $type
1765 
+	 */
1739 1766 
 	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1740 1767 
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1741 1768 
 		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 
@@ -1746,6 +1773,10 @@  discard block
 
 block discarded – undo
1746 1773 
 			return "error : ".$e->getMessage();
1747 1774 
 		}
1748 1775 
 	}
1776 
+
1777 
+	/**
1778 
+	 * @param string $type
1779 
+	 */
1749 1780 
 	public function addStatMarine($type,$date_name,$cnt,$filter_name = '') {
1750 1781 
 		$query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
1751 1782 
 		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
 
@@ -1756,6 +1787,10 @@  discard block
 
 block discarded – undo
1756 1787 
 			return "error : ".$e->getMessage();
1757 1788 
 		}
1758 1789 
 	}
1790 
+
1791 
+	/**
1792 
+	 * @param string $type
1793 
+	 */
1759 1794 
 	public function addStatTracker($type,$date_name,$cnt,$filter_name = '') {
1760 1795 
 		$query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
1761 1796 
 		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
 
@@ -2068,6 +2103,10 @@  discard block
 
 block discarded – undo
2068 2103 
 			return "error : ".$e->getMessage();
2069 2104 
 		}
2070 2105 
 	}
2106 
+
2107 
+	/**
2108 
+	 * @param string $type
2109 
+	 */
2071 2110 
 	public function deleteStatFlight($type) {
2072 2111 
 		$query = "DELETE FROM stats_flight WHERE stats_type = :type";
2073 2112 
 		$query_values = array(':type' => $type);
 
@@ -2078,6 +2117,10 @@  discard block
 
 block discarded – undo
2078 2117 
 			return "error : ".$e->getMessage();
2079 2118 
 		}
2080 2119 
 	}
2120 
+
2121 
+	/**
2122 
+	 * @param string $type
2123 
+	 */
2081 2124 
 	public function deleteStatMarine($type) {
2082 2125 
 		$query = "DELETE FROM stats_marine WHERE stats_type = :type";
2083 2126 
 		$query_values = array(':type' => $type);
 
@@ -2088,6 +2131,10 @@  discard block
 
 block discarded – undo
2088 2131 
 			return "error : ".$e->getMessage();
2089 2132 
 		}
2090 2133 
 	}
2134 
+
2135 
+	/**
2136 
+	 * @param string $type
2137 
+	 */
2091 2138 
 	public function deleteStatTracker($type) {
2092 2139 
 		$query = "DELETE FROM stats_tracker WHERE stats_type = :type";
2093 2140 
 		$query_values = array(':type' => $type);
 
@@ -2098,6 +2145,10 @@  discard block
 
 block discarded – undo
2098 2145 
 			return "error : ".$e->getMessage();
2099 2146 
 		}
2100 2147 
 	}
2148 
+
2149 
+	/**
2150 
+	 * @param string $type
2151 
+	 */
2101 2152 
 	public function deleteStatAirport($type) {
2102 2153 
 		$query = "DELETE FROM stats_airport WHERE stats_type = :type";
2103 2154 
 		$query_values = array(':type' => $type);
Please login to merge, or discard this patch.
Spacing   +643 added lines, -643 removed lines patch added patch discarded remove patch 
@@ -28,14 +28,14 @@  discard block
 
 block discarded – undo
28 28 
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
29 29 
 	}
30 30
31 
-	public function addLastStatsUpdate($type,$stats_date) {
31 
+	public function addLastStatsUpdate($type, $stats_date) {
32 32 
 		$query = "DELETE FROM config WHERE name = :type;
33 33 
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
34 
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
34 
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
35 35 
 		try {
36 36 
 			$sth = $this->db->prepare($query);
37 37 
 			$sth->execute($query_values);
38 
-		} catch(PDOException $e) {
38 
+		} catch (PDOException $e) {
39 39 
 			return "error : ".$e->getMessage();
40 40 
 		}
41 41 
 	}
 
@@ -45,7 +45,7 @@  discard block
 
 block discarded – undo
45 45 
 		try {
46 46 
 			$sth = $this->db->prepare($query);
47 47 
 			$sth->execute(array(':type' => $type));
48 
-		} catch(PDOException $e) {
48 
+		} catch (PDOException $e) {
49 49 
 			echo "error : ".$e->getMessage();
50 50 
 		}
51 51 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -66,7 +66,7 @@  discard block
 
 block discarded – undo
66 66 
 		try {
67 67 
 			$sth = $this->db->prepare($query);
68 68 
 			$sth->execute(array(':filter_name' => $filter_name));
69 
-		} catch(PDOException $e) {
69 
+		} catch (PDOException $e) {
70 70 
 			return "error : ".$e->getMessage();
71 71 
 		}
72 72 
 	}
 
@@ -79,14 +79,14 @@  discard block
 
 block discarded – undo
79 79 
 		try {
80 80 
 			$sth = $this->db->prepare($query);
81 81 
 			$sth->execute();
82 
-		} catch(PDOException $e) {
82 
+		} catch (PDOException $e) {
83 83 
 			return "error : ".$e->getMessage();
84 84 
 		}
85 85 
 		$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
86 86 
 		try {
87 87 
 			$sth = $this->db->prepare($query);
88 88 
 			$sth->execute(array(':filter_name' => $filter_name));
89 
-		} catch(PDOException $e) {
89 
+		} catch (PDOException $e) {
90 90 
 			return "error : ".$e->getMessage();
91 91 
 		}
92 92 
 	}
 
@@ -98,77 +98,77 @@  discard block
 
 block discarded – undo
98 98 
 		 try {
99 99 
 			$sth = $this->db->prepare($query);
100 100 
 			$sth->execute(array(':filter_name' => $filter_name));
101 
-		} catch(PDOException $e) {
101 
+		} catch (PDOException $e) {
102 102 
 			echo "error : ".$e->getMessage();
103 103 
 		}
104 104 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
105 105 
 		if (empty($all)) {
106 106 
 			$filters = array();
107 107 
 			if ($filter_name != '') {
108 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
108 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
109 109 
 			}
110 110 
 			$Spotter = new Spotter($this->db);
111 
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
111 
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
112 112 
 		}
113 113 
 		return $all;
114 114 
 	}
115 
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
115 
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
116 116 
 		if ($filter_name == '') $filter_name = $this->filter_name;
117 117 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
118 118 
 		try {
119 119 
 			$sth = $this->db->prepare($query);
120 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
121 
-		} catch(PDOException $e) {
120 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
121 
+		} catch (PDOException $e) {
122 122 
 			echo "error : ".$e->getMessage();
123 123 
 		}
124 124 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
125 125 
 		return $all;
126 126 
 	}
127 
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
127 
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
128 128 
 		if ($filter_name == '') $filter_name = $this->filter_name;
129 129 
 		$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
130 130 
 		try {
131 131 
 			$sth = $this->db->prepare($query);
132 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
133 
-		} catch(PDOException $e) {
132 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
133 
+		} catch (PDOException $e) {
134 134 
 			echo "error : ".$e->getMessage();
135 135 
 		}
136 136 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
137 137 
 		return $all;
138 138 
 	}
139 
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
139 
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
140 140 
 		if ($filter_name == '') $filter_name = $this->filter_name;
141 141 
 		$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
142 142 
 		try {
143 143 
 			$sth = $this->db->prepare($query);
144 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
145 
-		} catch(PDOException $e) {
144 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
145 
+		} catch (PDOException $e) {
146 146 
 			echo "error : ".$e->getMessage();
147 147 
 		}
148 148 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
149 149 
 		return $all;
150 150 
 	}
151 151
152 
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
152 
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
153 153 
 		if ($filter_name == '') $filter_name = $this->filter_name;
154 154 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
155 155 
 		try {
156 156 
 			$sth = $this->db->prepare($query);
157 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
158 
-		} catch(PDOException $e) {
157 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
158 
+		} catch (PDOException $e) {
159 159 
 			echo "error : ".$e->getMessage();
160 160 
 		}
161 161 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
162 162 
 		return $all;
163 163 
 	}
164 164
165 
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
165 
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
166 166 
 		if ($filter_name == '') $filter_name = $this->filter_name;
167 167 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
168 168 
 		try {
169 169 
 			$sth = $this->db->prepare($query);
170 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
171 
-		} catch(PDOException $e) {
170 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
171 
+		} catch (PDOException $e) {
172 172 
 			echo "error : ".$e->getMessage();
173 173 
 		}
174 174 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -176,23 +176,23 @@  discard block
 
 block discarded – undo
176 176 
 	}
177 177
178 178
179 
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
179 
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
180 180 
 		global $globalStatsFilters;
181 181 
 		if ($filter_name == '') $filter_name = $this->filter_name;
182 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
182 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
183 183 
 			$Spotter = new Spotter($this->db);
184 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
184 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
185 185 
 			$alliance_airlines = array();
186 186 
 			foreach ($airlines as $airline) {
187 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
187 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
188 188 
 			}
189 189 
 			if ($year == '' && $month == '') {
190 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
191 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
190 
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
191 
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
192 192 
 				try {
193 193 
 					$sth = $this->db->prepare($query);
194 194 
 					$sth->execute(array(':filter_name' => $filter_name));
195 
-				} catch(PDOException $e) {
195 
+				} catch (PDOException $e) {
196 196 
 					echo "error : ".$e->getMessage();
197 197 
 				}
198 198 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -203,29 +203,29 @@  discard block
 
 block discarded – undo
203 203 
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
204 204 
 				try {
205 205 
 					$sth = $this->db->prepare($query);
206 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
207 
-				} catch(PDOException $e) {
206 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
207 
+				} catch (PDOException $e) {
208 208 
 					echo "error : ".$e->getMessage();
209 209 
 				}
210 210 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
211 211 
 			} else $all = array();
212 212 
 		}
213 213 
 		if (empty($all)) {
214 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
215 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
214 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
215 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
216 216 
 			} else {
217 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
217 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
218 218 
 			}
219 219 
 			if ($filter_name != '') {
220 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
220 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
221 221 
 			}
222 222 
 			$Spotter = new Spotter($this->db);
223 223 
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
224 
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
224 
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
225 225 
 		}
226 226 
 		return $all;
227 227 
 	}
228 
-	public function countAllMarineTypes($limit = true, $filter_name = '',$year = '', $month = '') {
228 
+	public function countAllMarineTypes($limit = true, $filter_name = '', $year = '', $month = '') {
229 229 
 		global $globalStatsFilters;
230 230 
 		if ($filter_name == '') $filter_name = $this->filter_name;
231 231 
 		if ($year == '' && $month == '') {
 
@@ -234,23 +234,23 @@  discard block
 
 block discarded – undo
234 234 
 			try {
235 235 
 				$sth = $this->db->prepare($query);
236 236 
 				$sth->execute(array(':filter_name' => $filter_name));
237 
-			} catch(PDOException $e) {
237 
+			} catch (PDOException $e) {
238 238 
 				echo "error : ".$e->getMessage();
239 239 
 			}
240 240 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
241 241 
 		} else $all = array();
242 242 
 		if (empty($all)) {
243 
-			$filters = array('year' => $year,'month' => $month);
243 
+			$filters = array('year' => $year, 'month' => $month);
244 244 
 			if ($filter_name != '') {
245 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
245 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
246 246 
 			}
247 247 
 			$Marine = new Marine($this->db);
248 248 
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
249 
-			$all = $Marine->countAllMarineTypes($limit,0,'',$filters);
249 
+			$all = $Marine->countAllMarineTypes($limit, 0, '', $filters);
250 250 
 		}
251 251 
 		return $all;
252 252 
 	}
253 
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
253 
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
254 254 
 		global $globalStatsFilters;
255 255 
 		if ($filter_name == '') $filter_name = $this->filter_name;
256 256 
 		if ($year == '' && $month == '') {
 
@@ -259,7 +259,7 @@  discard block
 
 block discarded – undo
259 259 
 			try {
260 260 
 				$sth = $this->db->prepare($query);
261 261 
 				$sth->execute(array(':filter_name' => $filter_name));
262 
-			} catch(PDOException $e) {
262 
+			} catch (PDOException $e) {
263 263 
 				echo "error : ".$e->getMessage();
264 264 
 			}
265 265 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -267,32 +267,32 @@  discard block
 
 block discarded – undo
267 267 
 		if (empty($all)) {
268 268 
 			$Spotter = new Spotter($this->db);
269 269 
 			$filters = array();
270 
-			$filters = array('year' => $year,'month' => $month);
270 
+			$filters = array('year' => $year, 'month' => $month);
271 271 
 			if ($filter_name != '') {
272 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
272 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
273 273 
 			}
274 274 
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
275 
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
275 
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
276 276 
 		}
277 277 
 		return $all;
278 278 
 	}
279 
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
279 
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
280 280 
 		global $globalStatsFilters;
281 281 
 		if ($filter_name == '') $filter_name = $this->filter_name;
282 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
282 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
283 283 
 			$Spotter = new Spotter($this->db);
284 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
284 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
285 285 
 			$alliance_airlines = array();
286 286 
 			foreach ($airlines as $airline) {
287 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
287 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
288 288 
 			}
289 289 
 			if ($year == '' && $month == '') {
290 
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
291 
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
290 
+				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
291 
+				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
292 292 
 				try {
293 293 
 					$sth = $this->db->prepare($query);
294 294 
 					$sth->execute(array(':filter_name' => $filter_name));
295 
-				} catch(PDOException $e) {
295 
+				} catch (PDOException $e) {
296 296 
 					echo "error : ".$e->getMessage();
297 297 
 				}
298 298 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -303,21 +303,21 @@  discard block
 
 block discarded – undo
303 303 
 				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
304 304 
 				try {
305 305 
 					$sth = $this->db->prepare($query);
306 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
307 
-				} catch(PDOException $e) {
306 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
307 
+				} catch (PDOException $e) {
308 308 
 					echo "error : ".$e->getMessage();
309 309 
 				}
310 310 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
311 311 
 			} else $all = array();
312 312 
 		}
313 313 
 		if (empty($all)) {
314 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
315 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
314 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
315 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
316 316 
 			} else {
317 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
317 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
318 318 
 			}
319 319 
 			if ($filter_name != '') {
320 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
320 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
321 321 
 			}
322 322 
 			$Spotter = new Spotter($this->db);
323 323 
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
 
@@ -326,23 +326,23 @@  discard block
 
 block discarded – undo
326 326 
 		return $all;
327 327 
 	}
328 328
329 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
329 
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
330 330 
 		global $globalStatsFilters;
331 331 
 		if ($filter_name == '') $filter_name = $this->filter_name;
332 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
332 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
333 333 
 			$Spotter = new Spotter($this->db);
334 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
334 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
335 335 
 			$alliance_airlines = array();
336 336 
 			foreach ($airlines as $airline) {
337 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
337 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
338 338 
 			}
339 339 
 			if ($year == '' && $month == '') {
340 
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
341 
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
340 
+				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
341 
+				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
342 342 
 				try {
343 343 
 					$sth = $this->db->prepare($query);
344 344 
 					$sth->execute(array(':filter_name' => $filter_name));
345 
-				} catch(PDOException $e) {
345 
+				} catch (PDOException $e) {
346 346 
 					echo "error : ".$e->getMessage();
347 347 
 				}
348 348 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -353,61 +353,61 @@  discard block
 
 block discarded – undo
353 353 
 				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
354 354 
 				try {
355 355 
 					$sth = $this->db->prepare($query);
356 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
357 
-				} catch(PDOException $e) {
356 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
357 
+				} catch (PDOException $e) {
358 358 
 					echo "error : ".$e->getMessage();
359 359 
 				}
360 360 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
361 361 
 			} else $all = array();
362 362 
 		}
363 363 
 		if (empty($all)) {
364 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
365 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
364 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
365 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
366 366 
 			} else {
367 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
367 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
368 368 
 			}
369 369 
 			if ($filter_name != '') {
370 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
370 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
371 371 
 			}
372 372 
 			$Spotter = new Spotter($this->db);
373 373 
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
374 
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
374 
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
375 375 
 		}
376 376 
 		return $all;
377 377 
 	}
378 378 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
379 379 
 		global $globalStatsFilters;
380 380 
 		if ($filter_name == '') $filter_name = $this->filter_name;
381 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
381 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
382 382 
 			$Spotter = new Spotter($this->db);
383 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
383 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
384 384 
 			$alliance_airlines = array();
385 385 
 			foreach ($airlines as $airline) {
386 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
386 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
387 387 
 			}
388 
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
389 
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
388 
+			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
389 
+			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
390 390 
 			$query_values = array(':filter_name' => $filter_name);
391 391 
 		} else {
392 392 
 			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
393 393 
 			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
394 
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
394 
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
395 395 
 		}
396 396 
 		try {
397 397 
 			$sth = $this->db->prepare($query);
398 398 
 			$sth->execute($query_values);
399 
-		} catch(PDOException $e) {
399 
+		} catch (PDOException $e) {
400 400 
 			echo "error : ".$e->getMessage();
401 401 
 		}
402 402 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
403 403 
 		if (empty($all)) {
404 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
405 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
404 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
405 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
406 406 
 			} else {
407 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
407 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
408 408 
 			}
409 409 
 			if ($filter_name != '') {
410 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
410 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
411 411 
 			}
412 412 
 			$Spotter = new Spotter($this->db);
413 413 
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
 
@@ -416,7 +416,7 @@  discard block
 
 block discarded – undo
416 416 
 		return $all;
417 417 
 	}
418 418
419 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
419 
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
420 420 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
421 421 
 		if ($filter_name == '') $filter_name = $this->filter_name;
422 422 
 		if ($year == '' && $month == '') {
 
@@ -425,7 +425,7 @@  discard block
 
 block discarded – undo
425 425 
 			if (isset($forsource)) {
426 426 
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
427 427 
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
428 
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
428 
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
429 429 
 			} else {
430 430 
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
431 431 
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
 
@@ -434,7 +434,7 @@  discard block
 
 block discarded – undo
434 434 
 			try {
435 435 
 				$sth = $this->db->prepare($query);
436 436 
 				$sth->execute($query_values);
437 
-			} catch(PDOException $e) {
437 
+			} catch (PDOException $e) {
438 438 
 				echo "error : ".$e->getMessage();
439 439 
 			}
440 440 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -442,32 +442,32 @@  discard block
 
 block discarded – undo
442 442 
                 if (empty($all)) {
443 443 
 	                $Spotter = new Spotter($this->db);
444 444 
             		$filters = array();
445 
-			$filters = array('year' => $year,'month' => $month);
445 
+			$filters = array('year' => $year, 'month' => $month);
446 446 
             		if ($filter_name != '') {
447 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
447 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
448 448 
 			}
449 449 
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
450 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
450 
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
451 451 
                 }
452 452 
                 return $all;
453 453 
 	}
454 
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
454 
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
455 455 
 		global $globalStatsFilters;
456 456 
 		if ($filter_name == '') $filter_name = $this->filter_name;
457 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
457 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
458 458 
 			$Spotter = new Spotter($this->db);
459 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
459 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
460 460 
 			$alliance_airlines = array();
461 461 
 			foreach ($airlines as $airline) {
462 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
462 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
463 463 
 			}
464 464 
 			if ($year == '' && $month == '') {
465 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
466 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
465 
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
466 
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
467 467 
 				try {
468 468 
 					$sth = $this->db->prepare($query);
469 469 
 					$sth->execute(array(':filter_name' => $filter_name));
470 
-				} catch(PDOException $e) {
470 
+				} catch (PDOException $e) {
471 471 
 					echo "error : ".$e->getMessage();
472 472 
 				}
473 473 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -478,45 +478,45 @@  discard block
 
 block discarded – undo
478 478 
 				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
479 479 
 				try {
480 480 
 					$sth = $this->db->prepare($query);
481 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
482 
-				} catch(PDOException $e) {
481 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
482 
+				} catch (PDOException $e) {
483 483 
 					echo "error : ".$e->getMessage();
484 484 
 				}
485 485 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
486 486 
 			} else $all = array();
487 487 
 		}
488 488 
 		if (empty($all)) {
489 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
490 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
489 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
490 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
491 491 
 			} else {
492 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
492 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
493 493 
 			}
494 494 
 			if ($filter_name != '') {
495 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
495 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
496 496 
 			}
497 497 
 			$Spotter = new Spotter($this->db);
498 498 
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
499 
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
499 
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
500 500 
 		}
501 501 
 		return $all;
502 502 
 	}
503 
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
503 
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
504 504 
 		global $globalStatsFilters;
505 505 
 		if ($filter_name == '') $filter_name = $this->filter_name;
506 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
506 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
507 507 
 			$Spotter = new Spotter($this->db);
508 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
508 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
509 509 
 			$alliance_airlines = array();
510 510 
 			foreach ($airlines as $airline) {
511 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
511 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
512 512 
 			}
513 513 
 			if ($year == '' && $month == '') {
514 
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
515 
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
514 
+				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
515 
+				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
516 516 
 				 try {
517 517 
 					$sth = $this->db->prepare($query);
518 518 
 					$sth->execute(array(':filter_name' => $filter_name));
519 
-				} catch(PDOException $e) {
519 
+				} catch (PDOException $e) {
520 520 
 					echo "error : ".$e->getMessage();
521 521 
 				}
522 522 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -527,46 +527,46 @@  discard block
 
 block discarded – undo
527 527 
 				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
528 528 
 				 try {
529 529 
 					$sth = $this->db->prepare($query);
530 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
531 
-				} catch(PDOException $e) {
530 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
531 
+				} catch (PDOException $e) {
532 532 
 					echo "error : ".$e->getMessage();
533 533 
 				}
534 534 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
535 535 
 			} else $all = array();
536 536 
 		}
537 537 
 		if (empty($all)) {
538 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
539 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
538 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
539 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
540 540 
 			} else {
541 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
541 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
542 542 
 			}
543 543 
 			if ($filter_name != '') {
544 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
544 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
545 545 
 			}
546 546 
 			$Spotter = new Spotter($this->db);
547 547 
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
548 
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
548 
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
549 549 
 		}
550 550 
 		return $all;
551 551 
 	}
552 
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
552 
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
553 553 
 		$Connection = new Connection($this->db);
554 554 
 		if ($filter_name == '') $filter_name = $this->filter_name;
555 555 
 		if ($Connection->tableExists('countries')) {
556 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
556 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
557 557 
 				$Spotter = new Spotter($this->db);
558 
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
558 
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
559 559 
 				if ($year == '' && $month == '') {
560 560 
 					$alliance_airlines = array();
561 561 
 					foreach ($airlines as $airline) {
562 
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
562 
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
563 563 
 					}
564 
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
565 
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
564 
+					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
565 
+					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
566 566 
 					 try {
567 567 
 						$sth = $this->db->prepare($query);
568 568 
 						$sth->execute(array(':filter_name' => $filter_name));
569 
-					} catch(PDOException $e) {
569 
+					} catch (PDOException $e) {
570 570 
 						echo "error : ".$e->getMessage();
571 571 
 					}
572 572 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -578,8 +578,8 @@  discard block
 
 block discarded – undo
578 578 
 					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
579 579 
 					 try {
580 580 
 						$sth = $this->db->prepare($query);
581 
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
582 
-					} catch(PDOException $e) {
581 
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
582 
+					} catch (PDOException $e) {
583 583 
 						echo "error : ".$e->getMessage();
584 584 
 					}
585 585 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -590,7 +590,7 @@  discard block
 
 block discarded – undo
590 590 
 			return $Spotter->countAllFlightOverCountries($limit);
591 591 
 		} else return array();
592 592 
 	}
593 
-	public function countAllMarineOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
593 
+	public function countAllMarineOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
594 594 
 		$Connection = new Connection($this->db);
595 595 
 		if ($filter_name == '') $filter_name = $this->filter_name;
596 596 
 		if ($Connection->tableExists('countries')) {
 
@@ -601,7 +601,7 @@  discard block
 
 block discarded – undo
601 601 
 				 try {
602 602 
 					$sth = $this->db->prepare($query);
603 603 
 					$sth->execute(array(':filter_name' => $filter_name));
604 
-				} catch(PDOException $e) {
604 
+				} catch (PDOException $e) {
605 605 
 					echo "error : ".$e->getMessage();
606 606 
 				}
607 607 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -609,15 +609,15 @@  discard block
 
 block discarded – undo
609 609 
 			if (empty($all)) {
610 610 
 				$filters = array();
611 611 
 				if ($filter_name != '') {
612 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
612 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
613 613 
 				}
614 614 
 				$Marine = new Marine($this->db);
615 
-				$all = $Marine->countAllMarineOverCountries($limit,0,'',$filters);
615 
+				$all = $Marine->countAllMarineOverCountries($limit, 0, '', $filters);
616 616 
 			}
617 617 
 			return $all;
618 618 
 		} else return array();
619 619 
 	}
620 
-	public function countAllTrackerOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
620 
+	public function countAllTrackerOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
621 621 
 		global $globalStatsFilters;
622 622 
 		$Connection = new Connection($this->db);
623 623 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 
@@ -629,7 +629,7 @@  discard block
 
 block discarded – undo
629 629 
 				 try {
630 630 
 					$sth = $this->db->prepare($query);
631 631 
 					$sth->execute(array(':filter_name' => $filter_name));
632 
-				} catch(PDOException $e) {
632 
+				} catch (PDOException $e) {
633 633 
 					echo "error : ".$e->getMessage();
634 634 
 				}
635 635 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -638,15 +638,15 @@  discard block
 
 block discarded – undo
638 638 
 			if (empty($all)) {
639 639 
 				$filters = array();
640 640 
 				if ($filter_name != '') {
641 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
641 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
642 642 
 				}
643 643 
 				$Tracker = new Tracker($this->db);
644 
-				$all = $Tracker->countAllTrackerOverCountries($limit,0,'',$filters);
644 
+				$all = $Tracker->countAllTrackerOverCountries($limit, 0, '', $filters);
645 645 
 			}
646 646 
 			return $all;
647 647 
 		} else return array();
648 648 
 	}
649 
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
649 
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
650 650 
 		global $globalStatsFilters;
651 651 
 		if ($filter_name == '') $filter_name = $this->filter_name;
652 652 
 		if ($year == '' && $month == '') {
 
@@ -654,41 +654,41 @@  discard block
 
 block discarded – undo
654 654 
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
655 655 
 			try {
656 656 
 				$sth = $this->db->prepare($query);
657 
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
658 
-			} catch(PDOException $e) {
657 
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
658 
+			} catch (PDOException $e) {
659 659 
 				echo "error : ".$e->getMessage();
660 660 
 			}
661 661 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
662 662 
 		} else $all = array();
663 663 
 		if (empty($all)) {
664 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
664 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
665 665 
 			if ($filter_name != '') {
666 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
666 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
667 667 
 			}
668 668 
 			$Spotter = new Spotter($this->db);
669 669 
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
670 
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
670 
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
671 671 
 		}
672 672 
 		return $all;
673 673 
 	}
674 674
675 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
675 
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
676 676 
 		global $globalStatsFilters;
677 677 
 		if ($filter_name == '') $filter_name = $this->filter_name;
678 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
678 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
679 679 
 			$Spotter = new Spotter($this->db);
680 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
680 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
681 681 
 			if ($year == '' && $month == '') {
682 682 
 				$alliance_airlines = array();
683 683 
 				foreach ($airlines as $airline) {
684 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
684 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
685 685 
 				}
686 
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
687 
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
686 
+				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
687 
+				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
688 688 
 				try {
689 689 
 					$sth = $this->db->prepare($query);
690 690 
 					$sth->execute(array(':filter_name' => $filter_name));
691 
-				} catch(PDOException $e) {
691 
+				} catch (PDOException $e) {
692 692 
 					echo "error : ".$e->getMessage();
693 693 
 				}
694 694 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -699,45 +699,45 @@  discard block
 
 block discarded – undo
699 699 
 				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
700 700 
 				try {
701 701 
 					$sth = $this->db->prepare($query);
702 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
703 
-				} catch(PDOException $e) {
702 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
703 
+				} catch (PDOException $e) {
704 704 
 					echo "error : ".$e->getMessage();
705 705 
 				}
706 706 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
707 707 
 			} else $all = array();
708 708 
 		}
709 709 
 		if (empty($all)) {
710 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
711 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
710 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
711 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
712 712 
 			} else {
713 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
713 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
714 714 
 			}
715 715 
 			if ($filter_name != '') {
716 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
716 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
717 717 
 			}
718 718 
 			$Spotter = new Spotter($this->db);
719 719 
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
720 
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
720 
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
721 721 
 		}
722 722 
 		return $all;
723 723 
 	}
724 
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
724 
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
725 725 
 		global $globalStatsFilters;
726 726 
 		if ($filter_name == '') $filter_name = $this->filter_name;
727 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
727 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
728 728 
 			$Spotter = new Spotter($this->db);
729 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
729 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
730 730 
 			if ($year == '' && $month == '') {
731 731 
 				$alliance_airlines = array();
732 732 
 				foreach ($airlines as $airline) {
733 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
733 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
734 734 
 				}
735 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
736 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
735 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
736 
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
737 737 
 				try {
738 738 
 					$sth = $this->db->prepare($query);
739 739 
 					$sth->execute(array(':filter_name' => $filter_name));
740 
-				} catch(PDOException $e) {
740 
+				} catch (PDOException $e) {
741 741 
 					echo "error : ".$e->getMessage();
742 742 
 				}
743 743 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -748,27 +748,27 @@  discard block
 
 block discarded – undo
748 748 
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
749 749 
 				try {
750 750 
 					$sth = $this->db->prepare($query);
751 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
752 
-				} catch(PDOException $e) {
751 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
752 
+				} catch (PDOException $e) {
753 753 
 					echo "error : ".$e->getMessage();
754 754 
 				}
755 755 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
756 756 
 			} else $all = array();
757 757 
 		}
758 758 
 		if (empty($all)) {
759 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
760 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
759 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
760 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
761 761 
 			} else {
762 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
762 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
763 763 
 			}
764 764 
 			if ($filter_name != '') {
765 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
765 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
766 766 
 			}
767 767 
 			$Spotter = new Spotter($this->db);
768 768 
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
769 769 
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
770 
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
771 
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
770 
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
771 
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
772 772 
 			$all = array();
773 773 
 			foreach ($pall as $value) {
774 774 
 				$icao = $value['airport_departure_icao'];
 
@@ -784,27 +784,27 @@  discard block
 
 block discarded – undo
784 784 
 			foreach ($all as $key => $row) {
785 785 
 				$count[$key] = $row['airport_departure_icao_count'];
786 786 
 			}
787 
-			array_multisort($count,SORT_DESC,$all);
787 
+			array_multisort($count, SORT_DESC, $all);
788 788 
 		}
789 789 
 		return $all;
790 790 
 	}
791 
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
791 
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
792 792 
 		global $globalStatsFilters;
793 793 
 		if ($filter_name == '') $filter_name = $this->filter_name;
794 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
794 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
795 795 
 			$Spotter = new Spotter($this->db);
796 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
796 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
797 797 
 			if ($year == '' && $month == '') {
798 798 
 				$alliance_airlines = array();
799 799 
 				foreach ($airlines as $airline) {
800 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
800 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
801 801 
 				}
802 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
803 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
802 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
803 
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
804 804 
 				try {
805 805 
 					$sth = $this->db->prepare($query);
806 806 
 					$sth->execute(array(':filter_name' => $filter_name));
807 
-				} catch(PDOException $e) {
807 
+				} catch (PDOException $e) {
808 808 
 					echo "error : ".$e->getMessage();
809 809 
 				}
810 810 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -815,27 +815,27 @@  discard block
 
 block discarded – undo
815 815 
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
816 816 
 				try {
817 817 
 					$sth = $this->db->prepare($query);
818 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
819 
-				} catch(PDOException $e) {
818 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
819 
+				} catch (PDOException $e) {
820 820 
 					echo "error : ".$e->getMessage();
821 821 
 				}
822 822 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
823 823 
 			} else $all = array();
824 824 
 		}
825 825 
 		if (empty($all)) {
826 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
827 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
826 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
827 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
828 828 
 			} else {
829 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
829 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
830 830 
 			}
831 831 
 			if ($filter_name != '') {
832 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
832 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
833 833 
 			}
834 834 
 			$Spotter = new Spotter($this->db);
835 835 
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
836 836 
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
837 
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
838 
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
837 
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
838 
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
839 839 
 			$all = array();
840 840 
 			foreach ($pall as $value) {
841 841 
 				$icao = $value['airport_arrival_icao'];
 
@@ -851,26 +851,26 @@  discard block
 
 block discarded – undo
851 851 
 			foreach ($all as $key => $row) {
852 852 
 				$count[$key] = $row['airport_arrival_icao_count'];
853 853 
 			}
854 
-			array_multisort($count,SORT_DESC,$all);
854 
+			array_multisort($count, SORT_DESC, $all);
855 855 
 		}
856 856 
 		return $all;
857 857 
 	}
858 
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
858 
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
859 859 
 		global $globalDBdriver, $globalStatsFilters;
860 860 
 		if ($filter_name == '') $filter_name = $this->filter_name;
861 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
861 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
862 862 
 			$Spotter = new Spotter($this->db);
863 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
863 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
864 864 
 			$alliance_airlines = array();
865 865 
 			foreach ($airlines as $airline) {
866 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
866 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
867 867 
 			}
868 868 
 			if ($globalDBdriver == 'mysql') {
869 
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
870 
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
869 
+				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
870 
+				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
871 871 
 			} else {
872 
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
873 
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
872 
+				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
873 
+				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
874 874 
 			}
875 875 
 			$query_data = array(':filter_name' => $filter_name);
876 876 
 		} else {
 
@@ -881,23 +881,23 @@  discard block
 
 block discarded – undo
881 881 
 				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
882 882 
 				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
883 883 
 			}
884 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
884 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
885 885 
 		}
886 886 
 		try {
887 887 
 			$sth = $this->db->prepare($query);
888 888 
 			$sth->execute($query_data);
889 
-		} catch(PDOException $e) {
889 
+		} catch (PDOException $e) {
890 890 
 			echo "error : ".$e->getMessage();
891 891 
 		}
892 892 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
893 893 
 		if (empty($all)) {
894 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
895 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
894 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
895 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
896 896 
 			} else {
897 897 
 				$filters = array('airlines' => array($stats_airline));
898 898 
 			}
899 899 
 			if ($filter_name != '') {
900 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
900 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
901 901 
 			}
902 902 
 			$Spotter = new Spotter($this->db);
903 903 
 			$all = $Spotter->countAllMonthsLastYear($filters);
 
@@ -905,7 +905,7 @@  discard block
 
 block discarded – undo
905 905 
 		return $all;
906 906 
 	}
907 907
908 
-	public function countAllMarineMonthsLastYear($limit = true,$filter_name = '') {
908 
+	public function countAllMarineMonthsLastYear($limit = true, $filter_name = '') {
909 909 
 		global $globalDBdriver, $globalStatsFilters;
910 910 
 		if ($filter_name == '') $filter_name = $this->filter_name;
911 911 
 		if ($globalDBdriver == 'mysql') {
 
@@ -919,14 +919,14 @@  discard block
 
 block discarded – undo
919 919 
 		try {
920 920 
 			$sth = $this->db->prepare($query);
921 921 
 			$sth->execute($query_data);
922 
-		} catch(PDOException $e) {
922 
+		} catch (PDOException $e) {
923 923 
 			echo "error : ".$e->getMessage();
924 924 
 		}
925 925 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
926 926 
 		if (empty($all)) {
927 927 
 			$filters = array();
928 928 
 			if ($filter_name != '') {
929 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
929 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
930 930 
 			}
931 931 
 			$Marine = new Marine($this->db);
932 932 
 			$all = $Marine->countAllMonthsLastYear($filters);
 
@@ -934,7 +934,7 @@  discard block
 
 block discarded – undo
934 934 
 		return $all;
935 935 
 	}
936 936
937 
-	public function countAllTrackerMonthsLastYear($limit = true,$filter_name = '') {
937 
+	public function countAllTrackerMonthsLastYear($limit = true, $filter_name = '') {
938 938 
 		global $globalDBdriver, $globalStatsFilters;
939 939 
 		if ($filter_name == '') $filter_name = $this->filter_name;
940 940 
 		if ($globalDBdriver == 'mysql') {
 
@@ -948,14 +948,14 @@  discard block
 
 block discarded – undo
948 948 
 		try {
949 949 
 			$sth = $this->db->prepare($query);
950 950 
 			$sth->execute($query_data);
951 
-		} catch(PDOException $e) {
951 
+		} catch (PDOException $e) {
952 952 
 			echo "error : ".$e->getMessage();
953 953 
 		}
954 954 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
955 955 
 		if (empty($all)) {
956 956 
 			$filters = array();
957 957 
 			if ($filter_name != '') {
958 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
958 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
959 959 
 			}
960 960 
 			$Tracker = new Tracker($this->db);
961 961 
 			$all = $Tracker->countAllMonthsLastYear($filters);
 
@@ -963,37 +963,37 @@  discard block
 
 block discarded – undo
963 963 
 		return $all;
964 964 
 	}
965 965
966 
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
966 
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
967 967 
 		global $globalStatsFilters;
968 968 
 		if ($filter_name == '') $filter_name = $this->filter_name;
969 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
969 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
970 970 
 			$Spotter = new Spotter($this->db);
971 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
971 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
972 972 
 			$alliance_airlines = array();
973 973 
 			foreach ($airlines as $airline) {
974 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
974 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
975 975 
 			}
976 
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
976 
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
977 977 
 			$query_data = array(':filter_name' => $filter_name);
978 978 
 		} else {
979 979 
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
980 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
980 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
981 981 
 		}
982 982 
 		try {
983 983 
 			$sth = $this->db->prepare($query);
984 984 
 			$sth->execute($query_data);
985 
-		} catch(PDOException $e) {
985 
+		} catch (PDOException $e) {
986 986 
 			echo "error : ".$e->getMessage();
987 987 
 		}
988 988 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
989 989 
 		if (empty($all)) {
990 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
991 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
990 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
991 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
992 992 
 			} else {
993 993 
 				$filters = array('airlines' => array($stats_airline));
994 994 
 			}
995 995 
 			if ($filter_name != '') {
996 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
996 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
997 997 
 			}
998 998 
 			$Spotter = new Spotter($this->db);
999 999 
 			$all = $Spotter->countAllDatesLastMonth($filters);
 
@@ -1008,14 +1008,14 @@  discard block
 
 block discarded – undo
1008 1008 
 		try {
1009 1009 
 			$sth = $this->db->prepare($query);
1010 1010 
 			$sth->execute($query_data);
1011 
-		} catch(PDOException $e) {
1011 
+		} catch (PDOException $e) {
1012 1012 
 			echo "error : ".$e->getMessage();
1013 1013 
 		}
1014 1014 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1015 1015 
 		if (empty($all)) {
1016 1016 
 			$filters = array();
1017 1017 
 			if ($filter_name != '') {
1018 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1018 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1019 1019 
 			}
1020 1020 
 			$Marine = new Marine($this->db);
1021 1021 
 			$all = $Marine->countAllDatesLastMonth($filters);
 
@@ -1030,34 +1030,34 @@  discard block
 
 block discarded – undo
1030 1030 
 		try {
1031 1031 
 			$sth = $this->db->prepare($query);
1032 1032 
 			$sth->execute($query_data);
1033 
-		} catch(PDOException $e) {
1033 
+		} catch (PDOException $e) {
1034 1034 
 			echo "error : ".$e->getMessage();
1035 1035 
 		}
1036 1036 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1037 1037 
 		if (empty($all)) {
1038 1038 
 			$filters = array();
1039 1039 
 			if ($filter_name != '') {
1040 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1040 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1041 1041 
 			}
1042 1042 
 			$Tracker = new Tracker($this->db);
1043 1043 
 			$all = $Tracker->countAllDatesLastMonth($filters);
1044 1044 
 		}
1045 1045 
 		return $all;
1046 1046 
 	}
1047 
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
1047 
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
1048 1048 
 		global $globalDBdriver, $globalStatsFilters;
1049 1049 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1050 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1050 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1051 1051 
 			$Spotter = new Spotter($this->db);
1052 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1052 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1053 1053 
 			$alliance_airlines = array();
1054 1054 
 			foreach ($airlines as $airline) {
1055 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1055 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1056 1056 
 			}
1057 1057 
 			if ($globalDBdriver == 'mysql') {
1058 
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1058 
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1059 1059 
 			} else {
1060 
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1060 
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1061 1061 
 			}
1062 1062 
 			$query_data = array(':filter_name' => $filter_name);
1063 1063 
 		} else {
 
@@ -1066,23 +1066,23 @@  discard block
 
 block discarded – undo
1066 1066 
 			} else {
1067 1067 
 				$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1068 1068 
 			}
1069 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1069 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1070 1070 
 		}
1071 1071 
 		try {
1072 1072 
 			$sth = $this->db->prepare($query);
1073 1073 
 			$sth->execute($query_data);
1074 
-		} catch(PDOException $e) {
1074 
+		} catch (PDOException $e) {
1075 1075 
 			echo "error : ".$e->getMessage();
1076 1076 
 		}
1077 1077 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1078 1078 
 		if (empty($all)) {
1079 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1080 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1079 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1080 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1081 1081 
 			} else {
1082 1082 
 				$filters = array('airlines' => array($stats_airline));
1083 1083 
 			}
1084 1084 
 			if ($filter_name != '') {
1085 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1085 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1086 1086 
 			}
1087 1087 
 			$Spotter = new Spotter($this->db);
1088 1088 
 			$all = $Spotter->countAllDatesLast7Days($filters);
 
@@ -1101,14 +1101,14 @@  discard block
 
 block discarded – undo
1101 1101 
 		try {
1102 1102 
 			$sth = $this->db->prepare($query);
1103 1103 
 			$sth->execute($query_data);
1104 
-		} catch(PDOException $e) {
1104 
+		} catch (PDOException $e) {
1105 1105 
 			echo "error : ".$e->getMessage();
1106 1106 
 		}
1107 1107 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1108 1108 
 		if (empty($all)) {
1109 1109 
 			$filters = array();
1110 1110 
 			if ($filter_name != '') {
1111 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1111 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1112 1112 
 			}
1113 1113 
 			$Marine = new Marine($this->db);
1114 1114 
 			$all = $Marine->countAllDatesLast7Days($filters);
 
@@ -1127,51 +1127,51 @@  discard block
 
 block discarded – undo
1127 1127 
 		try {
1128 1128 
 			$sth = $this->db->prepare($query);
1129 1129 
 			$sth->execute($query_data);
1130 
-		} catch(PDOException $e) {
1130 
+		} catch (PDOException $e) {
1131 1131 
 			echo "error : ".$e->getMessage();
1132 1132 
 		}
1133 1133 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1134 1134 
 		if (empty($all)) {
1135 1135 
 			$filters = array();
1136 1136 
 			if ($filter_name != '') {
1137 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1137 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1138 1138 
 			}
1139 1139 
 			$Tracker = new Tracker($this->db);
1140 1140 
 			$all = $Tracker->countAllDatesLast7Days($filters);
1141 1141 
 		}
1142 1142 
 		return $all;
1143 1143 
 	}
1144 
-	public function countAllDates($stats_airline = '',$filter_name = '') {
1144 
+	public function countAllDates($stats_airline = '', $filter_name = '') {
1145 1145 
 		global $globalStatsFilters;
1146 1146 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1147 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1147 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1148 1148 
 			$Spotter = new Spotter($this->db);
1149 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1149 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1150 1150 
 			$alliance_airlines = array();
1151 1151 
 			foreach ($airlines as $airline) {
1152 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1152 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1153 1153 
 			}
1154 
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
1154 
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
1155 1155 
 			$query_data = array(':filter_name' => $filter_name);
1156 1156 
 		} else {
1157 1157 
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
1158 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1158 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1159 1159 
 		}
1160 1160 
 		try {
1161 1161 
 			$sth = $this->db->prepare($query);
1162 1162 
 			$sth->execute($query_data);
1163 
-		} catch(PDOException $e) {
1163 
+		} catch (PDOException $e) {
1164 1164 
 			echo "error : ".$e->getMessage();
1165 1165 
 		}
1166 1166 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1167 1167 
 		if (empty($all)) {
1168 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1169 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1168 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1169 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1170 1170 
 			} else {
1171 1171 
 				$filters = array('airlines' => array($stats_airline));
1172 1172 
 			}
1173 1173 
 			if ($filter_name != '') {
1174 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1174 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1175 1175 
 			}
1176 1176 
 			$Spotter = new Spotter($this->db);
1177 1177 
 			$all = $Spotter->countAllDates($filters);
 
@@ -1186,7 +1186,7 @@  discard block
 
 block discarded – undo
1186 1186 
 		try {
1187 1187 
 			$sth = $this->db->prepare($query);
1188 1188 
 			$sth->execute($query_data);
1189 
-		} catch(PDOException $e) {
1189 
+		} catch (PDOException $e) {
1190 1190 
 			echo "error : ".$e->getMessage();
1191 1191 
 		}
1192 1192 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1208,7 +1208,7 @@  discard block
 
 block discarded – undo
1208 1208 
 		try {
1209 1209 
 			$sth = $this->db->prepare($query);
1210 1210 
 			$sth->execute($query_data);
1211 
-		} catch(PDOException $e) {
1211 
+		} catch (PDOException $e) {
1212 1212 
 			echo "error : ".$e->getMessage();
1213 1213 
 		}
1214 1214 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1230,34 +1230,34 @@  discard block
 
 block discarded – undo
1230 1230 
 		try {
1231 1231 
 			$sth = $this->db->prepare($query);
1232 1232 
 			$sth->execute($query_data);
1233 
-		} catch(PDOException $e) {
1233 
+		} catch (PDOException $e) {
1234 1234 
 			echo "error : ".$e->getMessage();
1235 1235 
 		}
1236 1236 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1237 1237 
 		if (empty($all)) {
1238 1238 
 			$filters = array();
1239 1239 
 			if ($filter_name != '') {
1240 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1240 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1241 1241 
 			}
1242 1242 
 			$Spotter = new Spotter($this->db);
1243 1243 
 			$all = $Spotter->countAllDatesByAirlines($filters);
1244 1244 
 		}
1245 1245 
 		return $all;
1246 1246 
 	}
1247 
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
1247 
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
1248 1248 
 		global $globalStatsFilters, $globalDBdriver;
1249 1249 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1250 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1250 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1251 1251 
 			$Spotter = new Spotter($this->db);
1252 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1252 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1253 1253 
 			$alliance_airlines = array();
1254 1254 
 			foreach ($airlines as $airline) {
1255 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1255 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1256 1256 
 			}
1257 1257 
 			if ($globalDBdriver == 'mysql') {
1258 
-				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
1258 
+				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
1259 1259 
 			} else {
1260 
-				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
1260 
+				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
1261 1261 
 			}
1262 1262 
 			$query_data = array(':filter_name' => $filter_name);
1263 1263 
 		} else {
 
@@ -1271,18 +1271,18 @@  discard block
 
 block discarded – undo
1271 1271 
 		try {
1272 1272 
 			$sth = $this->db->prepare($query);
1273 1273 
 			$sth->execute($query_data);
1274 
-		} catch(PDOException $e) {
1274 
+		} catch (PDOException $e) {
1275 1275 
 			echo "error : ".$e->getMessage();
1276 1276 
 		}
1277 1277 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1278 1278 
 		if (empty($all)) {
1279 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1280 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1279 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1280 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1281 1281 
 			} else {
1282 1282 
 				$filters = array('airlines' => array($stats_airline));
1283 1283 
 			}
1284 1284 
 			if ($filter_name != '') {
1285 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1285 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1286 1286 
 			}
1287 1287 
 			$Spotter = new Spotter($this->db);
1288 1288 
 			$all = $Spotter->countAllMonths($filters);
 
@@ -1299,7 +1299,7 @@  discard block
 
 block discarded – undo
1299 1299 
 		try {
1300 1300 
 			$sth = $this->db->prepare($query);
1301 1301 
 			$sth->execute();
1302 
-		} catch(PDOException $e) {
1302 
+		} catch (PDOException $e) {
1303 1303 
 			echo "error : ".$e->getMessage();
1304 1304 
 		}
1305 1305 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1319,7 +1319,7 @@  discard block
 
 block discarded – undo
1319 1319 
 		try {
1320 1320 
 			$sth = $this->db->prepare($query);
1321 1321 
 			$sth->execute();
1322 
-		} catch(PDOException $e) {
1322 
+		} catch (PDOException $e) {
1323 1323 
 			echo "error : ".$e->getMessage();
1324 1324 
 		}
1325 1325 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1336,32 +1336,32 @@  discard block
 
 block discarded – undo
1336 1336 
 		try {
1337 1337 
 			$sth = $this->db->prepare($query);
1338 1338 
 			$sth->execute(array(':filter_name' => $filter_name));
1339 
-		} catch(PDOException $e) {
1339 
+		} catch (PDOException $e) {
1340 1340 
 			echo "error : ".$e->getMessage();
1341 1341 
 		}
1342 1342 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1343 1343 
 		if (empty($all)) {
1344 1344 
 			$filters = array();
1345 1345 
 			if ($filter_name != '') {
1346 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1346 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1347 1347 
 			}
1348 1348 
 			$Spotter = new Spotter($this->db);
1349 1349 
 			$all = $Spotter->countAllMilitaryMonths($filters);
1350 1350 
 		}
1351 1351 
 		return $all;
1352 1352 
 	}
1353 
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1353 
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1354 1354 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1355 1355 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1356 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1356 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1357 1357 
 			$Spotter = new Spotter($this->db);
1358 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1358 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1359 1359 
 			$alliance_airlines = array();
1360 1360 
 			foreach ($airlines as $airline) {
1361 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1361 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1362 1362 
 			}
1363 
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1364 
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1363 
+			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1364 
+			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1365 1365 
 			$query_data = array(':filter_name' => $filter_name);
1366 1366 
 		} else {
1367 1367 
 			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1379,25 +1379,25 @@  discard block
 
 block discarded – undo
1379 1379 
 		try {
1380 1380 
 			$sth = $this->db->prepare($query);
1381 1381 
 			$sth->execute($query_data);
1382 
-		} catch(PDOException $e) {
1382 
+		} catch (PDOException $e) {
1383 1383 
 			echo "error : ".$e->getMessage();
1384 1384 
 		}
1385 1385 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1386 1386 
 		if (empty($all)) {
1387 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1388 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1387 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1388 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1389 1389 
 			} else {
1390 1390 
 				$filters = array('airlines' => array($stats_airline));
1391 1391 
 			}
1392 1392 
 			if ($filter_name != '') {
1393 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1393 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1394 1394 
 			}
1395 1395 
 			$Spotter = new Spotter($this->db);
1396 
-			$all = $Spotter->countAllHours($orderby,$filters);
1396 
+			$all = $Spotter->countAllHours($orderby, $filters);
1397 1397 
 		}
1398 1398 
 		return $all;
1399 1399 
 	}
1400 
-	public function countAllMarineHours($orderby = 'hour',$limit = true,$filter_name = '') {
1400 
+	public function countAllMarineHours($orderby = 'hour', $limit = true, $filter_name = '') {
1401 1401 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1402 1402 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1403 1403 
 		if ($limit) $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
 
@@ -1414,21 +1414,21 @@  discard block
 
 block discarded – undo
1414 1414 
 		try {
1415 1415 
 			$sth = $this->db->prepare($query);
1416 1416 
 			$sth->execute($query_data);
1417 
-		} catch(PDOException $e) {
1417 
+		} catch (PDOException $e) {
1418 1418 
 			echo "error : ".$e->getMessage();
1419 1419 
 		}
1420 1420 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1421 1421 
 		if (empty($all)) {
1422 1422 
 			$filters = array();
1423 1423 
 			if ($filter_name != '') {
1424 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1424 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1425 1425 
 			}
1426 1426 
 			$Marine = new Marine($this->db);
1427 
-			$all = $Marine->countAllHours($orderby,$filters);
1427 
+			$all = $Marine->countAllHours($orderby, $filters);
1428 1428 
 		}
1429 1429 
 		return $all;
1430 1430 
 	}
1431 
-	public function countAllTrackerHours($orderby = 'hour',$limit = true,$filter_name = '') {
1431 
+	public function countAllTrackerHours($orderby = 'hour', $limit = true, $filter_name = '') {
1432 1432 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1433 1433 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1434 1434 
 		if ($limit) $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
 
@@ -1445,33 +1445,33 @@  discard block
 
 block discarded – undo
1445 1445 
 		try {
1446 1446 
 			$sth = $this->db->prepare($query);
1447 1447 
 			$sth->execute($query_data);
1448 
-		} catch(PDOException $e) {
1448 
+		} catch (PDOException $e) {
1449 1449 
 			echo "error : ".$e->getMessage();
1450 1450 
 		}
1451 1451 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1452 1452 
 		if (empty($all)) {
1453 1453 
 			$filters = array();
1454 1454 
 			if ($filter_name != '') {
1455 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1455 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1456 1456 
 			}
1457 1457 
 			$Tracker = new Tracker($this->db);
1458 
-			$all = $Tracker->countAllHours($orderby,$filters);
1458 
+			$all = $Tracker->countAllHours($orderby, $filters);
1459 1459 
 		}
1460 1460 
 		return $all;
1461 1461 
 	}
1462 
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1462 
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1463 1463 
 		global $globalStatsFilters;
1464 1464 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1465 1465 
 		if ($year == '') $year = date('Y');
1466 
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1466 
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1467 1467 
 		if (empty($all)) {
1468 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1469 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1468 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1469 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1470 1470 
 			} else {
1471 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1471 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1472 1472 
 			}
1473 1473 
 			if ($filter_name != '') {
1474 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1474 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1475 1475 
 			}
1476 1476 
 			$Spotter = new Spotter($this->db);
1477 1477 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1479,15 +1479,15 @@  discard block
 
 block discarded – undo
1479 1479 
 		}
1480 1480 
 		return $all;
1481 1481 
 	}
1482 
-	public function countOverallMarine($filter_name = '',$year = '',$month = '') {
1482 
+	public function countOverallMarine($filter_name = '', $year = '', $month = '') {
1483 1483 
 		global $globalStatsFilters;
1484 1484 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1485 1485 
 		if ($year == '') $year = date('Y');
1486 
-		$all = $this->getSumStats('marine_bymonth',$year,'',$filter_name,$month);
1486 
+		$all = $this->getSumStats('marine_bymonth', $year, '', $filter_name, $month);
1487 1487 
 		if (empty($all)) {
1488 
-			$filters = array('year' => $year,'month' => $month);
1488 
+			$filters = array('year' => $year, 'month' => $month);
1489 1489 
 			if ($filter_name != '') {
1490 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1490 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1491 1491 
 			}
1492 1492 
 			$Marine = new Marine($this->db);
1493 1493 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1495,15 +1495,15 @@  discard block
 
 block discarded – undo
1495 1495 
 		}
1496 1496 
 		return $all;
1497 1497 
 	}
1498 
-	public function countOverallTracker($filter_name = '',$year = '',$month = '') {
1498 
+	public function countOverallTracker($filter_name = '', $year = '', $month = '') {
1499 1499 
 		global $globalStatsFilters;
1500 1500 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1501 1501 
 		if ($year == '') $year = date('Y');
1502 
-		$all = $this->getSumStats('tracker_bymonth',$year,'',$filter_name,$month);
1502 
+		$all = $this->getSumStats('tracker_bymonth', $year, '', $filter_name, $month);
1503 1503 
 		if (empty($all)) {
1504 
-			$filters = array('year' => $year,'month' => $month);
1504 
+			$filters = array('year' => $year, 'month' => $month);
1505 1505 
 			if ($filter_name != '') {
1506 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1506 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1507 1507 
 			}
1508 1508 
 			$Tracker = new Tracker($this->db);
1509 1509 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1511,16 +1511,16 @@  discard block
 
 block discarded – undo
1511 1511 
 		}
1512 1512 
 		return $all;
1513 1513 
 	}
1514 
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1514 
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1515 1515 
 		global $globalStatsFilters;
1516 1516 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1517 1517 
 		if ($year == '') $year = date('Y');
1518 
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1518 
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1519 1519 
 		if (empty($all)) {
1520 1520 
 			$filters = array();
1521 
-			$filters = array('year' => $year,'month' => $month);
1521 
+			$filters = array('year' => $year, 'month' => $month);
1522 1522 
 			if ($filter_name != '') {
1523 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1523 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1524 1524 
 			}
1525 1525 
 			$Spotter = new Spotter($this->db);
1526 1526 
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
 
@@ -1528,19 +1528,19 @@  discard block
 
 block discarded – undo
1528 1528 
 		}
1529 1529 
 		return $all;
1530 1530 
 	}
1531 
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1531 
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1532 1532 
 		global $globalStatsFilters;
1533 1533 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1534 1534 
 		if ($year == '') $year = date('Y');
1535 
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1535 
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1536 1536 
 		if (empty($all)) {
1537 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1538 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1537 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1538 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1539 1539 
 			} else {
1540 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1540 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1541 1541 
 			}
1542 1542 
 			if ($filter_name != '') {
1543 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1543 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1544 1544 
 			}
1545 1545 
 			$Spotter = new Spotter($this->db);
1546 1546 
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
 
@@ -1548,48 +1548,48 @@  discard block
 
 block discarded – undo
1548 1548 
 		}
1549 1549 
 		return $all;
1550 1550 
 	}
1551 
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1551 
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1552 1552 
 		global $globalStatsFilters;
1553 1553 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1554 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1554 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1555 1555 
 			$Spotter = new Spotter($this->db);
1556 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1556 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1557 1557 
 			if ($year == '' && $month == '') {
1558 1558 
 				$alliance_airlines = array();
1559 1559 
 				foreach ($airlines as $airline) {
1560 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1560 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1561 1561 
 				}
1562 
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1562 
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1563 1563 
 				try {
1564 1564 
 					$sth = $this->db->prepare($query);
1565 1565 
 					$sth->execute(array(':filter_name' => $filter_name));
1566 
-				} catch(PDOException $e) {
1566 
+				} catch (PDOException $e) {
1567 1567 
 					echo "error : ".$e->getMessage();
1568 1568 
 				}
1569 1569 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1570 1570 
 				$all = $result[0]['nb'];
1571 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1571 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1572 1572 
 		} else {
1573 1573 
 			if ($year == '' && $month == '') {
1574 1574 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1575 1575 
 				try {
1576 1576 
 					$sth = $this->db->prepare($query);
1577 
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1578 
-				} catch(PDOException $e) {
1577 
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1578 
+				} catch (PDOException $e) {
1579 1579 
 					echo "error : ".$e->getMessage();
1580 1580 
 				}
1581 1581 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1582 1582 
 				$all = $result[0]['nb'];
1583 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1583 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1584 1584 
 		}
1585 1585 
 		if (empty($all)) {
1586 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1587 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1586 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1587 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1588 1588 
 			} else {
1589 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1589 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1590 1590 
 			}
1591 1591 
 			if ($filter_name != '') {
1592 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1592 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1593 1593 
 			}
1594 1594 
 			$Spotter = new Spotter($this->db);
1595 1595 
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
 
@@ -1597,7 +1597,7 @@  discard block
 
 block discarded – undo
1597 1597 
 		}
1598 1598 
 		return $all;
1599 1599 
 	}
1600 
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1600 
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1601 1601 
 		global $globalStatsFilters;
1602 1602 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1603 1603 
 		if ($year == '' && $month == '') {
 
@@ -1605,17 +1605,17 @@  discard block
 
 block discarded – undo
1605 1605 
 			try {
1606 1606 
 				$sth = $this->db->prepare($query);
1607 1607 
 				$sth->execute(array(':filter_name' => $filter_name));
1608 
-			} catch(PDOException $e) {
1608 
+			} catch (PDOException $e) {
1609 1609 
 				echo "error : ".$e->getMessage();
1610 1610 
 			}
1611 1611 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1612 1612 
 			$all = $result[0]['nb_airline'];
1613 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1613 
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1614 1614 
 		if (empty($all)) {
1615 1615 
 			$filters = array();
1616 
-			$filters = array('year' => $year,'month' => $month);
1616 
+			$filters = array('year' => $year, 'month' => $month);
1617 1617 
 			if ($filter_name != '') {
1618 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1618 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1619 1619 
 			}
1620 1620 
 			$Spotter = new Spotter($this->db);
1621 1621 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1623,7 +1623,7 @@  discard block
 
 block discarded – undo
1623 1623 
 		}
1624 1624 
 		return $all;
1625 1625 
 	}
1626 
-	public function countOverallMarineTypes($filter_name = '',$year = '',$month = '') {
1626 
+	public function countOverallMarineTypes($filter_name = '', $year = '', $month = '') {
1627 1627 
 		global $globalStatsFilters;
1628 1628 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1629 1629 
 		$all = array();
 
@@ -1632,7 +1632,7 @@  discard block
 
 block discarded – undo
1632 1632 
 			try {
1633 1633 
 				$sth = $this->db->prepare($query);
1634 1634 
 				$sth->execute(array(':filter_name' => $filter_name));
1635 
-			} catch(PDOException $e) {
1635 
+			} catch (PDOException $e) {
1636 1636 
 				echo "error : ".$e->getMessage();
1637 1637 
 			}
1638 1638 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1640,9 +1640,9 @@  discard block
 
 block discarded – undo
1640 1640 
 		}
1641 1641 
 		if (empty($all)) {
1642 1642 
 			$filters = array();
1643 
-			$filters = array('year' => $year,'month' => $month);
1643 
+			$filters = array('year' => $year, 'month' => $month);
1644 1644 
 			if ($filter_name != '') {
1645 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1645 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1646 1646 
 			}
1647 1647 
 			$Marine = new Marine($this->db);
1648 1648 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1650,29 +1650,29 @@  discard block
 
 block discarded – undo
1650 1650 
 		}
1651 1651 
 		return $all;
1652 1652 
 	}
1653 
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1653 
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1654 1654 
 		global $globalStatsFilters;
1655 1655 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1656 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1656 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1657 1657 
 			$Spotter = new Spotter($this->db);
1658 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1658 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1659 1659 
 			if ($year == '' && $month == '') {
1660 1660 
 				$alliance_airlines = array();
1661 1661 
 				foreach ($airlines as $airline) {
1662 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1662 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1663 1663 
 				}
1664 
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1664 
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1665 1665 
 				$query_values = array(':filter_name' => $filter_name);
1666 1666 
 				try {
1667 1667 
 					$sth = $this->db->prepare($query);
1668 1668 
 					$sth->execute($query_values);
1669 
-				} catch(PDOException $e) {
1669 
+				} catch (PDOException $e) {
1670 1670 
 					echo "error : ".$e->getMessage();
1671 1671 
 				}
1672 1672 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1673 1673 
 				$all = $result[0]['nb'];
1674 1674 
 			} else {
1675 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1675 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1676 1676 
 			}
1677 1677 
 		} else {
1678 1678 
 			if ($year == '' && $month == '') {
 
@@ -1681,23 +1681,23 @@  discard block
 
 block discarded – undo
1681 1681 
 				try {
1682 1682 
 					$sth = $this->db->prepare($query);
1683 1683 
 					$sth->execute($query_values);
1684 
-				} catch(PDOException $e) {
1684 
+				} catch (PDOException $e) {
1685 1685 
 					echo "error : ".$e->getMessage();
1686 1686 
 				}
1687 1687 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1688 1688 
 				$all = $result[0]['nb'];
1689 1689 
 			} else {
1690 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1690 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1691 1691 
 			}
1692 1692 
 		}
1693 1693 
 		if (empty($all)) {
1694 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1695 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1694 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1695 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1696 1696 
 			} else {
1697 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1697 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1698 1698 
 			}
1699 1699 
 			if ($filter_name != '') {
1700 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1700 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1701 1701 
 			}
1702 1702 
 			$Spotter = new Spotter($this->db);
1703 1703 
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
 
@@ -1705,7 +1705,7 @@  discard block
 
 block discarded – undo
1705 1705 
 		}
1706 1706 
 		return $all;
1707 1707 
 	}
1708 
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1708 
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1709 1709 
 		global $globalStatsFilters;
1710 1710 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1711 1711 
 		//if ($year == '') $year = date('Y');
 
@@ -1715,18 +1715,18 @@  discard block
 
 block discarded – undo
1715 1715 
 			try {
1716 1716 
 				$sth = $this->db->prepare($query);
1717 1717 
 				$sth->execute($query_values);
1718 
-			} catch(PDOException $e) {
1718 
+			} catch (PDOException $e) {
1719 1719 
 				echo "error : ".$e->getMessage();
1720 1720 
 			}
1721 1721 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1722 1722 
 			$all = $result[0]['nb'];
1723 1723 
 		} else {
1724 
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1724 
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1725 1725 
 		}
1726 1726 
 		if (empty($all)) {
1727 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1727 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1728 1728 
 			if ($filter_name != '') {
1729 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1729 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1730 1730 
 			}
1731 1731 
 			$Spotter = new Spotter($this->db);
1732 1732 
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
 
@@ -1735,104 +1735,104 @@  discard block
 
 block discarded – undo
1735 1735 
 		return $all;
1736 1736 
 	}
1737 1737
1738 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1738 
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1739 1739 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1740 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1740 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1741 1741 
 			$Spotter = new Spotter($this->db);
1742 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1742 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1743 1743 
 			$alliance_airlines = array();
1744 1744 
 			foreach ($airlines as $airline) {
1745 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1745 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1746 1746 
 			}
1747 
-			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1748 
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1747 
+			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1748 
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1749 1749 
 		} else {
1750 1750 
 			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
1751 
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1751 
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1752 1752 
 		}
1753 1753 
 		try {
1754 1754 
 			$sth = $this->db->prepare($query);
1755 1755 
 			$sth->execute($query_values);
1756 
-		} catch(PDOException $e) {
1756 
+		} catch (PDOException $e) {
1757 1757 
 			echo "error : ".$e->getMessage();
1758 1758 
 		}
1759 1759 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1760 1760 
 		return $all;
1761 1761 
 	}
1762 
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1762 
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1763 1763 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1764 1764 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1765 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1765 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1766 1766 
 		try {
1767 1767 
 			$sth = $this->db->prepare($query);
1768 1768 
 			$sth->execute($query_values);
1769 
-		} catch(PDOException $e) {
1769 
+		} catch (PDOException $e) {
1770 1770 
 			echo "error : ".$e->getMessage();
1771 1771 
 		}
1772 1772 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1773 1773 
 		return $all;
1774 1774 
 	}
1775 
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1775 
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1776 1776 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1777 1777 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1778 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1778 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1779 1779 
 		try {
1780 1780 
 			$sth = $this->db->prepare($query);
1781 1781 
 			$sth->execute($query_values);
1782 
-		} catch(PDOException $e) {
1782 
+		} catch (PDOException $e) {
1783 1783 
 			echo "error : ".$e->getMessage();
1784 1784 
 		}
1785 1785 
 	}
1786 
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1786 
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1787 1787 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1788 1788 
 		global $globalArchiveMonths, $globalDBdriver;
1789 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1789 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1790 1790 
 			$Spotter = new Spotter($this->db);
1791 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1791 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1792 1792 
 			$alliance_airlines = array();
1793 1793 
 			foreach ($airlines as $airline) {
1794 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1794 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1795 1795 
 			}
1796 1796 
 			if ($globalDBdriver == 'mysql') {
1797 1797 
 				if ($month == '') {
1798 
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1798 
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1799 1799 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1800 1800 
 				} else {
1801 
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1802 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1801 
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1802 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1803 1803 
 				}
1804 1804 
 			} else {
1805 1805 
 				if ($month == '') {
1806 
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1806 
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1807 1807 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1808 1808 
 				} else {
1809 
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1810 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1809 
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1810 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1811 1811 
 				}
1812 1812 
 			}
1813 1813 
 		} else {
1814 1814 
 			if ($globalDBdriver == 'mysql') {
1815 1815 
 				if ($month == '') {
1816 1816 
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1817 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1817 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1818 1818 
 				} else {
1819 1819 
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1820 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1820 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1821 1821 
 				}
1822 1822 
 			} else {
1823 1823 
 				if ($month == '') {
1824 1824 
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1825 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1825 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1826 1826 
 				} else {
1827 1827 
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1828 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1828 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1829 1829 
 				}
1830 1830 
 			}
1831 1831 
 		}
1832 1832 
 		try {
1833 1833 
 			$sth = $this->db->prepare($query);
1834 1834 
 			$sth->execute($query_values);
1835 
-		} catch(PDOException $e) {
1835 
+		} catch (PDOException $e) {
1836 1836 
 			echo "error : ".$e->getMessage();
1837 1837 
 		}
1838 1838 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1841,17 +1841,17 @@  discard block
 
 block discarded – undo
1841 1841 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1842 1842 
 		global $globalArchiveMonths, $globalDBdriver;
1843 1843 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1844 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1844 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1845 1845 
 			$Spotter = new Spotter($this->db);
1846 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1846 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1847 1847 
 			$alliance_airlines = array();
1848 1848 
 			foreach ($airlines as $airline) {
1849 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1849 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1850 1850 
 			}
1851 1851 
 			if ($globalDBdriver == 'mysql') {
1852 
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1852 
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1853 1853 
 			} else {
1854 
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1854 
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1855 1855 
 			}
1856 1856 
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1857 1857 
 		} else {
 
@@ -1865,7 +1865,7 @@  discard block
 
 block discarded – undo
1865 1865 
 		try {
1866 1866 
 			$sth = $this->db->prepare($query);
1867 1867 
 			$sth->execute($query_values);
1868 
-		} catch(PDOException $e) {
1868 
+		} catch (PDOException $e) {
1869 1869 
 			echo "error : ".$e->getMessage();
1870 1870 
 		}
1871 1871 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1874,17 +1874,17 @@  discard block
 
 block discarded – undo
1874 1874 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1875 1875 
 		global $globalArchiveMonths, $globalDBdriver;
1876 1876 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1877 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1877 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1878 1878 
 			$Spotter = new Spotter($this->db);
1879 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1879 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1880 1880 
 			$alliance_airlines = array();
1881 1881 
 			foreach ($airlines as $airline) {
1882 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1882 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1883 1883 
 			}
1884 1884 
 			if ($globalDBdriver == 'mysql') {
1885 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1885 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1886 1886 
 			} else {
1887 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1887 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1888 1888 
 			}
1889 1889 
 		} else {
1890 1890 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1896,7 +1896,7 @@  discard block
 
 block discarded – undo
1896 1896 
 		try {
1897 1897 
 			$sth = $this->db->prepare($query);
1898 1898 
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1899 
-		} catch(PDOException $e) {
1899 
+		} catch (PDOException $e) {
1900 1900 
 			echo "error : ".$e->getMessage();
1901 1901 
 		}
1902 1902 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1913,7 +1913,7 @@  discard block
 
 block discarded – undo
1913 1913 
 		try {
1914 1914 
 			$sth = $this->db->prepare($query);
1915 1915 
 			$sth->execute(array(':filter_name' => $filter_name));
1916 
-		} catch(PDOException $e) {
1916 
+		} catch (PDOException $e) {
1917 1917 
 			echo "error : ".$e->getMessage();
1918 1918 
 		}
1919 1919 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1930,20 +1930,20 @@  discard block
 
 block discarded – undo
1930 1930 
 		try {
1931 1931 
 			$sth = $this->db->prepare($query);
1932 1932 
 			$sth->execute(array(':filter_name' => $filter_name));
1933 
-		} catch(PDOException $e) {
1933 
+		} catch (PDOException $e) {
1934 1934 
 			echo "error : ".$e->getMessage();
1935 1935 
 		}
1936 1936 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1937 1937 
 		return $all[0]['total'];
1938 1938 
 	}
1939 
-	public function getStatsOwner($owner_name,$filter_name = '') {
1939 
+	public function getStatsOwner($owner_name, $filter_name = '') {
1940 1940 
 		global $globalArchiveMonths, $globalDBdriver;
1941 1941 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1942 1942 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1943 1943 
 		try {
1944 1944 
 			$sth = $this->db->prepare($query);
1945 
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1946 
-		} catch(PDOException $e) {
1945 
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1946 
+		} catch (PDOException $e) {
1947 1947 
 			echo "error : ".$e->getMessage();
1948 1948 
 		}
1949 1949 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1961,20 +1961,20 @@  discard block
 
 block discarded – undo
1961 1961 
 		try {
1962 1962 
 			$sth = $this->db->prepare($query);
1963 1963 
 			$sth->execute(array(':filter_name' => $filter_name));
1964 
-		} catch(PDOException $e) {
1964 
+		} catch (PDOException $e) {
1965 1965 
 			echo "error : ".$e->getMessage();
1966 1966 
 		}
1967 1967 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1968 1968 
 		return $all[0]['total'];
1969 1969 
 	}
1970 
-	public function getStatsPilot($pilot,$filter_name = '') {
1970 
+	public function getStatsPilot($pilot, $filter_name = '') {
1971 1971 
 		global $globalArchiveMonths, $globalDBdriver;
1972 1972 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1973 1973 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1974 1974 
 		try {
1975 1975 
 			$sth = $this->db->prepare($query);
1976 
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1977 
-		} catch(PDOException $e) {
1976 
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1977 
+		} catch (PDOException $e) {
1978 1978 
 			echo "error : ".$e->getMessage();
1979 1979 
 		}
1980 1980 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1982,7 +1982,7 @@  discard block
 
 block discarded – undo
1982 1982 
 		else return 0;
1983 1983 
 	}
1984 1984
1985 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1985 
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1986 1986 
 		global $globalDBdriver;
1987 1987 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1988 1988 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1990,15 +1990,15 @@  discard block
 
 block discarded – undo
1990 1990 
 		} else {
1991 1991 
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1992 1992 
 		}
1993 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1993 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1994 1994 
 		try {
1995 1995 
 			$sth = $this->db->prepare($query);
1996 1996 
 			$sth->execute($query_values);
1997 
-		} catch(PDOException $e) {
1997 
+		} catch (PDOException $e) {
1998 1998 
 			return "error : ".$e->getMessage();
1999 1999 
 		}
2000 2000 
 	}
2001 
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
2001 
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
2002 2002 
 		global $globalDBdriver;
2003 2003 
 		if ($filter_name == '') $filter_name = $this->filter_name;
2004 2004 
 		if ($globalDBdriver == 'mysql') {
 
@@ -2007,11 +2007,11 @@  discard block
 
 block discarded – undo
2007 2007 
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
2008 2008 
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
2009 2009 
 		}
2010 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2010 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2011 2011 
 		try {
2012 2012 
 			$sth = $this->db->prepare($query);
2013 2013 
 			$sth->execute($query_values);
2014 
-		} catch(PDOException $e) {
2014 
+		} catch (PDOException $e) {
2015 2015 
 			return "error : ".$e->getMessage();
2016 2016 
 		}
2017 2017 
 	}
 
@@ -2035,95 +2035,95 @@  discard block
 
 block discarded – undo
2035 2035 
         }
2036 2036 
         */
2037 2037
2038 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
2038 
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
2039 2039 
 		global $globalDBdriver;
2040 2040 
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
2041 2041 
 		$query_values = array();
2042 2042 
 		if ($globalDBdriver == 'mysql') {
2043 2043 
 			if ($year != '') {
2044 2044 
 				$query .= ' AND YEAR(stats_date) = :year';
2045 
-				$query_values = array_merge($query_values,array(':year' => $year));
2045 
+				$query_values = array_merge($query_values, array(':year' => $year));
2046 2046 
 			}
2047 2047 
 			if ($month != '') {
2048 2048 
 				$query .= ' AND MONTH(stats_date) = :month';
2049 
-				$query_values = array_merge($query_values,array(':month' => $month));
2049 
+				$query_values = array_merge($query_values, array(':month' => $month));
2050 2050 
 			}
2051 2051 
 			if ($day != '') {
2052 2052 
 				$query .= ' AND DAY(stats_date) = :day';
2053 
-				$query_values = array_merge($query_values,array(':day' => $day));
2053 
+				$query_values = array_merge($query_values, array(':day' => $day));
2054 2054 
 			}
2055 2055 
 		} else {
2056 2056 
 			if ($year != '') {
2057 2057 
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
2058 
-				$query_values = array_merge($query_values,array(':year' => $year));
2058 
+				$query_values = array_merge($query_values, array(':year' => $year));
2059 2059 
 			}
2060 2060 
 			if ($month != '') {
2061 2061 
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
2062 
-				$query_values = array_merge($query_values,array(':month' => $month));
2062 
+				$query_values = array_merge($query_values, array(':month' => $month));
2063 2063 
 			}
2064 2064 
 			if ($day != '') {
2065 2065 
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
2066 
-				$query_values = array_merge($query_values,array(':day' => $day));
2066 
+				$query_values = array_merge($query_values, array(':day' => $day));
2067 2067 
 			}
2068 2068 
 		}
2069 2069 
 		$query .= " ORDER BY source_name";
2070 
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
2070 
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
2071 2071 
 		try {
2072 2072 
 			$sth = $this->db->prepare($query);
2073 2073 
 			$sth->execute($query_values);
2074 
-		} catch(PDOException $e) {
2074 
+		} catch (PDOException $e) {
2075 2075 
 			echo "error : ".$e->getMessage();
2076 2076 
 		}
2077 2077 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
2078 2078 
 		return $all;
2079 2079 
 	}
2080 2080
2081 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
2081 
+	public function addStatSource($data, $source_name, $stats_type, $date) {
2082 2082 
 		global $globalDBdriver;
2083 2083 
 		if ($globalDBdriver == 'mysql') {
2084 2084 
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
2085 2085 
 		} else {
2086 2086 
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);";
2087 2087 
 		}
2088 
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
2088 
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
2089 2089 
 		try {
2090 2090 
 			$sth = $this->db->prepare($query);
2091 2091 
 			$sth->execute($query_values);
2092 
-		} catch(PDOException $e) {
2092 
+		} catch (PDOException $e) {
2093 2093 
 			return "error : ".$e->getMessage();
2094 2094 
 		}
2095 2095 
 	}
2096 
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
2096 
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
2097 2097 
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
2098 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2098 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2099 2099 
 		try {
2100 2100 
 			$sth = $this->db->prepare($query);
2101 2101 
 			$sth->execute($query_values);
2102 
-		} catch(PDOException $e) {
2102 
+		} catch (PDOException $e) {
2103 2103 
 			return "error : ".$e->getMessage();
2104 2104 
 		}
2105 2105 
 	}
2106 
-	public function addStatMarine($type,$date_name,$cnt,$filter_name = '') {
2106 
+	public function addStatMarine($type, $date_name, $cnt, $filter_name = '') {
2107 2107 
 		$query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
2108 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
2108 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2109 2109 
 		try {
2110 2110 
 			$sth = $this->db->prepare($query);
2111 2111 
 			$sth->execute($query_values);
2112 
-		} catch(PDOException $e) {
2112 
+		} catch (PDOException $e) {
2113 2113 
 			return "error : ".$e->getMessage();
2114 2114 
 		}
2115 2115 
 	}
2116 
-	public function addStatTracker($type,$date_name,$cnt,$filter_name = '') {
2116 
+	public function addStatTracker($type, $date_name, $cnt, $filter_name = '') {
2117 2117 
 		$query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
2118 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
2118 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2119 2119 
 		try {
2120 2120 
 			$sth = $this->db->prepare($query);
2121 2121 
 			$sth->execute($query_values);
2122 
-		} catch(PDOException $e) {
2122 
+		} catch (PDOException $e) {
2123 2123 
 			return "error : ".$e->getMessage();
2124 2124 
 		}
2125 2125 
 	}
2126 
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
2126 
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
2127 2127 
 		global $globalDBdriver;
2128 2128 
 		if ($globalDBdriver == 'mysql') {
2129 2129 
 			if ($reset) {
 
@@ -2138,15 +2138,15 @@  discard block
 
 block discarded – undo
2138 2138 
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);";
2139 2139 
 			}
2140 2140 
 		}
2141 
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2141 
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2142 2142 
 		try {
2143 2143 
 			$sth = $this->db->prepare($query);
2144 2144 
 			$sth->execute($query_values);
2145 
-		} catch(PDOException $e) {
2145 
+		} catch (PDOException $e) {
2146 2146 
 			return "error : ".$e->getMessage();
2147 2147 
 		}
2148 2148 
 	}
2149 
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
2149 
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
2150 2150 
 		global $globalDBdriver;
2151 2151 
 		if ($globalDBdriver == 'mysql') {
2152 2152 
 			if ($reset) {
 
@@ -2161,15 +2161,15 @@  discard block
 
 block discarded – undo
2161 2161 
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);";
2162 2162 
 			}
2163 2163 
 		}
2164 
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
2164 
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
2165 2165 
 		try {
2166 2166 
 			$sth = $this->db->prepare($query);
2167 2167 
 			$sth->execute($query_values);
2168 
-		} catch(PDOException $e) {
2168 
+		} catch (PDOException $e) {
2169 2169 
 			return "error : ".$e->getMessage();
2170 2170 
 		}
2171 2171 
 	}
2172 
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
2172 
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
2173 2173 
 		global $globalDBdriver;
2174 2174 
 		if ($globalDBdriver == 'mysql') {
2175 2175 
 			if ($reset) {
 
@@ -2184,15 +2184,15 @@  discard block
 
 block discarded – undo
2184 2184 
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);";
2185 2185 
 			}
2186 2186 
 		}
2187 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
2187 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
2188 2188 
 		try {
2189 2189 
 			$sth = $this->db->prepare($query);
2190 2190 
 			$sth->execute($query_values);
2191 
-		} catch(PDOException $e) {
2191 
+		} catch (PDOException $e) {
2192 2192 
 			return "error : ".$e->getMessage();
2193 2193 
 		}
2194 2194 
 	}
2195 
-	public function addStatCountryMarine($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
2195 
+	public function addStatCountryMarine($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
2196 2196 
 		global $globalDBdriver;
2197 2197 
 		if ($globalDBdriver == 'mysql') {
2198 2198 
 			if ($reset) {
 
@@ -2207,15 +2207,15 @@  discard block
 
 block discarded – undo
2207 2207 
 				$query = "UPDATE stats_marine_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_marine_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
2208 2208 
 			}
2209 2209 
 		}
2210 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
2210 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2211 2211 
 		try {
2212 2212 
 			$sth = $this->db->prepare($query);
2213 2213 
 			$sth->execute($query_values);
2214 
-		} catch(PDOException $e) {
2214 
+		} catch (PDOException $e) {
2215 2215 
 			return "error : ".$e->getMessage();
2216 2216 
 		}
2217 2217 
 	}
2218 
-	public function addStatCountryTracker($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
2218 
+	public function addStatCountryTracker($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
2219 2219 
 		global $globalDBdriver;
2220 2220 
 		if ($globalDBdriver == 'mysql') {
2221 2221 
 			if ($reset) {
 
@@ -2230,15 +2230,15 @@  discard block
 
 block discarded – undo
2230 2230 
 				$query = "UPDATE stats_tracker_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_tracker_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
2231 2231 
 			}
2232 2232 
 		}
2233 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
2233 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2234 2234 
 		try {
2235 2235 
 			$sth = $this->db->prepare($query);
2236 2236 
 			$sth->execute($query_values);
2237 
-		} catch(PDOException $e) {
2237 
+		} catch (PDOException $e) {
2238 2238 
 			return "error : ".$e->getMessage();
2239 2239 
 		}
2240 2240 
 	}
2241 
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
2241 
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
2242 2242 
 		global $globalDBdriver;
2243 2243 
 		if ($globalDBdriver == 'mysql') {
2244 2244 
 			if ($reset) {
 
@@ -2253,15 +2253,15 @@  discard block
 
 block discarded – undo
2253 2253 
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);";
2254 2254 
 			}
2255 2255 
 		}
2256 
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2256 
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2257 2257 
 		try {
2258 2258 
 			$sth = $this->db->prepare($query);
2259 2259 
 			$sth->execute($query_values);
2260 
-		} catch(PDOException $e) {
2260 
+		} catch (PDOException $e) {
2261 2261 
 			return "error : ".$e->getMessage();
2262 2262 
 		}
2263 2263 
 	}
2264 
-	public function addStatMarineType($type,$type_id,$cnt, $filter_name = '', $reset = false) {
2264 
+	public function addStatMarineType($type, $type_id, $cnt, $filter_name = '', $reset = false) {
2265 2265 
 		global $globalDBdriver;
2266 2266 
 		if ($globalDBdriver == 'mysql') {
2267 2267 
 			if ($reset) {
 
@@ -2276,15 +2276,15 @@  discard block
 
 block discarded – undo
2276 2276 
 				$query = "UPDATE stats_marine_type SET cnt = cnt+:cnt, type = :type, filter_name = :filter_name WHERE type_id = :type_id AND filter_name = :filter_name; INSERT INTO stats_marine_type (type,type_id,cnt,filter_name) SELECT :type,:type_id,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_type WHERE type_id = :type_id AND filter_name = :filter_name);";
2277 2277 
 			}
2278 2278 
 		}
2279 
-		$query_values = array(':type' => $type,':type_id' => $type_id,':cnt' => $cnt, ':filter_name' => $filter_name);
2279 
+		$query_values = array(':type' => $type, ':type_id' => $type_id, ':cnt' => $cnt, ':filter_name' => $filter_name);
2280 2280 
 		try {
2281 2281 
 			$sth = $this->db->prepare($query);
2282 2282 
 			$sth->execute($query_values);
2283 
-		} catch(PDOException $e) {
2283 
+		} catch (PDOException $e) {
2284 2284 
 			return "error : ".$e->getMessage();
2285 2285 
 		}
2286 2286 
 	}
2287 
-	public function addStatTrackerType($type,$cnt, $filter_name = '', $reset = false) {
2287 
+	public function addStatTrackerType($type, $cnt, $filter_name = '', $reset = false) {
2288 2288 
 		global $globalDBdriver;
2289 2289 
 		if ($globalDBdriver == 'mysql') {
2290 2290 
 			if ($reset) {
 
@@ -2299,15 +2299,15 @@  discard block
 
 block discarded – undo
2299 2299 
 				$query = "UPDATE stats_tracker_type SET cnt = cnt+:cnt WHERE type = :type AND filter_name = :filter_name; INSERT INTO stats_tracker_type (type,cnt,filter_name) SELECT :type,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_type WHERE type = :type AND filter_name = :filter_name);";
2300 2300 
 			}
2301 2301 
 		}
2302 
-		$query_values = array(':type' => $type,':cnt' => $cnt, ':filter_name' => $filter_name);
2302 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':filter_name' => $filter_name);
2303 2303 
 		try {
2304 2304 
 			$sth = $this->db->prepare($query);
2305 2305 
 			$sth->execute($query_values);
2306 
-		} catch(PDOException $e) {
2306 
+		} catch (PDOException $e) {
2307 2307 
 			return "error : ".$e->getMessage();
2308 2308 
 		}
2309 2309 
 	}
2310 
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
2310 
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
2311 2311 
 		global $globalDBdriver;
2312 2312 
 		if ($globalDBdriver == 'mysql') {
2313 2313 
 			if ($reset) {
 
@@ -2322,15 +2322,15 @@  discard block
 
 block discarded – undo
2322 2322 
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);";
2323 2323 
 			}
2324 2324 
 		}
2325 
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
2325 
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2326 2326 
 		try {
2327 2327 
 			$sth = $this->db->prepare($query);
2328 2328 
 			$sth->execute($query_values);
2329 
-		} catch(PDOException $e) {
2329 
+		} catch (PDOException $e) {
2330 2330 
 			return "error : ".$e->getMessage();
2331 2331 
 		}
2332 2332 
 	}
2333 
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
2333 
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
2334 2334 
 		global $globalDBdriver;
2335 2335 
 		if ($globalDBdriver == 'mysql') {
2336 2336 
 			if ($reset) {
 
@@ -2345,15 +2345,15 @@  discard block
 
 block discarded – undo
2345 2345 
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);";
2346 2346 
 			}
2347 2347 
 		}
2348 
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2348 
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2349 2349 
 		try {
2350 2350 
 			$sth = $this->db->prepare($query);
2351 2351 
 			$sth->execute($query_values);
2352 
-		} catch(PDOException $e) {
2352 
+		} catch (PDOException $e) {
2353 2353 
 			return "error : ".$e->getMessage();
2354 2354 
 		}
2355 2355 
 	}
2356 
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
2356 
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
2357 2357 
 		global $globalDBdriver;
2358 2358 
 		if ($globalDBdriver == 'mysql') {
2359 2359 
 			if ($reset) {
 
@@ -2368,15 +2368,15 @@  discard block
 
 block discarded – undo
2368 2368 
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);";
2369 2369 
 			}
2370 2370 
 		}
2371 
-		$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
2371 
+		$query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
2372 2372 
 		try {
2373 2373 
 			$sth = $this->db->prepare($query);
2374 2374 
 			$sth->execute($query_values);
2375 
-		} catch(PDOException $e) {
2375 
+		} catch (PDOException $e) {
2376 2376 
 			return "error : ".$e->getMessage();
2377 2377 
 		}
2378 2378 
 	}
2379 
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
2379 
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
2380 2380 
 		global $globalDBdriver;
2381 2381 
 		if ($airport_icao != '') {
2382 2382 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2392,16 +2392,16 @@  discard block
 
 block discarded – undo
2392 2392 
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);";
2393 2393 
 				}
2394 2394 
 			}
2395 
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
2395 
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2396 2396 
 			try {
2397 2397 
 				$sth = $this->db->prepare($query);
2398 2398 
 				$sth->execute($query_values);
2399 
-			} catch(PDOException $e) {
2399 
+			} catch (PDOException $e) {
2400 2400 
 				return "error : ".$e->getMessage();
2401 2401 
 			}
2402 2402 
 		}
2403 2403 
 	}
2404 
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
2404 
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
2405 2405 
 		global $globalDBdriver;
2406 2406 
 		if ($airport_icao != '') {
2407 2407 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2409,16 +2409,16 @@  discard block
 
 block discarded – undo
2409 2409 
 			} else {
2410 2410 
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
2411 2411 
 			}
2412 
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
2412 
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2413 2413 
 			 try {
2414 2414 
 				$sth = $this->db->prepare($query);
2415 2415 
 				$sth->execute($query_values);
2416 
-			} catch(PDOException $e) {
2416 
+			} catch (PDOException $e) {
2417 2417 
 				return "error : ".$e->getMessage();
2418 2418 
 			}
2419 2419 
 		}
2420 2420 
 	}
2421 
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
2421 
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
2422 2422 
 		global $globalDBdriver;
2423 2423 
 		if ($airport_icao != '') {
2424 2424 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2434,16 +2434,16 @@  discard block
 
 block discarded – undo
2434 2434 
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);";
2435 2435 
 				}
2436 2436 
 			}
2437 
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
2437 
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2438 2438 
 			try {
2439 2439 
 				$sth = $this->db->prepare($query);
2440 2440 
 				$sth->execute($query_values);
2441 
-			} catch(PDOException $e) {
2441 
+			} catch (PDOException $e) {
2442 2442 
 				return "error : ".$e->getMessage();
2443 2443 
 			}
2444 2444 
 		}
2445 2445 
 	}
2446 
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
2446 
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
2447 2447 
 		global $globalDBdriver;
2448 2448 
 		if ($airport_icao != '') {
2449 2449 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2451,11 +2451,11 @@  discard block
 
 block discarded – undo
2451 2451 
 			} else {
2452 2452 
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
2453 2453 
 			}
2454 
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
2454 
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2455 2455 
 			try {
2456 2456 
 				$sth = $this->db->prepare($query);
2457 2457 
 				$sth->execute($query_values);
2458 
-			} catch(PDOException $e) {
2458 
+			} catch (PDOException $e) {
2459 2459 
 				return "error : ".$e->getMessage();
2460 2460 
 			}
2461 2461 
 		}
 
@@ -2467,7 +2467,7 @@  discard block
 
 block discarded – undo
2467 2467 
 		try {
2468 2468 
 			$sth = $this->db->prepare($query);
2469 2469 
 			$sth->execute($query_values);
2470 
-		} catch(PDOException $e) {
2470 
+		} catch (PDOException $e) {
2471 2471 
 			return "error : ".$e->getMessage();
2472 2472 
 		}
2473 2473 
 	}
 
@@ -2477,7 +2477,7 @@  discard block
 
 block discarded – undo
2477 2477 
 		try {
2478 2478 
 			$sth = $this->db->prepare($query);
2479 2479 
 			$sth->execute($query_values);
2480 
-		} catch(PDOException $e) {
2480 
+		} catch (PDOException $e) {
2481 2481 
 			return "error : ".$e->getMessage();
2482 2482 
 		}
2483 2483 
 	}
 
@@ -2487,7 +2487,7 @@  discard block
 
 block discarded – undo
2487 2487 
 		try {
2488 2488 
 			$sth = $this->db->prepare($query);
2489 2489 
 			$sth->execute($query_values);
2490 
-		} catch(PDOException $e) {
2490 
+		} catch (PDOException $e) {
2491 2491 
 			return "error : ".$e->getMessage();
2492 2492 
 		}
2493 2493 
 	}
 
@@ -2497,7 +2497,7 @@  discard block
 
 block discarded – undo
2497 2497 
 		try {
2498 2498 
 			$sth = $this->db->prepare($query);
2499 2499 
 			$sth->execute($query_values);
2500 
-		} catch(PDOException $e) {
2500 
+		} catch (PDOException $e) {
2501 2501 
 			return "error : ".$e->getMessage();
2502 2502 
 		}
2503 2503 
 	}
 
@@ -2507,13 +2507,13 @@  discard block
 
 block discarded – undo
2507 2507 
 		try {
2508 2508 
 			$sth = $this->db->prepare($query);
2509 2509 
 			$sth->execute($query_values);
2510 
-		} catch(PDOException $e) {
2510 
+		} catch (PDOException $e) {
2511 2511 
 			return "error : ".$e->getMessage();
2512 2512 
 		}
2513 2513 
 	}
2514 2514
2515 2515 
 	public function addOldStats() {
2516 
-		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
2516 
+		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
2517 2517 
 		$Common = new Common();
2518 2518 
 		$Connection = new Connection($this->db);
2519 2519 
 		date_default_timezone_set('UTC');
 
@@ -2528,9 +2528,9 @@  discard block
 
 block discarded – undo
2528 2528 
 			$filtername = 'marine';
2529 2529 
 			if ($Connection->tableExists('countries')) {
2530 2530 
 				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2531 
-				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2531 
+				$alldata = $Marine->countAllMarineOverCountries(false, 0, $last_update_day);
2532 2532 
 				foreach ($alldata as $number) {
2533 
-					echo $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2533 
+					echo $this->addStatCountryMarine($number['marine_country_iso2'], $number['marine_country_iso3'], $number['marine_country'], $number['marine_count'], '', '', $reset);
2534 2534 
 				}
2535 2535 
 			}
2536 2536 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2540,44 +2540,44 @@  discard block
 
 block discarded – undo
2540 2540 
 			$lastyear = false;
2541 2541 
 			foreach ($alldata as $number) {
2542 2542 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2543 
-				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2543 
+				$this->addStat('marine_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2544 2544 
 			}
2545 2545 
 			echo 'Marine data...'."\n";
2546 2546 
 			$this->deleteStatMarine('month');
2547 2547 
 			echo '-> countAllDatesLastMonth...'."\n";
2548 2548 
 			$alldata = $Marine->countAllDatesLastMonth($filter_last_month);
2549 2549 
 			foreach ($alldata as $number) {
2550 
-				$this->addStatMarine('month',$number['date_name'],$number['date_count']);
2550 
+				$this->addStatMarine('month', $number['date_name'], $number['date_count']);
2551 2551 
 			}
2552 2552 
 			echo '-> countAllDates...'."\n";
2553 2553 
 			$previousdata = $this->countAllDatesMarine();
2554 2554 
 			$this->deleteStatMarine('date');
2555 
-			$alldata = $Common->array_merge_noappend($previousdata,$Marine->countAllDates($filter_last_month));
2555 
+			$alldata = $Common->array_merge_noappend($previousdata, $Marine->countAllDates($filter_last_month));
2556 2556 
 			$values = array();
2557 2557 
 			foreach ($alldata as $cnt) {
2558 2558 
 				$values[] = $cnt['date_count'];
2559 2559 
 			}
2560 
-			array_multisort($values,SORT_DESC,$alldata);
2561 
-			array_splice($alldata,11);
2560 
+			array_multisort($values, SORT_DESC, $alldata);
2561 
+			array_splice($alldata, 11);
2562 2562 
 			foreach ($alldata as $number) {
2563 
-				$this->addStatMarine('date',$number['date_name'],$number['date_count']);
2563 
+				$this->addStatMarine('date', $number['date_name'], $number['date_count']);
2564 2564 
 			}
2565 2565
2566 2566 
 			$this->deleteStatMarine('hour');
2567 2567 
 			echo '-> countAllHours...'."\n";
2568 
-			$alldata = $Marine->countAllHours('hour',$filter_last_month);
2568 
+			$alldata = $Marine->countAllHours('hour', $filter_last_month);
2569 2569 
 			foreach ($alldata as $number) {
2570 
-				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
2570 
+				$this->addStatMarine('hour', $number['hour_name'], $number['hour_count']);
2571 2571 
 			}
2572 2572 
 			if ($globalDebug) echo 'Count all types...'."\n";
2573 
-			$alldata = $Marine->countAllMarineTypes(false,0,$last_update_day);
2573 
+			$alldata = $Marine->countAllMarineTypes(false, 0, $last_update_day);
2574 2574 
 			foreach ($alldata as $number) {
2575 
-				$this->addStatMarineType($number['marine_type'],$number['marine_type_id'],$number['marine_type_count'],'',$reset);
2575 
+				$this->addStatMarineType($number['marine_type'], $number['marine_type_id'], $number['marine_type_count'], '', $reset);
2576 2576 
 			}
2577 2577
2578 2578 
 			echo 'Insert last stats update date...'."\n";
2579 2579 
 			date_default_timezone_set('UTC');
2580 
-			$this->addLastStatsUpdate('last_update_stats_marine',date('Y-m-d G:i:s'));
2580 
+			$this->addLastStatsUpdate('last_update_stats_marine', date('Y-m-d G:i:s'));
2581 2581 
 		}
2582 2582 
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
2583 2583 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
 
@@ -2589,9 +2589,9 @@  discard block
 
 block discarded – undo
2589 2589 
 			$Tracker = new Tracker($this->db);
2590 2590 
 			if ($Connection->tableExists('countries')) {
2591 2591 
 				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2592 
-				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2592 
+				$alldata = $Tracker->countAllTrackerOverCountries(false, 0, $last_update_day);
2593 2593 
 				foreach ($alldata as $number) {
2594 
-					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2594 
+					$this->addStatCountryTracker($number['tracker_country_iso2'], $number['tracker_country_iso3'], $number['tracker_country'], $number['tracker_count'], '', '', $reset);
2595 2595 
 				}
2596 2596 
 			}
2597 2597 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2601,43 +2601,43 @@  discard block
 
 block discarded – undo
2601 2601 
 			$lastyear = false;
2602 2602 
 			foreach ($alldata as $number) {
2603 2603 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2604 
-				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2604 
+				$this->addStat('tracker_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2605 2605 
 			}
2606 2606 
 			echo 'Tracker data...'."\n";
2607 2607 
 			$this->deleteStatTracker('month');
2608 2608 
 			echo '-> countAllDatesLastMonth...'."\n";
2609 2609 
 			$alldata = $Tracker->countAllDatesLastMonth($filter_last_month);
2610 2610 
 			foreach ($alldata as $number) {
2611 
-				$this->addStatTracker('month',$number['date_name'],$number['date_count']);
2611 
+				$this->addStatTracker('month', $number['date_name'], $number['date_count']);
2612 2612 
 			}
2613 2613 
 			echo '-> countAllDates...'."\n";
2614 2614 
 			$previousdata = $this->countAllDatesTracker();
2615 2615 
 			$this->deleteStatTracker('date');
2616 
-			$alldata = $Common->array_merge_noappend($previousdata,$Tracker->countAllDates($filter_last_month));
2616 
+			$alldata = $Common->array_merge_noappend($previousdata, $Tracker->countAllDates($filter_last_month));
2617 2617 
 			$values = array();
2618 2618 
 			foreach ($alldata as $cnt) {
2619 2619 
 				$values[] = $cnt['date_count'];
2620 2620 
 			}
2621 
-			array_multisort($values,SORT_DESC,$alldata);
2622 
-			array_splice($alldata,11);
2621 
+			array_multisort($values, SORT_DESC, $alldata);
2622 
+			array_splice($alldata, 11);
2623 2623 
 			foreach ($alldata as $number) {
2624 
-				$this->addStatTracker('date',$number['date_name'],$number['date_count']);
2624 
+				$this->addStatTracker('date', $number['date_name'], $number['date_count']);
2625 2625 
 			}
2626 2626
2627 2627 
 			$this->deleteStatTracker('hour');
2628 2628 
 			echo '-> countAllHours...'."\n";
2629 
-			$alldata = $Tracker->countAllHours('hour',$filter_last_month);
2629 
+			$alldata = $Tracker->countAllHours('hour', $filter_last_month);
2630 2630 
 			foreach ($alldata as $number) {
2631 
-				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
2631 
+				$this->addStatTracker('hour', $number['hour_name'], $number['hour_count']);
2632 2632 
 			}
2633 2633 
 			if ($globalDebug) echo 'Count all types...'."\n";
2634 
-			$alldata = $Tracker->countAllTrackerTypes(false,0,$last_update_day);
2634 
+			$alldata = $Tracker->countAllTrackerTypes(false, 0, $last_update_day);
2635 2635 
 			foreach ($alldata as $number) {
2636 
-				$this->addStatTrackerType($number['tracker_type'],$number['tracker_type_count'],'',$reset);
2636 
+				$this->addStatTrackerType($number['tracker_type'], $number['tracker_type_count'], '', $reset);
2637 2637 
 			}
2638 2638 
 			echo 'Insert last stats update date...'."\n";
2639 2639 
 			date_default_timezone_set('UTC');
2640 
-			$this->addLastStatsUpdate('last_update_stats_tracker',date('Y-m-d G:i:s'));
2640 
+			$this->addLastStatsUpdate('last_update_stats_tracker', date('Y-m-d G:i:s'));
2641 2641 
 		}
2642 2642
2643 2643 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
 
@@ -2655,41 +2655,41 @@  discard block
 
 block discarded – undo
2655 2655 
 			$Spotter = new Spotter($this->db);
2656 2656
2657 2657 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2658 
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2658 
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2659 2659 
 			foreach ($alldata as $number) {
2660 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2660 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2661 2661 
 			}
2662 2662 
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2663 
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2663 
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2664 2664 
 			foreach ($alldata as $number) {
2665 
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2665 
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2666 2666 
 			}
2667 2667 
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2668 
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2668 
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2669 2669 
 			foreach ($alldata as $number) {
2670 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2670 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2671 2671 
 			}
2672 2672 
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2673 
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2673 
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2674 2674 
 			foreach ($alldata as $number) {
2675 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2675 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2676 2676 
 			}
2677 2677 
 			if ($globalDebug) echo 'Count all owners...'."\n";
2678 
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2678 
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2679 2679 
 			foreach ($alldata as $number) {
2680 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2680 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2681 2681 
 			}
2682 2682 
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2683 
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2683 
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2684 2684 
 			foreach ($alldata as $number) {
2685 2685 
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2686 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2686 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2687 2687 
 			}
2688 2688
2689 2689 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2690 
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2690 
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2691 2691 
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2692 
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2692 
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2693 2693 
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2694 2694 
 			$alldata = array();
2695 2695 
 			foreach ($pall as $value) {
 
@@ -2706,14 +2706,14 @@  discard block
 
 block discarded – undo
2706 2706 
 			foreach ($alldata as $key => $row) {
2707 2707 
 				$count[$key] = $row['airport_departure_icao_count'];
2708 2708 
 			}
2709 
-			array_multisort($count,SORT_DESC,$alldata);
2709 
+			array_multisort($count, SORT_DESC, $alldata);
2710 2710 
 			foreach ($alldata as $number) {
2711 
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
2711 
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset);
2712 2712 
 			}
2713 2713 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2714 
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2714 
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2715 2715 
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2716 
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2716 
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2717 2717 
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2718 2718 
 			$alldata = array();
2719 2719 
 			foreach ($pall as $value) {
 
@@ -2730,18 +2730,18 @@  discard block
 
 block discarded – undo
2730 2730 
 			foreach ($alldata as $key => $row) {
2731 2731 
 				$count[$key] = $row['airport_arrival_icao_count'];
2732 2732 
 			}
2733 
-			array_multisort($count,SORT_DESC,$alldata);
2733 
+			array_multisort($count, SORT_DESC, $alldata);
2734 2734 
 			foreach ($alldata as $number) {
2735 
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
2735 
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset);
2736 2736 
 			}
2737 2737 
 			if ($Connection->tableExists('countries')) {
2738 2738 
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2739 2739 
 				//$SpotterArchive = new SpotterArchive();
2740 2740 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2741 2741 
 				$Spotter = new Spotter($this->db);
2742 
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2742 
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2743 2743 
 				foreach ($alldata as $number) {
2744 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2744 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2745 2745 
 				}
2746 2746 
 			}
2747 2747 
 			
@@ -2751,12 +2751,12 @@  discard block
 
 block discarded – undo
2751 2751 
 				$this->deleteStatsByType('fatalities_byyear');
2752 2752 
 				$alldata = $Accident->countFatalitiesByYear();
2753 2753 
 				foreach ($alldata as $number) {
2754 
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2754 
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2755 2755 
 				}
2756 2756 
 				$this->deleteStatsByType('fatalities_bymonth');
2757 2757 
 				$alldata = $Accident->countFatalitiesLast12Months();
2758 2758 
 				foreach ($alldata as $number) {
2759 
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2759 
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2760 2760 
 				}
2761 2761 
 			}
2762 2762 
 
@@ -2770,37 +2770,37 @@  discard block
 
 block discarded – undo
2770 2770 
 			$lastyear = false;
2771 2771 
 			foreach ($alldata as $number) {
2772 2772 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2773 
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2773 
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2774 2774 
 			}
2775 2775 
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2776 2776 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2777 2777 
 			foreach ($alldata as $number) {
2778 
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2778 
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2779 2779 
 			}
2780 2780 
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2781 2781 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2782 2782 
 			foreach ($alldata as $number) {
2783 
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2783 
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2784 2784 
 			}
2785 2785 
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2786 2786 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2787 2787 
 			foreach ($alldata as $number) {
2788 
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2788 
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2789 2789 
 			}
2790 2790 
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2791 2791 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2792 2792 
 			foreach ($alldata as $number) {
2793 
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2793 
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2794 2794 
 			}
2795 2795 
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2796 2796 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2797 2797 
 			foreach ($alldata as $number) {
2798 
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2798 
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2799 2799 
 			}
2800 2800 
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2801 2801 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2802 2802 
 			foreach ($alldata as $number) {
2803 
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2803 
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2804 2804 
 			}
2805 2805 
 			if ($globalDebug) echo 'Airports data...'."\n";
2806 2806 
 			if ($globalDebug) echo '...Departure'."\n";
 
@@ -2845,7 +2845,7 @@  discard block
 
 block discarded – undo
2845 2845 
 			}
2846 2846 
 			$alldata = $pall;
2847 2847 
 			foreach ($alldata as $number) {
2848 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2848 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2849 2849 
 			}
2850 2850 
 			echo '...Arrival'."\n";
2851 2851 
 			$pall = $Spotter->getLast7DaysAirportsArrival();
 
@@ -2886,7 +2886,7 @@  discard block
 
 block discarded – undo
2886 2886 
 			}
2887 2887 
 			$alldata = $pall;
2888 2888 
 			foreach ($alldata as $number) {
2889 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2889 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2890 2890 
 			}
2891 2891
2892 2892 
 			echo 'Flights data...'."\n";
 
@@ -2894,28 +2894,28 @@  discard block
 
 block discarded – undo
2894 2894 
 			echo '-> countAllDatesLastMonth...'."\n";
2895 2895 
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2896 2896 
 			foreach ($alldata as $number) {
2897 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2897 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2898 2898 
 			}
2899 2899 
 			echo '-> countAllDates...'."\n";
2900 2900 
 			$previousdata = $this->countAllDates();
2901 2901 
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2902 2902 
 			$this->deleteStatFlight('date');
2903 
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2903 
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2904 2904 
 			$values = array();
2905 2905 
 			foreach ($alldata as $cnt) {
2906 2906 
 				$values[] = $cnt['date_count'];
2907 2907 
 			}
2908 
-			array_multisort($values,SORT_DESC,$alldata);
2909 
-			array_splice($alldata,11);
2908 
+			array_multisort($values, SORT_DESC, $alldata);
2909 
+			array_splice($alldata, 11);
2910 2910 
 			foreach ($alldata as $number) {
2911 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2911 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2912 2912 
 			}
2913 2913
2914 2914 
 			$this->deleteStatFlight('hour');
2915 2915 
 			echo '-> countAllHours...'."\n";
2916 
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2916 
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2917 2917 
 			foreach ($alldata as $number) {
2918 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2918 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2919 2919 
 			}
2920 2920
2921 2921 
 			// Count by airlines
 
@@ -2924,42 +2924,42 @@  discard block
 
 block discarded – undo
2924 2924 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2925 2925 
 				$SpotterArchive = new SpotterArchive($this->db);
2926 2926 
 				//$Spotter = new Spotter($this->db);
2927 
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2927 
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2928 2928 
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2929 2929 
 				foreach ($alldata as $number) {
2930 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2930 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2931 2931 
 				}
2932 2932 
 			}
2933 2933 
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2934 2934 
 			$Spotter = new Spotter($this->db);
2935 
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2935 
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2936 2936 
 			foreach ($alldata as $number) {
2937 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2937 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2938 2938 
 			}
2939 2939 
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2940 
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2940 
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2941 2941 
 			foreach ($alldata as $number) {
2942 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2942 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2943 2943 
 			}
2944 2944 
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2945 
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2945 
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2946 2946 
 			foreach ($alldata as $number) {
2947 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2947 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2948 2948 
 			}
2949 2949 
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2950 
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2950 
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2951 2951 
 			foreach ($alldata as $number) {
2952 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2952 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2953 2953 
 			}
2954 2954 
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2955 
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2955 
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2956 2956 
 			foreach ($alldata as $number) {
2957 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2957 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2958 2958 
 			}
2959 2959 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2960 
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2960 
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2961 2961 
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2962 
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2962 
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2963 2963 
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2964 2964 
 			//$alldata = array();
2965 2965 
 			foreach ($dall as $value) {
 
@@ -2979,12 +2979,12 @@  discard block
 
 block discarded – undo
2979 2979 
 			}
2980 2980 
 			$alldata = $pall;
2981 2981 
 			foreach ($alldata as $number) {
2982 
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
2982 
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset);
2983 2983 
 			}
2984 2984 
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2985 
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2985 
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2986 2986 
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2987 
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2987 
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2988 2988 
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2989 2989 
 			//$alldata = array();
2990 2990 
 			foreach ($dall as $value) {
 
@@ -3004,7 +3004,7 @@  discard block
 
 block discarded – undo
3004 3004 
 			}
3005 3005 
 			$alldata = $pall;
3006 3006 
 			foreach ($alldata as $number) {
3007 
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
3007 
+				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset);
3008 3008 
 			}
3009 3009 
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
3010 3010 
 			$Spotter = new Spotter($this->db);
 
@@ -3012,27 +3012,27 @@  discard block
 
 block discarded – undo
3012 3012 
 			$lastyear = false;
3013 3013 
 			foreach ($alldata as $number) {
3014 3014 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
3015 
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3015 
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
3016 3016 
 			}
3017 3017 
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
3018 3018 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
3019 3019 
 			foreach ($alldata as $number) {
3020 
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3020 
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
3021 3021 
 			}
3022 3022 
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
3023 3023 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
3024 3024 
 			foreach ($alldata as $number) {
3025 
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3025 
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
3026 3026 
 			}
3027 3027 
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
3028 3028 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
3029 3029 
 			foreach ($alldata as $number) {
3030 
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3030 
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
3031 3031 
 			}
3032 3032 
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
3033 3033 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
3034 3034 
 			foreach ($alldata as $number) {
3035 
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3035 
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
3036 3036 
 			}
3037 3037 
 			if ($globalDebug) echo '...Departure'."\n";
3038 3038 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 
@@ -3055,7 +3055,7 @@  discard block
 
 block discarded – undo
3055 3055 
 			}
3056 3056 
 			$alldata = $pall;
3057 3057 
 			foreach ($alldata as $number) {
3058 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
3058 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']);
3059 3059 
 			}
3060 3060 
 			if ($globalDebug) echo '...Arrival'."\n";
3061 3061 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 
@@ -3078,32 +3078,32 @@  discard block
 
 block discarded – undo
3078 3078 
 			}
3079 3079 
 			$alldata = $pall;
3080 3080 
 			foreach ($alldata as $number) {
3081 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
3081 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']);
3082 3082 
 			}
3083 3083
3084 3084 
 			if ($globalDebug) echo 'Flights data...'."\n";
3085 3085 
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
3086 3086 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
3087 3087 
 			foreach ($alldata as $number) {
3088 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
3088 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
3089 3089 
 			}
3090 3090 
 			if ($globalDebug) echo '-> countAllDates...'."\n";
3091 3091 
 			//$previousdata = $this->countAllDatesByAirlines();
3092 
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
3092 
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
3093 3093 
 			$values = array();
3094 3094 
 			foreach ($alldata as $cnt) {
3095 3095 
 				$values[] = $cnt['date_count'];
3096 3096 
 			}
3097 
-			array_multisort($values,SORT_DESC,$alldata);
3098 
-			array_splice($alldata,11);
3097 
+			array_multisort($values, SORT_DESC, $alldata);
3098 
+			array_splice($alldata, 11);
3099 3099 
 			foreach ($alldata as $number) {
3100 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
3100 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
3101 3101 
 			}
3102 3102
3103 3103 
 			if ($globalDebug) echo '-> countAllHours...'."\n";
3104 
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
3104 
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
3105 3105 
 			foreach ($alldata as $number) {
3106 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
3106 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
3107 3107 
 			}
3108 3108
3109 3109 
 			// Stats by filters
 
@@ -3127,7 +3127,7 @@  discard block
 
 block discarded – undo
3127 3127 
 							$last_update_day = date('Y').'-01-01 00:00:00';
3128 3128 
 						}
3129 3129 
 					}
3130 
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
3130 
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
3131 3131 
 						$last_update_day = date('Y').'-01-01 00:00:00';
3132 3132 
 						$reset = true;
3133 3133 
 					}
 
@@ -3135,38 +3135,38 @@  discard block
 
 block discarded – undo
3135 3135 
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
3136 3136 
 					$Spotter = new Spotter($this->db);
3137 3137 
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
3138 
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
3138 
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
3139 3139 
 					foreach ($alldata as $number) {
3140 
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
3140 
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
3141 3141 
 					}
3142 3142 
 					if ($globalDebug) echo 'Count all airlines...'."\n";
3143 
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
3143 
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
3144 3144 
 					foreach ($alldata as $number) {
3145 
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
3145 
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
3146 3146 
 					}
3147 3147 
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
3148 
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
3148 
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
3149 3149 
 					foreach ($alldata as $number) {
3150 
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
3150 
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
3151 3151 
 					}
3152 3152 
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
3153 
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
3153 
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
3154 3154 
 					foreach ($alldata as $number) {
3155 
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
3155 
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
3156 3156 
 					}
3157 3157 
 					if ($globalDebug) echo 'Count all owners...'."\n";
3158 
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
3158 
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
3159 3159 
 					foreach ($alldata as $number) {
3160 
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
3160 
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
3161 3161 
 					}
3162 3162 
 					if ($globalDebug) echo 'Count all pilots...'."\n";
3163 
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
3163 
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
3164 3164 
 					foreach ($alldata as $number) {
3165 
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
3165 
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
3166 3166 
 					}
3167 3167 
 					if ($globalDebug) echo 'Count departure airports...'."\n";
3168 
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
3169 
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
3168 
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
3169 
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
3170 3170 
 					$alldata = array();
3171 3171 
 					foreach ($pall as $value) {
3172 3172 
 						$icao = $value['airport_departure_icao'];
 
@@ -3182,13 +3182,13 @@  discard block
 
 block discarded – undo
3182 3182 
 					foreach ($alldata as $key => $row) {
3183 3183 
 						$count[$key] = $row['airport_departure_icao_count'];
3184 3184 
 					}
3185 
-					array_multisort($count,SORT_DESC,$alldata);
3185 
+					array_multisort($count, SORT_DESC, $alldata);
3186 3186 
 					foreach ($alldata as $number) {
3187 
-						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
3187 
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset);
3188 3188 
 					}
3189 3189 
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
3190 
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
3191 
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
3190 
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
3191 
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
3192 3192 
 					$alldata = array();
3193 3193 
 					foreach ($pall as $value) {
3194 3194 
 						$icao = $value['airport_arrival_icao'];
 
@@ -3204,9 +3204,9 @@  discard block
 
 block discarded – undo
3204 3204 
 					foreach ($alldata as $key => $row) {
3205 3205 
 						$count[$key] = $row['airport_arrival_icao_count'];
3206 3206 
 					}
3207 
-					array_multisort($count,SORT_DESC,$alldata);
3207 
+					array_multisort($count, SORT_DESC, $alldata);
3208 3208 
 					foreach ($alldata as $number) {
3209 
-						echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
3209 
+						echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset);
3210 3210 
 					}
3211 3211 
 					if ($globalDebug) echo 'Count all months...'."\n";
3212 3212 
 					$Spotter = new Spotter($this->db);
 
@@ -3214,36 +3214,36 @@  discard block
 
 block discarded – undo
3214 3214 
 					$lastyear = false;
3215 3215 
 					foreach ($alldata as $number) {
3216 3216 
 						if ($number['year_name'] != date('Y')) $lastyear = true;
3217 
-						$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3217 
+						$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
3218 3218 
 					}
3219 3219 
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
3220 3220 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
3221 3221 
 					foreach ($alldata as $number) {
3222 
-						$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3222 
+						$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
3223 3223 
 					}
3224 3224 
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
3225 3225 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
3226 3226 
 					foreach ($alldata as $number) {
3227 
-						$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3227 
+						$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
3228 3228 
 					}
3229 3229 
 					if ($globalDebug) echo 'Count all military by months...'."\n";
3230 3230 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
3231 3231 
 					foreach ($alldata as $number) {
3232 
-						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3232 
+						$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
3233 3233 
 					}
3234 3234 
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3235 3235 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
3236 3236 
 				    	foreach ($alldata as $number) {
3237 
-			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3237 
+			    			$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
3238 3238 
 					}
3239 3239 
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3240 3240 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
3241 3241 
 					foreach ($alldata as $number) {
3242 
-						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3242 
+						$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
3243 3243 
 					}
3244 3244 
 					echo '...Departure'."\n";
3245 
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
3246 
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
3245 
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
3246 
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
3247 3247 
 					foreach ($dall as $value) {
3248 3248 
 						$icao = $value['departure_airport_icao'];
3249 3249 
 						$ddate = $value['date'];
 
@@ -3261,11 +3261,11 @@  discard block
 
 block discarded – undo
3261 3261 
 					}
3262 3262 
 					$alldata = $pall;
3263 3263 
 					foreach ($alldata as $number) {
3264 
-						$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
3264 
+						$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name);
3265 3265 
 					}
3266 3266 
 					echo '...Arrival'."\n";
3267 
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
3268 
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
3267 
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
3268 
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
3269 3269 
 					foreach ($dall as $value) {
3270 3270 
 						$icao = $value['arrival_airport_icao'];
3271 3271 
 						$ddate = $value['date'];
 
@@ -3283,39 +3283,39 @@  discard block
 
 block discarded – undo
3283 3283 
 					}
3284 3284 
 					$alldata = $pall;
3285 3285 
 					foreach ($alldata as $number) {
3286 
-						$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
3286 
+						$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name);
3287 3287 
 					}
3288 3288 
 					echo 'Flights data...'."\n";
3289 3289 
 					echo '-> countAllDatesLastMonth...'."\n";
3290 3290 
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
3291 3291 
 					foreach ($alldata as $number) {
3292 
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
3292 
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
3293 3293 
 					}
3294 3294 
 					echo '-> countAllDates...'."\n";
3295 
-					$previousdata = $this->countAllDates('',$filter_name);
3296 
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
3295 
+					$previousdata = $this->countAllDates('', $filter_name);
3296 
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
3297 3297 
 					$values = array();
3298 3298 
 					foreach ($alldata as $cnt) {
3299 3299 
 						$values[] = $cnt['date_count'];
3300 3300 
 					}
3301 
-					array_multisort($values,SORT_DESC,$alldata);
3302 
-					array_splice($alldata,11);
3301 
+					array_multisort($values, SORT_DESC, $alldata);
3302 
+					array_splice($alldata, 11);
3303 3303 
 					foreach ($alldata as $number) {
3304 
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
3304 
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
3305 3305 
 					}
3306 3306
3307 3307 
 					echo '-> countAllHours...'."\n";
3308 
-					$alldata = $Spotter->countAllHours('hour',$filter);
3308 
+					$alldata = $Spotter->countAllHours('hour', $filter);
3309 3309 
 					foreach ($alldata as $number) {
3310 
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
3310 
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
3311 3311 
 					}
3312 3312 
 					echo 'Insert last stats update date...'."\n";
3313 3313 
 					date_default_timezone_set('UTC');
3314 
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
3314 
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
3315 3315 
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
3316 
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
3316 
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
3317 3317 
 							$this->deleteOldStats($filter_name);
3318 
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
3318 
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
3319 3319 
 						}
3320 3320 
 					}
3321 3321 
 				}
 
@@ -3328,16 +3328,16 @@  discard block
 
 block discarded – undo
3328 3328 
 				// SUM all previous month to put as year
3329 3329 
 				$previous_year = date('Y');
3330 3330 
 				$previous_year--;
3331 
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3332 
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3333 
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3334 
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3331 
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3332 
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3333 
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3334 
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3335 3335 
 				$allairlines = $this->getAllAirlineNames();
3336 3336 
 				foreach ($allairlines as $data) {
3337 
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3338 
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3339 
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3340 
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3337 
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3338 
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3339 
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3340 
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3341 3341 
 				}
3342 3342
3343 3343 
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
 
@@ -3346,21 +3346,21 @@  discard block
 
 block discarded – undo
3346 3346 
 						try {
3347 3347 
 							$sth = $this->db->prepare($query);
3348 3348 
 							$sth->execute();
3349 
-						} catch(PDOException $e) {
3349 
+						} catch (PDOException $e) {
3350 3350 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3351 3351 
 						}
3352 3352 
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
3353 3353 
 						try {
3354 3354 
 							$sth = $this->db->prepare($query);
3355 3355 
 							$sth->execute();
3356 
-						} catch(PDOException $e) {
3356 
+						} catch (PDOException $e) {
3357 3357 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3358 3358 
 						}
3359 3359 
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
3360 3360 
 						try {
3361 3361 
 							$sth = $this->db->prepare($query);
3362 3362 
 							$sth->execute();
3363 
-						} catch(PDOException $e) {
3363 
+						} catch (PDOException $e) {
3364 3364 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3365 3365 
 						}
3366 3366 
 					}
 
@@ -3373,7 +3373,7 @@  discard block
 
 block discarded – undo
3373 3373 
 					try {
3374 3374 
 						$sth = $this->db->prepare($query);
3375 3375 
 						$sth->execute();
3376 
-					} catch(PDOException $e) {
3376 
+					} catch (PDOException $e) {
3377 3377 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3378 3378 
 					}
3379 3379 
 					if ($globalDBdriver == 'mysql') {
 
@@ -3384,7 +3384,7 @@  discard block
 
 block discarded – undo
3384 3384 
 					try {
3385 3385 
 						$sth = $this->db->prepare($query);
3386 3386 
 						$sth->execute();
3387 
-					} catch(PDOException $e) {
3387 
+					} catch (PDOException $e) {
3388 3388 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3389 3389 
 					}
3390 3390 
 					if ($globalDBdriver == 'mysql') {
 
@@ -3395,15 +3395,15 @@  discard block
 
 block discarded – undo
3395 3395 
 					try {
3396 3396 
 						$sth = $this->db->prepare($query);
3397 3397 
 						$sth->execute();
3398 
-					} catch(PDOException $e) {
3398 
+					} catch (PDOException $e) {
3399 3399 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3400 3400 
 					}
3401 3401 
 				}
3402 3402 
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
3403 3403 
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
3404 
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
3404 
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
3405 3405 
 						$this->deleteOldStats();
3406 
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
3406 
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
3407 3407 
 						$lastyearupdate = true;
3408 3408 
 					}
3409 3409 
 				}
 
@@ -3425,7 +3425,7 @@  discard block
 
 block discarded – undo
3425 3425 
 					try {
3426 3426 
 						$sth = $this->db->prepare($query);
3427 3427 
 						$sth->execute();
3428 
-					} catch(PDOException $e) {
3428 
+					} catch (PDOException $e) {
3429 3429 
 						return "error : ".$e->getMessage();
3430 3430 
 					}
3431 3431 
 					echo 'Archive old tracker data...'."\n";
 
@@ -3441,7 +3441,7 @@  discard block
 
 block discarded – undo
3441 3441 
 					try {
3442 3442 
 						$sth = $this->db->prepare($query);
3443 3443 
 						$sth->execute();
3444 
-					} catch(PDOException $e) {
3444 
+					} catch (PDOException $e) {
3445 3445 
 						return "error : ".$e->getMessage();
3446 3446 
 					}
3447 3447 
 					echo 'Archive old marine data...'."\n";
 
@@ -3457,7 +3457,7 @@  discard block
 
 block discarded – undo
3457 3457 
 					try {
3458 3458 
 						$sth = $this->db->prepare($query);
3459 3459 
 						$sth->execute();
3460 
-					} catch(PDOException $e) {
3460 
+					} catch (PDOException $e) {
3461 3461 
 						return "error : ".$e->getMessage();
3462 3462 
 					}
3463 3463 
 				}
 
@@ -3470,7 +3470,7 @@  discard block
 
 block discarded – undo
3470 3470 
 				try {
3471 3471 
 					$sth = $this->db->prepare($query);
3472 3472 
 					$sth->execute();
3473 
-				} catch(PDOException $e) {
3473 
+				} catch (PDOException $e) {
3474 3474 
 					return "error : ".$e->getMessage();
3475 3475 
 				}
3476 3476 
 				echo 'Deleting old tracker data...'."\n";
 
@@ -3482,7 +3482,7 @@  discard block
 
 block discarded – undo
3482 3482 
 				try {
3483 3483 
 					$sth = $this->db->prepare($query);
3484 3484 
 					$sth->execute();
3485 
-				} catch(PDOException $e) {
3485 
+				} catch (PDOException $e) {
3486 3486 
 					return "error : ".$e->getMessage();
3487 3487 
 				}
3488 3488 
 				echo 'Deleting old marine data...'."\n";
 
@@ -3494,14 +3494,14 @@  discard block
 
 block discarded – undo
3494 3494 
 				try {
3495 3495 
 					$sth = $this->db->prepare($query);
3496 3496 
 					$sth->execute();
3497 
-				} catch(PDOException $e) {
3497 
+				} catch (PDOException $e) {
3498 3498 
 					return "error : ".$e->getMessage();
3499 3499 
 				}
3500 3500 
 			}
3501 3501 
 			if (!isset($lastyearupdate)) {
3502 3502 
 				echo 'Insert last stats update date...'."\n";
3503 3503 
 				date_default_timezone_set('UTC');
3504 
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
3504 
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
3505 3505 
 			}
3506 3506 
 			if ($globalStatsResetYear) {
3507 3507 
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.
Braces   +778 added lines, -273 removed lines patch added patch discarded remove patch 
@@ -22,10 +22,14 @@  discard block
 
 block discarded – undo
22 22 
 	*/
23 23 
 	public function __construct($dbc = null) {
24 24 
 		global $globalFilterName;
25 
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
25 
+		if (isset($globalFilterName)) {
26 
+			$this->filter_name = $globalFilterName;
27 
+		}
26 28 
 		$Connection = new Connection($dbc);
27 29 
 		$this->db = $Connection->db();
28 
-		if ($this->db === null) die('Error: No DB connection. (Stats)');
30 
+		if ($this->db === null) {
31 
+			die('Error: No DB connection. (Stats)');
32 
+		}
29 33 
 	}
30 34
31 35 
 	public function addLastStatsUpdate($type,$stats_date) {
 
@@ -93,7 +97,9 @@  discard block
 
 block discarded – undo
93 97
94 98 
 	public function getAllAirlineNames($filter_name = '') {
95 99 
 		global $globalStatsFilters;
96 
-		if ($filter_name == '') $filter_name = $this->filter_name;
100 
+		if ($filter_name == '') {
101 
+			$filter_name = $this->filter_name;
102 
+		}
97 103 
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
98 104 
 		 try {
99 105 
 			$sth = $this->db->prepare($query);
 
@@ -113,7 +119,9 @@  discard block
 
 block discarded – undo
113 119 
 		return $all;
114 120 
 	}
115 121 
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
116 
-		if ($filter_name == '') $filter_name = $this->filter_name;
122 
+		if ($filter_name == '') {
123 
+			$filter_name = $this->filter_name;
124 
+		}
117 125 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
118 126 
 		try {
119 127 
 			$sth = $this->db->prepare($query);
 
@@ -125,7 +133,9 @@  discard block
 
 block discarded – undo
125 133 
 		return $all;
126 134 
 	}
127 135 
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
128 
-		if ($filter_name == '') $filter_name = $this->filter_name;
136 
+		if ($filter_name == '') {
137 
+			$filter_name = $this->filter_name;
138 
+		}
129 139 
 		$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
130 140 
 		try {
131 141 
 			$sth = $this->db->prepare($query);
 
@@ -137,7 +147,9 @@  discard block
 
 block discarded – undo
137 147 
 		return $all;
138 148 
 	}
139 149 
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
140 
-		if ($filter_name == '') $filter_name = $this->filter_name;
150 
+		if ($filter_name == '') {
151 
+			$filter_name = $this->filter_name;
152 
+		}
141 153 
 		$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
142 154 
 		try {
143 155 
 			$sth = $this->db->prepare($query);
 
@@ -150,7 +162,9 @@  discard block
 
 block discarded – undo
150 162 
 	}
151 163
152 164 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
153 
-		if ($filter_name == '') $filter_name = $this->filter_name;
165 
+		if ($filter_name == '') {
166 
+			$filter_name = $this->filter_name;
167 
+		}
154 168 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
155 169 
 		try {
156 170 
 			$sth = $this->db->prepare($query);
 
@@ -163,7 +177,9 @@  discard block
 
 block discarded – undo
163 177 
 	}
164 178
165 179 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
166 
-		if ($filter_name == '') $filter_name = $this->filter_name;
180 
+		if ($filter_name == '') {
181 
+			$filter_name = $this->filter_name;
182 
+		}
167 183 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
168 184 
 		try {
169 185 
 			$sth = $this->db->prepare($query);
 
@@ -178,7 +194,9 @@  discard block
 
 block discarded – undo
178 194
179 195 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
180 196 
 		global $globalStatsFilters;
181 
-		if ($filter_name == '') $filter_name = $this->filter_name;
197 
+		if ($filter_name == '') {
198 
+			$filter_name = $this->filter_name;
199 
+		}
182 200 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
183 201 
 			$Spotter = new Spotter($this->db);
184 202 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -187,8 +205,11 @@  discard block
 
 block discarded – undo
187 205 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
188 206 
 			}
189 207 
 			if ($year == '' && $month == '') {
190 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
191 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
208 
+				if ($limit) {
209 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
210 
+				} else {
211 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
212 
+				}
192 213 
 				try {
193 214 
 					$sth = $this->db->prepare($query);
194 215 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -196,11 +217,16 @@  discard block
 
 block discarded – undo
196 217 
 					echo "error : ".$e->getMessage();
197 218 
 				}
198 219 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
199 
-			} else $all = array();
220 
+			} else {
221 
+				$all = array();
222 
+			}
200 223 
 		} else {
201 224 
 			if ($year == '' && $month == '') {
202 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
203 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
225 
+				if ($limit) {
226 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
227 
+				} else {
228 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
229 
+				}
204 230 
 				try {
205 231 
 					$sth = $this->db->prepare($query);
206 232 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -208,7 +234,9 @@  discard block
 
 block discarded – undo
208 234 
 					echo "error : ".$e->getMessage();
209 235 
 				}
210 236 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
211 
-			} else $all = array();
237 
+			} else {
238 
+				$all = array();
239 
+			}
212 240 
 		}
213 241 
 		if (empty($all)) {
214 242 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -227,10 +255,15 @@  discard block
 
 block discarded – undo
227 255 
 	}
228 256 
 	public function countAllMarineTypes($limit = true, $filter_name = '',$year = '', $month = '') {
229 257 
 		global $globalStatsFilters;
230 
-		if ($filter_name == '') $filter_name = $this->filter_name;
258 
+		if ($filter_name == '') {
259 
+			$filter_name = $this->filter_name;
260 
+		}
231 261 
 		if ($year == '' && $month == '') {
232 
-			if ($limit) $query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY marine_type_count DESC LIMIT 10 OFFSET 0";
233 
-			else $query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
262 
+			if ($limit) {
263 
+				$query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY marine_type_count DESC LIMIT 10 OFFSET 0";
264 
+			} else {
265 
+				$query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
266 
+			}
234 267 
 			try {
235 268 
 				$sth = $this->db->prepare($query);
236 269 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -238,7 +271,9 @@  discard block
 
 block discarded – undo
238 271 
 				echo "error : ".$e->getMessage();
239 272 
 			}
240 273 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
241 
-		} else $all = array();
274 
+		} else {
275 
+			$all = array();
276 
+		}
242 277 
 		if (empty($all)) {
243 278 
 			$filters = array('year' => $year,'month' => $month);
244 279 
 			if ($filter_name != '') {
 
@@ -252,10 +287,15 @@  discard block
 
 block discarded – undo
252 287 
 	}
253 288 
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
254 289 
 		global $globalStatsFilters;
255 
-		if ($filter_name == '') $filter_name = $this->filter_name;
290 
+		if ($filter_name == '') {
291 
+			$filter_name = $this->filter_name;
292 
+		}
256 293 
 		if ($year == '' && $month == '') {
257 
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
258 
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
294 
+			if ($limit) {
295 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
296 
+			} else {
297 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
298 
+			}
259 299 
 			try {
260 300 
 				$sth = $this->db->prepare($query);
261 301 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -263,7 +303,9 @@  discard block
 
 block discarded – undo
263 303 
 				echo "error : ".$e->getMessage();
264 304 
 			}
265 305 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
266 
-		} else $all = array();
306 
+		} else {
307 
+			$all = array();
308 
+		}
267 309 
 		if (empty($all)) {
268 310 
 			$Spotter = new Spotter($this->db);
269 311 
 			$filters = array();
 
@@ -278,7 +320,9 @@  discard block
 
 block discarded – undo
278 320 
 	}
279 321 
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
280 322 
 		global $globalStatsFilters;
281 
-		if ($filter_name == '') $filter_name = $this->filter_name;
323 
+		if ($filter_name == '') {
324 
+			$filter_name = $this->filter_name;
325 
+		}
282 326 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
283 327 
 			$Spotter = new Spotter($this->db);
284 328 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -287,8 +331,11 @@  discard block
 
 block discarded – undo
287 331 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
288 332 
 			}
289 333 
 			if ($year == '' && $month == '') {
290 
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
291 
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
334 
+				if ($limit) {
335 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
336 
+				} else {
337 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
338 
+				}
292 339 
 				try {
293 340 
 					$sth = $this->db->prepare($query);
294 341 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -296,11 +343,16 @@  discard block
 
 block discarded – undo
296 343 
 					echo "error : ".$e->getMessage();
297 344 
 				}
298 345 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
299 
-			} else $all = array();
346 
+			} else {
347 
+				$all = array();
348 
+			}
300 349 
 		} else {
301 350 
 			if ($year == '' && $month == '') {
302 
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
303 
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
351 
+				if ($limit) {
352 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
353 
+				} else {
354 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
355 
+				}
304 356 
 				try {
305 357 
 					$sth = $this->db->prepare($query);
306 358 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -308,7 +360,9 @@  discard block
 
 block discarded – undo
308 360 
 					echo "error : ".$e->getMessage();
309 361 
 				}
310 362 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
311 
-			} else $all = array();
363 
+			} else {
364 
+				$all = array();
365 
+			}
312 366 
 		}
313 367 
 		if (empty($all)) {
314 368 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -328,7 +382,9 @@  discard block
 
 block discarded – undo
328 382
329 383 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
330 384 
 		global $globalStatsFilters;
331 
-		if ($filter_name == '') $filter_name = $this->filter_name;
385 
+		if ($filter_name == '') {
386 
+			$filter_name = $this->filter_name;
387 
+		}
332 388 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
333 389 
 			$Spotter = new Spotter($this->db);
334 390 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -337,8 +393,11 @@  discard block
 
 block discarded – undo
337 393 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
338 394 
 			}
339 395 
 			if ($year == '' && $month == '') {
340 
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
341 
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
396 
+				if ($limit) {
397 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
398 
+				} else {
399 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
400 
+				}
342 401 
 				try {
343 402 
 					$sth = $this->db->prepare($query);
344 403 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -346,11 +405,16 @@  discard block
 
 block discarded – undo
346 405 
 					echo "error : ".$e->getMessage();
347 406 
 				}
348 407 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
349 
-			} else $all = array();
408 
+			} else {
409 
+				$all = array();
410 
+			}
350 411 
 		} else {
351 412 
 			if ($year == '' && $month == '') {
352 
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
353 
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
413 
+				if ($limit) {
414 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
415 
+				} else {
416 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
417 
+				}
354 418 
 				try {
355 419 
 					$sth = $this->db->prepare($query);
356 420 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -358,7 +422,9 @@  discard block
 
 block discarded – undo
358 422 
 					echo "error : ".$e->getMessage();
359 423 
 				}
360 424 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
361 
-			} else $all = array();
425 
+			} else {
426 
+				$all = array();
427 
+			}
362 428 
 		}
363 429 
 		if (empty($all)) {
364 430 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -377,7 +443,9 @@  discard block
 
 block discarded – undo
377 443 
 	}
378 444 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
379 445 
 		global $globalStatsFilters;
380 
-		if ($filter_name == '') $filter_name = $this->filter_name;
446 
+		if ($filter_name == '') {
447 
+			$filter_name = $this->filter_name;
448 
+		}
381 449 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
382 450 
 			$Spotter = new Spotter($this->db);
383 451 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -385,12 +453,18 @@  discard block
 
 block discarded – undo
385 453 
 			foreach ($airlines as $airline) {
386 454 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
387 455 
 			}
388 
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
389 
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
456 
+			if ($limit) {
457 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
458 
+			} else {
459 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
460 
+			}
390 461 
 			$query_values = array(':filter_name' => $filter_name);
391 462 
 		} else {
392 
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
393 
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
463 
+			if ($limit) {
464 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
465 
+			} else {
466 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
467 
+			}
394 468 
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
395 469 
 		}
396 470 
 		try {
 
@@ -418,17 +492,29 @@  discard block
 
 block discarded – undo
418 492
419 493 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
420 494 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
421 
-		if ($filter_name == '') $filter_name = $this->filter_name;
495 
+		if ($filter_name == '') {
496 
+			$filter_name = $this->filter_name;
497 
+		}
422 498 
 		if ($year == '' && $month == '') {
423 
-			if ($globalVATSIM) $forsource = 'vatsim';
424 
-			if ($globalIVAO) $forsource = 'ivao';
499 
+			if ($globalVATSIM) {
500 
+				$forsource = 'vatsim';
501 
+			}
502 
+			if ($globalIVAO) {
503 
+				$forsource = 'ivao';
504 
+			}
425 505 
 			if (isset($forsource)) {
426 
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
427 
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
506 
+				if ($limit) {
507 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
508 
+				} else {
509 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
510 
+				}
428 511 
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
429 512 
 			} else {
430 
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
431 
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
513 
+				if ($limit) {
514 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
515 
+				} else {
516 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
517 
+				}
432 518 
 				$query_values = array(':filter_name' => $filter_name);
433 519 
 			}
434 520 
 			try {
 
@@ -438,7 +524,9 @@  discard block
 
 block discarded – undo
438 524 
 				echo "error : ".$e->getMessage();
439 525 
 			}
440 526 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
441 
-		} else $all = array();
527 
+		} else {
528 
+			$all = array();
529 
+		}
442 530 
                 if (empty($all)) {
443 531 
 	                $Spotter = new Spotter($this->db);
444 532 
             		$filters = array();
 
@@ -453,7 +541,9 @@  discard block
 
 block discarded – undo
453 541 
 	}
454 542 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
455 543 
 		global $globalStatsFilters;
456 
-		if ($filter_name == '') $filter_name = $this->filter_name;
544 
+		if ($filter_name == '') {
545 
+			$filter_name = $this->filter_name;
546 
+		}
457 547 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
458 548 
 			$Spotter = new Spotter($this->db);
459 549 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -462,8 +552,11 @@  discard block
 
 block discarded – undo
462 552 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
463 553 
 			}
464 554 
 			if ($year == '' && $month == '') {
465 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
466 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
555 
+				if ($limit) {
556 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
557 
+				} else {
558 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
559 
+				}
467 560 
 				try {
468 561 
 					$sth = $this->db->prepare($query);
469 562 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -471,11 +564,16 @@  discard block
 
 block discarded – undo
471 564 
 					echo "error : ".$e->getMessage();
472 565 
 				}
473 566 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
474 
-			} else $all = array();
567 
+			} else {
568 
+				$all = array();
569 
+			}
475 570 
 		} else {
476 571 
 			if ($year == '' && $month == '') {
477 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
478 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
572 
+				if ($limit) {
573 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
574 
+				} else {
575 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
576 
+				}
479 577 
 				try {
480 578 
 					$sth = $this->db->prepare($query);
481 579 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -483,7 +581,9 @@  discard block
 
 block discarded – undo
483 581 
 					echo "error : ".$e->getMessage();
484 582 
 				}
485 583 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
486 
-			} else $all = array();
584 
+			} else {
585 
+				$all = array();
586 
+			}
487 587 
 		}
488 588 
 		if (empty($all)) {
489 589 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -502,7 +602,9 @@  discard block
 
 block discarded – undo
502 602 
 	}
503 603 
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
504 604 
 		global $globalStatsFilters;
505 
-		if ($filter_name == '') $filter_name = $this->filter_name;
605 
+		if ($filter_name == '') {
606 
+			$filter_name = $this->filter_name;
607 
+		}
506 608 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
507 609 
 			$Spotter = new Spotter($this->db);
508 610 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -511,8 +613,11 @@  discard block
 
 block discarded – undo
511 613 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
512 614 
 			}
513 615 
 			if ($year == '' && $month == '') {
514 
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
515 
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
616 
+				if ($limit) {
617 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
618 
+				} else {
619 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
620 
+				}
516 621 
 				 try {
517 622 
 					$sth = $this->db->prepare($query);
518 623 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -520,11 +625,16 @@  discard block
 
 block discarded – undo
520 625 
 					echo "error : ".$e->getMessage();
521 626 
 				}
522 627 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
523 
-			} else $all = array();
628 
+			} else {
629 
+				$all = array();
630 
+			}
524 631 
 		} else {
525 632 
 			if ($year == '' && $month == '') {
526 
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
527 
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
633 
+				if ($limit) {
634 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
635 
+				} else {
636 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
637 
+				}
528 638 
 				 try {
529 639 
 					$sth = $this->db->prepare($query);
530 640 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -532,7 +642,9 @@  discard block
 
 block discarded – undo
532 642 
 					echo "error : ".$e->getMessage();
533 643 
 				}
534 644 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
535 
-			} else $all = array();
645 
+			} else {
646 
+				$all = array();
647 
+			}
536 648 
 		}
537 649 
 		if (empty($all)) {
538 650 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -551,7 +663,9 @@  discard block
 
 block discarded – undo
551 663 
 	}
552 664 
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
553 665 
 		$Connection = new Connection($this->db);
554 
-		if ($filter_name == '') $filter_name = $this->filter_name;
666 
+		if ($filter_name == '') {
667 
+			$filter_name = $this->filter_name;
668 
+		}
555 669 
 		if ($Connection->tableExists('countries')) {
556 670 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
557 671 
 				$Spotter = new Spotter($this->db);
 
@@ -561,8 +675,11 @@  discard block
 
 block discarded – undo
561 675 
 					foreach ($airlines as $airline) {
562 676 
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
563 677 
 					}
564 
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
565 
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
678 
+					if ($limit) {
679 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
680 
+					} else {
681 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
682 
+					}
566 683 
 					 try {
567 684 
 						$sth = $this->db->prepare($query);
568 685 
 						$sth->execute(array(':filter_name' => $filter_name));
 
@@ -571,11 +688,16 @@  discard block
 
 block discarded – undo
571 688 
 					}
572 689 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
573 690 
 					return $all;
574 
-				} else return array();
691 
+				} else {
692 
+					return array();
693 
+				}
575 694 
 			} else {
576 695 
 				if ($year == '' && $month == '') {
577 
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
578 
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
696 
+					if ($limit) {
697 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
698 
+					} else {
699 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
700 
+					}
579 701 
 					 try {
580 702 
 						$sth = $this->db->prepare($query);
581 703 
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -584,20 +706,29 @@  discard block
 
 block discarded – undo
584 706 
 					}
585 707 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
586 708 
 					return $all;
587 
-				} else return array();
709 
+				} else {
710 
+					return array();
711 
+				}
588 712 
 			}
589 713 
 			$Spotter = new Spotter($this->db);
590 714 
 			return $Spotter->countAllFlightOverCountries($limit);
591 
-		} else return array();
715 
+		} else {
716 
+			return array();
717 
+		}
592 718 
 	}
593 719 
 	public function countAllMarineOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
594 720 
 		$Connection = new Connection($this->db);
595 
-		if ($filter_name == '') $filter_name = $this->filter_name;
721 
+		if ($filter_name == '') {
722 
+			$filter_name = $this->filter_name;
723 
+		}
596 724 
 		if ($Connection->tableExists('countries')) {
597 725 
 			$all = array();
598 726 
 			if ($year == '' && $month == '') {
599 
-				if ($limit) $query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC LIMIT 20 OFFSET 0";
600 
-				else $query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC";
727 
+				if ($limit) {
728 
+					$query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC LIMIT 20 OFFSET 0";
729 
+				} else {
730 
+					$query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC";
731 
+				}
601 732 
 				 try {
602 733 
 					$sth = $this->db->prepare($query);
603 734 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -615,17 +746,24 @@  discard block
 
 block discarded – undo
615 746 
 				$all = $Marine->countAllMarineOverCountries($limit,0,'',$filters);
616 747 
 			}
617 748 
 			return $all;
618 
-		} else return array();
749 
+		} else {
750 
+			return array();
751 
+		}
619 752 
 	}
620 753 
 	public function countAllTrackerOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
621 754 
 		global $globalStatsFilters;
622 755 
 		$Connection = new Connection($this->db);
623 
-		if ($filter_name == '') $filter_name = $this->filter_name;
756 
+		if ($filter_name == '') {
757 
+			$filter_name = $this->filter_name;
758 
+		}
624 759 
 		if ($Connection->tableExists('countries')) {
625 760 
 			$all = array();
626 761 
 			if ($year == '' && $month == '') {
627 
-				if ($limit) $query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC LIMIT 20 OFFSET 0";
628 
-				else $query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC";
762 
+				if ($limit) {
763 
+					$query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC LIMIT 20 OFFSET 0";
764 
+				} else {
765 
+					$query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC";
766 
+				}
629 767 
 				 try {
630 768 
 					$sth = $this->db->prepare($query);
631 769 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -644,14 +782,21 @@  discard block
 
 block discarded – undo
644 782 
 				$all = $Tracker->countAllTrackerOverCountries($limit,0,'',$filters);
645 783 
 			}
646 784 
 			return $all;
647 
-		} else return array();
785 
+		} else {
786 
+			return array();
787 
+		}
648 788 
 	}
649 789 
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
650 790 
 		global $globalStatsFilters;
651 
-		if ($filter_name == '') $filter_name = $this->filter_name;
791 
+		if ($filter_name == '') {
792 
+			$filter_name = $this->filter_name;
793 
+		}
652 794 
 		if ($year == '' && $month == '') {
653 
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
654 
-			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
795 
+			if ($limit) {
796 
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
797 
+			} else {
798 
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
799 
+			}
655 800 
 			try {
656 801 
 				$sth = $this->db->prepare($query);
657 802 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -659,7 +804,9 @@  discard block
 
 block discarded – undo
659 804 
 				echo "error : ".$e->getMessage();
660 805 
 			}
661 806 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
662 
-		} else $all = array();
807 
+		} else {
808 
+			$all = array();
809 
+		}
663 810 
 		if (empty($all)) {
664 811 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
665 812 
 			if ($filter_name != '') {
 
@@ -674,7 +821,9 @@  discard block
 
 block discarded – undo
674 821
675 822 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
676 823 
 		global $globalStatsFilters;
677 
-		if ($filter_name == '') $filter_name = $this->filter_name;
824 
+		if ($filter_name == '') {
825 
+			$filter_name = $this->filter_name;
826 
+		}
678 827 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
679 828 
 			$Spotter = new Spotter($this->db);
680 829 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -683,8 +832,11 @@  discard block
 
 block discarded – undo
683 832 
 				foreach ($airlines as $airline) {
684 833 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
685 834 
 				}
686 
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
687 
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
835 
+				if ($limit) {
836 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
837 
+				} else {
838 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
839 
+				}
688 840 
 				try {
689 841 
 					$sth = $this->db->prepare($query);
690 842 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -692,11 +844,16 @@  discard block
 
 block discarded – undo
692 844 
 					echo "error : ".$e->getMessage();
693 845 
 				}
694 846 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
695 
-			} else $all = array();
847 
+			} else {
848 
+				$all = array();
849 
+			}
696 850 
 		} else {
697 851 
 			if ($year == '' && $month == '') {
698 
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
699 
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
852 
+				if ($limit) {
853 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
854 
+				} else {
855 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
856 
+				}
700 857 
 				try {
701 858 
 					$sth = $this->db->prepare($query);
702 859 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -704,7 +861,9 @@  discard block
 
 block discarded – undo
704 861 
 					echo "error : ".$e->getMessage();
705 862 
 				}
706 863 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
707 
-			} else $all = array();
864 
+			} else {
865 
+				$all = array();
866 
+			}
708 867 
 		}
709 868 
 		if (empty($all)) {
710 869 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -723,7 +882,9 @@  discard block
 
 block discarded – undo
723 882 
 	}
724 883 
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
725 884 
 		global $globalStatsFilters;
726 
-		if ($filter_name == '') $filter_name = $this->filter_name;
885 
+		if ($filter_name == '') {
886 
+			$filter_name = $this->filter_name;
887 
+		}
727 888 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
728 889 
 			$Spotter = new Spotter($this->db);
729 890 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -732,8 +893,11 @@  discard block
 
 block discarded – undo
732 893 
 				foreach ($airlines as $airline) {
733 894 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
734 895 
 				}
735 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
736 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
896 
+				if ($limit) {
897 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
898 
+				} else {
899 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
900 
+				}
737 901 
 				try {
738 902 
 					$sth = $this->db->prepare($query);
739 903 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -741,11 +905,16 @@  discard block
 
 block discarded – undo
741 905 
 					echo "error : ".$e->getMessage();
742 906 
 				}
743 907 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
744 
-			} else $all = array();
908 
+			} else {
909 
+				$all = array();
910 
+			}
745 911 
 		} else {
746 912 
 			if ($year == '' && $month == '') {
747 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
748 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
913 
+				if ($limit) {
914 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
915 
+				} else {
916 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
917 
+				}
749 918 
 				try {
750 919 
 					$sth = $this->db->prepare($query);
751 920 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -753,7 +922,9 @@  discard block
 
 block discarded – undo
753 922 
 					echo "error : ".$e->getMessage();
754 923 
 				}
755 924 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
756 
-			} else $all = array();
925 
+			} else {
926 
+				$all = array();
927 
+			}
757 928 
 		}
758 929 
 		if (empty($all)) {
759 930 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -778,7 +949,9 @@  discard block
 
 block discarded – undo
778 949 
 				$icao = $value['airport_departure_icao'];
779 950 
 				if (isset($all[$icao])) {
780 951 
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
781 
-				} else $all[$icao] = $value;
952 
+				} else {
953 
+					$all[$icao] = $value;
954 
+				}
782 955 
 			}
783 956 
 			$count = array();
784 957 
 			foreach ($all as $key => $row) {
 
@@ -790,7 +963,9 @@  discard block
 
 block discarded – undo
790 963 
 	}
791 964 
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
792 965 
 		global $globalStatsFilters;
793 
-		if ($filter_name == '') $filter_name = $this->filter_name;
966 
+		if ($filter_name == '') {
967 
+			$filter_name = $this->filter_name;
968 
+		}
794 969 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
795 970 
 			$Spotter = new Spotter($this->db);
796 971 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -799,8 +974,11 @@  discard block
 
 block discarded – undo
799 974 
 				foreach ($airlines as $airline) {
800 975 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
801 976 
 				}
802 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
803 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
977 
+				if ($limit) {
978 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
979 
+				} else {
980 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
981 
+				}
804 982 
 				try {
805 983 
 					$sth = $this->db->prepare($query);
806 984 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -808,11 +986,16 @@  discard block
 
 block discarded – undo
808 986 
 					echo "error : ".$e->getMessage();
809 987 
 				}
810 988 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
811 
-			} else $all = array();
989 
+			} else {
990 
+				$all = array();
991 
+			}
812 992 
 		} else {
813 993 
 			if ($year == '' && $month == '') {
814 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
815 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
994 
+				if ($limit) {
995 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
996 
+				} else {
997 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
998 
+				}
816 999 
 				try {
817 1000 
 					$sth = $this->db->prepare($query);
818 1001 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -820,7 +1003,9 @@  discard block
 
 block discarded – undo
820 1003 
 					echo "error : ".$e->getMessage();
821 1004 
 				}
822 1005 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
823 
-			} else $all = array();
1006 
+			} else {
1007 
+				$all = array();
1008 
+			}
824 1009 
 		}
825 1010 
 		if (empty($all)) {
826 1011 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -845,7 +1030,9 @@  discard block
 
 block discarded – undo
845 1030 
 				$icao = $value['airport_arrival_icao'];
846 1031 
 				if (isset($all[$icao])) {
847 1032 
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
848 
-				} else $all[$icao] = $value;
1033 
+				} else {
1034 
+					$all[$icao] = $value;
1035 
+				}
849 1036 
 			}
850 1037 
 			$count = array();
851 1038 
 			foreach ($all as $key => $row) {
 
@@ -857,7 +1044,9 @@  discard block
 
 block discarded – undo
857 1044 
 	}
858 1045 
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
859 1046 
 		global $globalDBdriver, $globalStatsFilters;
860 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1047 
+		if ($filter_name == '') {
1048 
+			$filter_name = $this->filter_name;
1049 
+		}
861 1050 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
862 1051 
 			$Spotter = new Spotter($this->db);
863 1052 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -866,20 +1055,32 @@  discard block
 
 block discarded – undo
866 1055 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
867 1056 
 			}
868 1057 
 			if ($globalDBdriver == 'mysql') {
869 
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
870 
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
1058 
+				if ($limit) {
1059 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
1060 
+				} else {
1061 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
1062 
+				}
871 1063 
 			} else {
872 
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
873 
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
1064 
+				if ($limit) {
1065 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
1066 
+				} else {
1067 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
1068 
+				}
874 1069 
 			}
875 1070 
 			$query_data = array(':filter_name' => $filter_name);
876 1071 
 		} else {
877 1072 
 			if ($globalDBdriver == 'mysql') {
878 
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
879 
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1073 
+				if ($limit) {
1074 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
1075 
+				} else {
1076 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1077 
+				}
880 1078 
 			} else {
881 
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
882 
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1079 
+				if ($limit) {
1080 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1081 
+				} else {
1082 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1083 
+				}
883 1084 
 			}
884 1085 
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
885 1086 
 		}
 
@@ -907,13 +1108,21 @@  discard block
 
 block discarded – undo
907 1108
908 1109 
 	public function countAllMarineMonthsLastYear($limit = true,$filter_name = '') {
909 1110 
 		global $globalDBdriver, $globalStatsFilters;
910 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1111 
+		if ($filter_name == '') {
1112 
+			$filter_name = $this->filter_name;
1113 
+		}
911 1114 
 		if ($globalDBdriver == 'mysql') {
912 
-			if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
913 
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
1115 
+			if ($limit) {
1116 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
1117 
+			} else {
1118 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
1119 
+			}
914 1120 
 		} else {
915 
-			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
916 
-			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
1121 
+			if ($limit) {
1122 
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
1123 
+			} else {
1124 
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
1125 
+			}
917 1126 
 		}
918 1127 
 		$query_data = array(':filter_name' => $filter_name);
919 1128 
 		try {
 
@@ -936,13 +1145,21 @@  discard block
 
 block discarded – undo
936 1145
937 1146 
 	public function countAllTrackerMonthsLastYear($limit = true,$filter_name = '') {
938 1147 
 		global $globalDBdriver, $globalStatsFilters;
939 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1148 
+		if ($filter_name == '') {
1149 
+			$filter_name = $this->filter_name;
1150 
+		}
940 1151 
 		if ($globalDBdriver == 'mysql') {
941 
-			if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
942 
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
1152 
+			if ($limit) {
1153 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
1154 
+			} else {
1155 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
1156 
+			}
943 1157 
 		} else {
944 
-			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
945 
-			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
1158 
+			if ($limit) {
1159 
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
1160 
+			} else {
1161 
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
1162 
+			}
946 1163 
 		}
947 1164 
 		$query_data = array(':filter_name' => $filter_name);
948 1165 
 		try {
 
@@ -965,7 +1182,9 @@  discard block
 
 block discarded – undo
965 1182
966 1183 
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
967 1184 
 		global $globalStatsFilters;
968 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1185 
+		if ($filter_name == '') {
1186 
+			$filter_name = $this->filter_name;
1187 
+		}
969 1188 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
970 1189 
 			$Spotter = new Spotter($this->db);
971 1190 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1002,7 +1221,9 @@  discard block
 
 block discarded – undo
1002 1221 
 	}
1003 1222 
 	public function countAllMarineDatesLastMonth($filter_name = '') {
1004 1223 
 		global $globalStatsFilters;
1005 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1224 
+		if ($filter_name == '') {
1225 
+			$filter_name = $this->filter_name;
1226 
+		}
1006 1227 
 		$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'month' AND filter_name = :filter_name";
1007 1228 
 		$query_data = array(':filter_name' => $filter_name);
1008 1229 
 		try {
 
@@ -1024,7 +1245,9 @@  discard block
 
 block discarded – undo
1024 1245 
 	}
1025 1246 
 	public function countAllTrackerDatesLastMonth($filter_name = '') {
1026 1247 
 		global $globalStatsFilters;
1027 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1248 
+		if ($filter_name == '') {
1249 
+			$filter_name = $this->filter_name;
1250 
+		}
1028 1251 
 		$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'month' AND filter_name = :filter_name";
1029 1252 
 		$query_data = array(':filter_name' => $filter_name);
1030 1253 
 		try {
 
@@ -1046,7 +1269,9 @@  discard block
 
 block discarded – undo
1046 1269 
 	}
1047 1270 
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
1048 1271 
 		global $globalDBdriver, $globalStatsFilters;
1049 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1272 
+		if ($filter_name == '') {
1273 
+			$filter_name = $this->filter_name;
1274 
+		}
1050 1275 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1051 1276 
 			$Spotter = new Spotter($this->db);
1052 1277 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1091,7 +1316,9 @@  discard block
 
 block discarded – undo
1091 1316 
 	}
1092 1317 
 	public function countAllMarineDatesLast7Days($filter_name = '') {
1093 1318 
 		global $globalDBdriver, $globalStatsFilters;
1094 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1319 
+		if ($filter_name == '') {
1320 
+			$filter_name = $this->filter_name;
1321 
+		}
1095 1322 
 		if ($globalDBdriver == 'mysql') {
1096 1323 
 			$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'month' AND marine_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND filter_name = :filter_name";
1097 1324 
 		} else {
 
@@ -1117,7 +1344,9 @@  discard block
 
 block discarded – undo
1117 1344 
 	}
1118 1345 
 	public function countAllTrackerDatesLast7Days($filter_name = '') {
1119 1346 
 		global $globalDBdriver, $globalStatsFilters;
1120 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1347 
+		if ($filter_name == '') {
1348 
+			$filter_name = $this->filter_name;
1349 
+		}
1121 1350 
 		if ($globalDBdriver == 'mysql') {
1122 1351 
 			$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'month' AND tracker_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND filter_name = :filter_name";
1123 1352 
 		} else {
 
@@ -1143,7 +1372,9 @@  discard block
 
 block discarded – undo
1143 1372 
 	}
1144 1373 
 	public function countAllDates($stats_airline = '',$filter_name = '') {
1145 1374 
 		global $globalStatsFilters;
1146 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1375 
+		if ($filter_name == '') {
1376 
+			$filter_name = $this->filter_name;
1377 
+		}
1147 1378 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1148 1379 
 			$Spotter = new Spotter($this->db);
1149 1380 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1180,7 +1411,9 @@  discard block
 
 block discarded – undo
1180 1411 
 	}
1181 1412 
 	public function countAllDatesMarine($filter_name = '') {
1182 1413 
 		global $globalStatsFilters;
1183 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1414 
+		if ($filter_name == '') {
1415 
+			$filter_name = $this->filter_name;
1416 
+		}
1184 1417 
 		$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
1185 1418 
 		$query_data = array(':filter_name' => $filter_name);
1186 1419 
 		try {
 
@@ -1202,7 +1435,9 @@  discard block
 
 block discarded – undo
1202 1435 
 	}
1203 1436 
 	public function countAllDatesTracker($filter_name = '') {
1204 1437 
 		global $globalStatsFilters;
1205 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1438 
+		if ($filter_name == '') {
1439 
+			$filter_name = $this->filter_name;
1440 
+		}
1206 1441 
 		$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
1207 1442 
 		$query_data = array(':filter_name' => $filter_name);
1208 1443 
 		try {
 
@@ -1224,7 +1459,9 @@  discard block
 
 block discarded – undo
1224 1459 
 	}
1225 1460 
 	public function countAllDatesByAirlines($filter_name = '') {
1226 1461 
 		global $globalStatsFilters;
1227 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1462 
+		if ($filter_name == '') {
1463 
+			$filter_name = $this->filter_name;
1464 
+		}
1228 1465 
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
1229 1466 
 		$query_data = array('filter_name' => $filter_name);
1230 1467 
 		try {
 
@@ -1246,7 +1483,9 @@  discard block
 
 block discarded – undo
1246 1483 
 	}
1247 1484 
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
1248 1485 
 		global $globalStatsFilters, $globalDBdriver;
1249 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1486 
+		if ($filter_name == '') {
1487 
+			$filter_name = $this->filter_name;
1488 
+		}
1250 1489 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1251 1490 
 			$Spotter = new Spotter($this->db);
1252 1491 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1331,7 +1570,9 @@  discard block
 
 block discarded – undo
1331 1570 
 	}
1332 1571 
 	public function countAllMilitaryMonths($filter_name = '') {
1333 1572 
 		global $globalStatsFilters;
1334 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1573 
+		if ($filter_name == '') {
1574 
+			$filter_name = $this->filter_name;
1575 
+		}
1335 1576 
 		$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
1336 1577 
 		try {
1337 1578 
 			$sth = $this->db->prepare($query);
 
@@ -1352,7 +1593,9 @@  discard block
 
 block discarded – undo
1352 1593 
 	}
1353 1594 
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1354 1595 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1355 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1596 
+		if ($filter_name == '') {
1597 
+			$filter_name = $this->filter_name;
1598 
+		}
1356 1599 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1357 1600 
 			$Spotter = new Spotter($this->db);
1358 1601 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1360,12 +1603,18 @@  discard block
 
 block discarded – undo
1360 1603 
 			foreach ($airlines as $airline) {
1361 1604 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1362 1605 
 			}
1363 
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1364 
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1606 
+			if ($limit) {
1607 
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1608 
+			} else {
1609 
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1610 
+			}
1365 1611 
 			$query_data = array(':filter_name' => $filter_name);
1366 1612 
 		} else {
1367 
-			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1368 
-			else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1613 
+			if ($limit) {
1614 
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1615 
+			} else {
1616 
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1617 
+			}
1369 1618 
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1370 1619 
 		}
1371 1620 
 		if ($orderby == 'hour') {
 
@@ -1375,7 +1624,9 @@  discard block
 
 block discarded – undo
1375 1624 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
1376 1625 
 			}
1377 1626 
 		}
1378 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1627 
+		if ($orderby == 'count') {
1628 
+			$query .= " ORDER BY hour_count DESC";
1629 
+		}
1379 1630 
 		try {
1380 1631 
 			$sth = $this->db->prepare($query);
1381 1632 
 			$sth->execute($query_data);
 
@@ -1399,9 +1650,14 @@  discard block
 
 block discarded – undo
1399 1650 
 	}
1400 1651 
 	public function countAllMarineHours($orderby = 'hour',$limit = true,$filter_name = '') {
1401 1652 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1402 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1403 
-		if ($limit) $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
1404 
-		else $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
1653 
+		if ($filter_name == '') {
1654 
+			$filter_name = $this->filter_name;
1655 
+		}
1656 
+		if ($limit) {
1657 
+			$query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
1658 
+		} else {
1659 
+			$query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
1660 
+		}
1405 1661 
 		$query_data = array(':filter_name' => $filter_name);
1406 1662 
 		if ($orderby == 'hour') {
1407 1663 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1410,7 +1666,9 @@  discard block
 
 block discarded – undo
1410 1666 
 				$query .= " ORDER BY CAST(marine_date AS integer) ASC";
1411 1667 
 			}
1412 1668 
 		}
1413 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1669 
+		if ($orderby == 'count') {
1670 
+			$query .= " ORDER BY hour_count DESC";
1671 
+		}
1414 1672 
 		try {
1415 1673 
 			$sth = $this->db->prepare($query);
1416 1674 
 			$sth->execute($query_data);
 
@@ -1430,9 +1688,14 @@  discard block
 
 block discarded – undo
1430 1688 
 	}
1431 1689 
 	public function countAllTrackerHours($orderby = 'hour',$limit = true,$filter_name = '') {
1432 1690 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1433 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1434 
-		if ($limit) $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
1435 
-		else $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
1691 
+		if ($filter_name == '') {
1692 
+			$filter_name = $this->filter_name;
1693 
+		}
1694 
+		if ($limit) {
1695 
+			$query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
1696 
+		} else {
1697 
+			$query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
1698 
+		}
1436 1699 
 		$query_data = array(':filter_name' => $filter_name);
1437 1700 
 		if ($orderby == 'hour') {
1438 1701 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1441,7 +1704,9 @@  discard block
 
 block discarded – undo
1441 1704 
 				$query .= " ORDER BY CAST(tracker_date AS integer) ASC";
1442 1705 
 			}
1443 1706 
 		}
1444 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1707 
+		if ($orderby == 'count') {
1708 
+			$query .= " ORDER BY hour_count DESC";
1709 
+		}
1445 1710 
 		try {
1446 1711 
 			$sth = $this->db->prepare($query);
1447 1712 
 			$sth->execute($query_data);
 
@@ -1461,8 +1726,12 @@  discard block
 
 block discarded – undo
1461 1726 
 	}
1462 1727 
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1463 1728 
 		global $globalStatsFilters;
1464 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1465 
-		if ($year == '') $year = date('Y');
1729 
+		if ($filter_name == '') {
1730 
+			$filter_name = $this->filter_name;
1731 
+		}
1732 
+		if ($year == '') {
1733 
+			$year = date('Y');
1734 
+		}
1466 1735 
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1467 1736 
 		if (empty($all)) {
1468 1737 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1481,8 +1750,12 @@  discard block
 
 block discarded – undo
1481 1750 
 	}
1482 1751 
 	public function countOverallMarine($filter_name = '',$year = '',$month = '') {
1483 1752 
 		global $globalStatsFilters;
1484 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1485 
-		if ($year == '') $year = date('Y');
1753 
+		if ($filter_name == '') {
1754 
+			$filter_name = $this->filter_name;
1755 
+		}
1756 
+		if ($year == '') {
1757 
+			$year = date('Y');
1758 
+		}
1486 1759 
 		$all = $this->getSumStats('marine_bymonth',$year,'',$filter_name,$month);
1487 1760 
 		if (empty($all)) {
1488 1761 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1497,8 +1770,12 @@  discard block
 
 block discarded – undo
1497 1770 
 	}
1498 1771 
 	public function countOverallTracker($filter_name = '',$year = '',$month = '') {
1499 1772 
 		global $globalStatsFilters;
1500 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1501 
-		if ($year == '') $year = date('Y');
1773 
+		if ($filter_name == '') {
1774 
+			$filter_name = $this->filter_name;
1775 
+		}
1776 
+		if ($year == '') {
1777 
+			$year = date('Y');
1778 
+		}
1502 1779 
 		$all = $this->getSumStats('tracker_bymonth',$year,'',$filter_name,$month);
1503 1780 
 		if (empty($all)) {
1504 1781 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1513,8 +1790,12 @@  discard block
 
 block discarded – undo
1513 1790 
 	}
1514 1791 
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1515 1792 
 		global $globalStatsFilters;
1516 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1517 
-		if ($year == '') $year = date('Y');
1793 
+		if ($filter_name == '') {
1794 
+			$filter_name = $this->filter_name;
1795 
+		}
1796 
+		if ($year == '') {
1797 
+			$year = date('Y');
1798 
+		}
1518 1799 
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1519 1800 
 		if (empty($all)) {
1520 1801 
 			$filters = array();
 
@@ -1530,8 +1811,12 @@  discard block
 
 block discarded – undo
1530 1811 
 	}
1531 1812 
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1532 1813 
 		global $globalStatsFilters;
1533 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1534 
-		if ($year == '') $year = date('Y');
1814 
+		if ($filter_name == '') {
1815 
+			$filter_name = $this->filter_name;
1816 
+		}
1817 
+		if ($year == '') {
1818 
+			$year = date('Y');
1819 
+		}
1535 1820 
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1536 1821 
 		if (empty($all)) {
1537 1822 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1550,7 +1835,9 @@  discard block
 
 block discarded – undo
1550 1835 
 	}
1551 1836 
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1552 1837 
 		global $globalStatsFilters;
1553 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1838 
+		if ($filter_name == '') {
1839 
+			$filter_name = $this->filter_name;
1840 
+		}
1554 1841 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1555 1842 
 			$Spotter = new Spotter($this->db);
1556 1843 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1568,7 +1855,9 @@  discard block
 
 block discarded – undo
1568 1855 
 				}
1569 1856 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1570 1857 
 				$all = $result[0]['nb'];
1571 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1858 
+			} else {
1859 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1860 
+			}
1572 1861 
 		} else {
1573 1862 
 			if ($year == '' && $month == '') {
1574 1863 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1580,7 +1869,9 @@  discard block
 
 block discarded – undo
1580 1869 
 				}
1581 1870 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1582 1871 
 				$all = $result[0]['nb'];
1583 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1872 
+			} else {
1873 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1874 
+			}
1584 1875 
 		}
1585 1876 
 		if (empty($all)) {
1586 1877 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1599,7 +1890,9 @@  discard block
 
 block discarded – undo
1599 1890 
 	}
1600 1891 
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1601 1892 
 		global $globalStatsFilters;
1602 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1893 
+		if ($filter_name == '') {
1894 
+			$filter_name = $this->filter_name;
1895 
+		}
1603 1896 
 		if ($year == '' && $month == '') {
1604 1897 
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
1605 1898 
 			try {
 
@@ -1610,7 +1903,9 @@  discard block
 
 block discarded – undo
1610 1903 
 			}
1611 1904 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1612 1905 
 			$all = $result[0]['nb_airline'];
1613 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1906 
+		} else {
1907 
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1908 
+		}
1614 1909 
 		if (empty($all)) {
1615 1910 
 			$filters = array();
1616 1911 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1625,7 +1920,9 @@  discard block
 
 block discarded – undo
1625 1920 
 	}
1626 1921 
 	public function countOverallMarineTypes($filter_name = '',$year = '',$month = '') {
1627 1922 
 		global $globalStatsFilters;
1628 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1923 
+		if ($filter_name == '') {
1924 
+			$filter_name = $this->filter_name;
1925 
+		}
1629 1926 
 		$all = array();
1630 1927 
 		if ($year == '' && $month == '') {
1631 1928 
 			$query = "SELECT COUNT(*) AS nb_type FROM stats_marine_type WHERE filter_name = :filter_name";
 
@@ -1652,7 +1949,9 @@  discard block
 
 block discarded – undo
1652 1949 
 	}
1653 1950 
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1654 1951 
 		global $globalStatsFilters;
1655 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1952 
+		if ($filter_name == '') {
1953 
+			$filter_name = $this->filter_name;
1954 
+		}
1656 1955 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1657 1956 
 			$Spotter = new Spotter($this->db);
1658 1957 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1707,7 +2006,9 @@  discard block
 
 block discarded – undo
1707 2006 
 	}
1708 2007 
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1709 2008 
 		global $globalStatsFilters;
1710 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2009 
+		if ($filter_name == '') {
2010 
+			$filter_name = $this->filter_name;
2011 
+		}
1711 2012 
 		//if ($year == '') $year = date('Y');
1712 2013 
 		if ($year == '' && $month == '') {
1713 2014 
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1736,7 +2037,9 @@  discard block
 
 block discarded – undo
1736 2037 
 	}
1737 2038
1738 2039 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1739 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2040 
+		if ($filter_name == '') {
2041 
+			$filter_name = $this->filter_name;
2042 
+		}
1740 2043 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1741 2044 
 			$Spotter = new Spotter($this->db);
1742 2045 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1760,7 +2063,9 @@  discard block
 
 block discarded – undo
1760 2063 
 		return $all;
1761 2064 
 	}
1762 2065 
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
1763 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2066 
+		if ($filter_name == '') {
2067 
+			$filter_name = $this->filter_name;
2068 
+		}
1764 2069 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1765 2070 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1766 2071 
 		try {
 
@@ -1773,7 +2078,9 @@  discard block
 
 block discarded – undo
1773 2078 
 		return $all;
1774 2079 
 	}
1775 2080 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1776 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2081 
+		if ($filter_name == '') {
2082 
+			$filter_name = $this->filter_name;
2083 
+		}
1777 2084 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1778 2085 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1779 2086 
 		try {
 
@@ -1784,7 +2091,9 @@  discard block
 
 block discarded – undo
1784 2091 
 		}
1785 2092 
 	}
1786 2093 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1787 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2094 
+		if ($filter_name == '') {
2095 
+			$filter_name = $this->filter_name;
2096 
+		}
1788 2097 
 		global $globalArchiveMonths, $globalDBdriver;
1789 2098 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1790 2099 
 			$Spotter = new Spotter($this->db);
 
@@ -1840,7 +2149,9 @@  discard block
 
 block discarded – undo
1840 2149 
 	}
1841 2150 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1842 2151 
 		global $globalArchiveMonths, $globalDBdriver;
1843 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2152 
+		if ($filter_name == '') {
2153 
+			$filter_name = $this->filter_name;
2154 
+		}
1844 2155 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1845 2156 
 			$Spotter = new Spotter($this->db);
1846 2157 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1873,7 +2184,9 @@  discard block
 
 block discarded – undo
1873 2184 
 	}
1874 2185 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1875 2186 
 		global $globalArchiveMonths, $globalDBdriver;
1876 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2187 
+		if ($filter_name == '') {
2188 
+			$filter_name = $this->filter_name;
2189 
+		}
1877 2190 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1878 2191 
 			$Spotter = new Spotter($this->db);
1879 2192 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1904,7 +2217,9 @@  discard block
 
 block discarded – undo
1904 2217 
 	}
1905 2218 
 	public function getStatsAirlineTotal($filter_name = '') {
1906 2219 
 		global $globalArchiveMonths, $globalDBdriver;
1907 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2220 
+		if ($filter_name == '') {
2221 
+			$filter_name = $this->filter_name;
2222 
+		}
1908 2223 
 		if ($globalDBdriver == 'mysql') {
1909 2224 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1910 2225 
 		} else {
 
@@ -1921,7 +2236,9 @@  discard block
 
 block discarded – undo
1921 2236 
 	}
1922 2237 
 	public function getStatsOwnerTotal($filter_name = '') {
1923 2238 
 		global $globalArchiveMonths, $globalDBdriver;
1924 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2239 
+		if ($filter_name == '') {
2240 
+			$filter_name = $this->filter_name;
2241 
+		}
1925 2242 
 		if ($globalDBdriver == 'mysql') {
1926 2243 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1927 2244 
 		} else {
 
@@ -1938,7 +2255,9 @@  discard block
 
 block discarded – undo
1938 2255 
 	}
1939 2256 
 	public function getStatsOwner($owner_name,$filter_name = '') {
1940 2257 
 		global $globalArchiveMonths, $globalDBdriver;
1941 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2258 
+		if ($filter_name == '') {
2259 
+			$filter_name = $this->filter_name;
2260 
+		}
1942 2261 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1943 2262 
 		try {
1944 2263 
 			$sth = $this->db->prepare($query);
 
@@ -1947,12 +2266,17 @@  discard block
 
 block discarded – undo
1947 2266 
 			echo "error : ".$e->getMessage();
1948 2267 
 		}
1949 2268 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1950 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1951 
-		else return 0;
2269 
+		if (isset($all[0]['cnt'])) {
2270 
+			return $all[0]['cnt'];
2271 
+		} else {
2272 
+			return 0;
2273 
+		}
1952 2274 
 	}
1953 2275 
 	public function getStatsPilotTotal($filter_name = '') {
1954 2276 
 		global $globalArchiveMonths, $globalDBdriver;
1955 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2277 
+		if ($filter_name == '') {
2278 
+			$filter_name = $this->filter_name;
2279 
+		}
1956 2280 
 		if ($globalDBdriver == 'mysql') {
1957 2281 
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1958 2282 
 		} else {
 
@@ -1969,7 +2293,9 @@  discard block
 
 block discarded – undo
1969 2293 
 	}
1970 2294 
 	public function getStatsPilot($pilot,$filter_name = '') {
1971 2295 
 		global $globalArchiveMonths, $globalDBdriver;
1972 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2296 
+		if ($filter_name == '') {
2297 
+			$filter_name = $this->filter_name;
2298 
+		}
1973 2299 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1974 2300 
 		try {
1975 2301 
 			$sth = $this->db->prepare($query);
 
@@ -1978,13 +2304,18 @@  discard block
 
 block discarded – undo
1978 2304 
 			echo "error : ".$e->getMessage();
1979 2305 
 		}
1980 2306 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1981 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1982 
-		else return 0;
2307 
+		if (isset($all[0]['cnt'])) {
2308 
+			return $all[0]['cnt'];
2309 
+		} else {
2310 
+			return 0;
2311 
+		}
1983 2312 
 	}
1984 2313
1985 2314 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1986 2315 
 		global $globalDBdriver;
1987 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2316 
+		if ($filter_name == '') {
2317 
+			$filter_name = $this->filter_name;
2318 
+		}
1988 2319 
 		if ($globalDBdriver == 'mysql') {
1989 2320 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1990 2321 
 		} else {
 
@@ -2000,7 +2331,9 @@  discard block
 
 block discarded – undo
2000 2331 
 	}
2001 2332 
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
2002 2333 
 		global $globalDBdriver;
2003 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2334 
+		if ($filter_name == '') {
2335 
+			$filter_name = $this->filter_name;
2336 
+		}
2004 2337 
 		if ($globalDBdriver == 'mysql') {
2005 2338 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
2006 2339 
 		} else {
 
@@ -2519,27 +2852,37 @@  discard block
 
 block discarded – undo
2519 2852 
 		date_default_timezone_set('UTC');
2520 2853 
 		if ((isset($globalMarine) && $globalMarine) || (isset($globalMasterServer) && $globalMasterServer)) {
2521 2854 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_marine');
2522 
-			if ($globalDebug) echo '!!! Update Marine stats !!!'."\n";
2855 
+			if ($globalDebug) {
2856 
+				echo '!!! Update Marine stats !!!'."\n";
2857 
+			}
2523 2858 
 			if (isset($last_update[0]['value'])) {
2524 2859 
 				$last_update_day = $last_update[0]['value'];
2525 
-			} else $last_update_day = '2012-12-12 12:12:12';
2860 
+			} else {
2861 
+				$last_update_day = '2012-12-12 12:12:12';
2862 
+			}
2526 2863 
 			$reset = false;
2527 2864 
 			$Marine = new Marine($this->db);
2528 2865 
 			$filtername = 'marine';
2529 2866 
 			if ($Connection->tableExists('countries')) {
2530 
-				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2867 
+				if ($globalDebug) {
2868 
+					echo 'Count all vessels by countries...'."\n";
2869 
+				}
2531 2870 
 				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2532 2871 
 				foreach ($alldata as $number) {
2533 2872 
 					echo $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2534 2873 
 				}
2535 2874 
 			}
2536 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2875 
+			if ($globalDebug) {
2876 
+				echo 'Count all vessels by months...'."\n";
2877 
+			}
2537 2878 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2538 2879 
 			$filter_last_month = array('since_date' => $last_month);
2539 2880 
 			$alldata = $Marine->countAllMonths($filter_last_month);
2540 2881 
 			$lastyear = false;
2541 2882 
 			foreach ($alldata as $number) {
2542 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2883 
+				if ($number['year_name'] != date('Y')) {
2884 
+					$lastyear = true;
2885 
+				}
2543 2886 
 				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2544 2887 
 			}
2545 2888 
 			echo 'Marine data...'."\n";
 
@@ -2569,7 +2912,9 @@  discard block
 
 block discarded – undo
2569 2912 
 			foreach ($alldata as $number) {
2570 2913 
 				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
2571 2914 
 			}
2572 
-			if ($globalDebug) echo 'Count all types...'."\n";
2915 
+			if ($globalDebug) {
2916 
+				echo 'Count all types...'."\n";
2917 
+			}
2573 2918 
 			$alldata = $Marine->countAllMarineTypes(false,0,$last_update_day);
2574 2919 
 			foreach ($alldata as $number) {
2575 2920 
 				$this->addStatMarineType($number['marine_type'],$number['marine_type_id'],$number['marine_type_count'],'',$reset);
 
@@ -2581,26 +2926,36 @@  discard block
 
 block discarded – undo
2581 2926 
 		}
2582 2927 
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
2583 2928 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
2584 
-			if ($globalDebug) echo '!!! Update tracker stats !!!'."\n";
2929 
+			if ($globalDebug) {
2930 
+				echo '!!! Update tracker stats !!!'."\n";
2931 
+			}
2585 2932 
 			if (isset($last_update[0]['value'])) {
2586 2933 
 				$last_update_day = $last_update[0]['value'];
2587 
-			} else $last_update_day = '2012-12-12 12:12:12';
2934 
+			} else {
2935 
+				$last_update_day = '2012-12-12 12:12:12';
2936 
+			}
2588 2937 
 			$reset = false;
2589 2938 
 			$Tracker = new Tracker($this->db);
2590 2939 
 			if ($Connection->tableExists('countries')) {
2591 
-				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2940 
+				if ($globalDebug) {
2941 
+					echo 'Count all trackers by countries...'."\n";
2942 
+				}
2592 2943 
 				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2593 2944 
 				foreach ($alldata as $number) {
2594 2945 
 					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2595 2946 
 				}
2596 2947 
 			}
2597 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2948 
+			if ($globalDebug) {
2949 
+				echo 'Count all vessels by months...'."\n";
2950 
+			}
2598 2951 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2599 2952 
 			$filter_last_month = array('since_date' => $last_month);
2600 2953 
 			$alldata = $Tracker->countAllMonths($filter_last_month);
2601 2954 
 			$lastyear = false;
2602 2955 
 			foreach ($alldata as $number) {
2603 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2956 
+				if ($number['year_name'] != date('Y')) {
2957 
+					$lastyear = true;
2958 
+				}
2604 2959 
 				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2605 2960 
 			}
2606 2961 
 			echo 'Tracker data...'."\n";
 
@@ -2630,7 +2985,9 @@  discard block
 
 block discarded – undo
2630 2985 
 			foreach ($alldata as $number) {
2631 2986 
 				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
2632 2987 
 			}
2633 
-			if ($globalDebug) echo 'Count all types...'."\n";
2988 
+			if ($globalDebug) {
2989 
+				echo 'Count all types...'."\n";
2990 
+			}
2634 2991 
 			$alldata = $Tracker->countAllTrackerTypes(false,0,$last_update_day);
2635 2992 
 			foreach ($alldata as $number) {
2636 2993 
 				$this->addStatTrackerType($number['tracker_type'],$number['tracker_type_count'],'',$reset);
 
@@ -2642,10 +2999,14 @@  discard block
 
 block discarded – undo
2642 2999
2643 3000 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
2644 3001 
 			$last_update = $this->getLastStatsUpdate('last_update_stats');
2645 
-			if ($globalDebug) echo '!!! Update aicraft stats !!!'."\n";
3002 
+			if ($globalDebug) {
3003 
+				echo '!!! Update aicraft stats !!!'."\n";
3004 
+			}
2646 3005 
 			if (isset($last_update[0]['value'])) {
2647 3006 
 				$last_update_day = $last_update[0]['value'];
2648 
-			} else $last_update_day = '2012-12-12 12:12:12';
3007 
+			} else {
3008 
+				$last_update_day = '2012-12-12 12:12:12';
3009 
+			}
2649 3010 
 			$reset = false;
2650 3011 
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
2651 3012 
 			if ($globalStatsResetYear) {
 
@@ -2654,43 +3015,63 @@  discard block
 
 block discarded – undo
2654 3015 
 			}
2655 3016 
 			$Spotter = new Spotter($this->db);
2656 3017
2657 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
3018 
+			if ($globalDebug) {
3019 
+				echo 'Count all aircraft types...'."\n";
3020 
+			}
2658 3021 
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2659 3022 
 			foreach ($alldata as $number) {
2660 3023 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2661 3024 
 			}
2662 
-			if ($globalDebug) echo 'Count all airlines...'."\n";
3025 
+			if ($globalDebug) {
3026 
+				echo 'Count all airlines...'."\n";
3027 
+			}
2663 3028 
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2664 3029 
 			foreach ($alldata as $number) {
2665 3030 
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2666 3031 
 			}
2667 
-			if ($globalDebug) echo 'Count all registrations...'."\n";
3032 
+			if ($globalDebug) {
3033 
+				echo 'Count all registrations...'."\n";
3034 
+			}
2668 3035 
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2669 3036 
 			foreach ($alldata as $number) {
2670 3037 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2671 3038 
 			}
2672 
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
3039 
+			if ($globalDebug) {
3040 
+				echo 'Count all callsigns...'."\n";
3041 
+			}
2673 3042 
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2674 3043 
 			foreach ($alldata as $number) {
2675 3044 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2676 3045 
 			}
2677 
-			if ($globalDebug) echo 'Count all owners...'."\n";
3046 
+			if ($globalDebug) {
3047 
+				echo 'Count all owners...'."\n";
3048 
+			}
2678 3049 
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2679 3050 
 			foreach ($alldata as $number) {
2680 3051 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2681 3052 
 			}
2682 
-			if ($globalDebug) echo 'Count all pilots...'."\n";
3053 
+			if ($globalDebug) {
3054 
+				echo 'Count all pilots...'."\n";
3055 
+			}
2683 3056 
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2684 3057 
 			foreach ($alldata as $number) {
2685 
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
3058 
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
3059 
+					$number['pilot_id'] = $number['pilot_name'];
3060 
+				}
2686 3061 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2687 3062 
 			}
2688 3063
2689 
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
3064 
+			if ($globalDebug) {
3065 
+				echo 'Count all departure airports...'."\n";
3066 
+			}
2690 3067 
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2691 
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
3068 
+			if ($globalDebug) {
3069 
+				echo 'Count all detected departure airports...'."\n";
3070 
+			}
2692 3071 
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2693 
-			if ($globalDebug) echo 'Order departure airports...'."\n";
3072 
+			if ($globalDebug) {
3073 
+				echo 'Order departure airports...'."\n";
3074 
+			}
2694 3075 
 			$alldata = array();
2695 3076 
 			foreach ($pall as $value) {
2696 3077 
 				$icao = $value['airport_departure_icao'];
 
@@ -2700,7 +3081,9 @@  discard block
 
 block discarded – undo
2700 3081 
 				$icao = $value['airport_departure_icao'];
2701 3082 
 				if (isset($alldata[$icao])) {
2702 3083 
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2703 
-				} else $alldata[$icao] = $value;
3084 
+				} else {
3085 
+					$alldata[$icao] = $value;
3086 
+				}
2704 3087 
 			}
2705 3088 
 			$count = array();
2706 3089 
 			foreach ($alldata as $key => $row) {
 
@@ -2710,11 +3093,17 @@  discard block
 
 block discarded – undo
2710 3093 
 			foreach ($alldata as $number) {
2711 3094 
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
2712 3095 
 			}
2713 
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
3096 
+			if ($globalDebug) {
3097 
+				echo 'Count all arrival airports...'."\n";
3098 
+			}
2714 3099 
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2715 
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
3100 
+			if ($globalDebug) {
3101 
+				echo 'Count all detected arrival airports...'."\n";
3102 
+			}
2716 3103 
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2717 
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
3104 
+			if ($globalDebug) {
3105 
+				echo 'Order arrival airports...'."\n";
3106 
+			}
2718 3107 
 			$alldata = array();
2719 3108 
 			foreach ($pall as $value) {
2720 3109 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2724,7 +3113,9 @@  discard block
 
 block discarded – undo
2724 3113 
 				$icao = $value['airport_arrival_icao'];
2725 3114 
 				if (isset($alldata[$icao])) {
2726 3115 
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2727 
-				} else $alldata[$icao] = $value;
3116 
+				} else {
3117 
+					$alldata[$icao] = $value;
3118 
+				}
2728 3119 
 			}
2729 3120 
 			$count = array();
2730 3121 
 			foreach ($alldata as $key => $row) {
 
@@ -2735,7 +3126,9 @@  discard block
 
 block discarded – undo
2735 3126 
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
2736 3127 
 			}
2737 3128 
 			if ($Connection->tableExists('countries')) {
2738 
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
3129 
+				if ($globalDebug) {
3130 
+					echo 'Count all flights by countries...'."\n";
3131 
+				}
2739 3132 
 				//$SpotterArchive = new SpotterArchive();
2740 3133 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2741 3134 
 				$Spotter = new Spotter($this->db);
 
@@ -2746,7 +3139,9 @@  discard block
 
 block discarded – undo
2746 3139 
 			}
2747 3140
2748 3141 
 			if (isset($globalAccidents) && $globalAccidents) {
2749 
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
3142 
+				if ($globalDebug) {
3143 
+					echo 'Count fatalities stats...'."\n";
3144 
+				}
2750 3145 
 				$Accident = new Accident($this->db);
2751 3146 
 				$this->deleteStatsByType('fatalities_byyear');
2752 3147 
 				$alldata = $Accident->countFatalitiesByYear();
 
@@ -2762,48 +3157,68 @@  discard block
 
 block discarded – undo
2762 3157
2763 3158 
 			// Add by month using getstat if month finish...
2764 3159 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
2765 
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
3160 
+			if ($globalDebug) {
3161 
+				echo 'Count all flights by months...'."\n";
3162 
+			}
2766 3163 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2767 3164 
 			$filter_last_month = array('since_date' => $last_month);
2768 3165 
 			$Spotter = new Spotter($this->db);
2769 3166 
 			$alldata = $Spotter->countAllMonths($filter_last_month);
2770 3167 
 			$lastyear = false;
2771 3168 
 			foreach ($alldata as $number) {
2772 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
3169 
+				if ($number['year_name'] != date('Y')) {
3170 
+					$lastyear = true;
3171 
+				}
2773 3172 
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2774 3173 
 			}
2775 
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
3174 
+			if ($globalDebug) {
3175 
+				echo 'Count all military flights by months...'."\n";
3176 
+			}
2776 3177 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2777 3178 
 			foreach ($alldata as $number) {
2778 3179 
 				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2779 3180 
 			}
2780 
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
3181 
+			if ($globalDebug) {
3182 
+				echo 'Count all owners by months...'."\n";
3183 
+			}
2781 3184 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2782 3185 
 			foreach ($alldata as $number) {
2783 3186 
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2784 3187 
 			}
2785 
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
3188 
+			if ($globalDebug) {
3189 
+				echo 'Count all pilots by months...'."\n";
3190 
+			}
2786 3191 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2787 3192 
 			foreach ($alldata as $number) {
2788 3193 
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2789 3194 
 			}
2790 
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
3195 
+			if ($globalDebug) {
3196 
+				echo 'Count all airlines by months...'."\n";
3197 
+			}
2791 3198 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2792 3199 
 			foreach ($alldata as $number) {
2793 3200 
 				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2794 3201 
 			}
2795 
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3202 
+			if ($globalDebug) {
3203 
+				echo 'Count all aircrafts by months...'."\n";
3204 
+			}
2796 3205 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2797 3206 
 			foreach ($alldata as $number) {
2798 3207 
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2799 3208 
 			}
2800 
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3209 
+			if ($globalDebug) {
3210 
+				echo 'Count all real arrivals by months...'."\n";
3211 
+			}
2801 3212 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2802 3213 
 			foreach ($alldata as $number) {
2803 3214 
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2804 3215 
 			}
2805 
-			if ($globalDebug) echo 'Airports data...'."\n";
2806 
-			if ($globalDebug) echo '...Departure'."\n";
3216 
+			if ($globalDebug) {
3217 
+				echo 'Airports data...'."\n";
3218 
+			}
3219 
+			if ($globalDebug) {
3220 
+				echo '...Departure'."\n";
3221 
+			}
2807 3222 
 			$this->deleteStatAirport('daily');
2808 3223 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
2809 3224 
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 
@@ -2921,7 +3336,9 @@  discard block
 
 block discarded – undo
2921 3336 
 			// Count by airlines
2922 3337 
 			echo '--- Stats by airlines ---'."\n";
2923 3338 
 			if ($Connection->tableExists('countries')) {
2924 
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
3339 
+				if ($globalDebug) {
3340 
+					echo 'Count all flights by countries by airlines...'."\n";
3341 
+				}
2925 3342 
 				$SpotterArchive = new SpotterArchive($this->db);
2926 3343 
 				//$Spotter = new Spotter($this->db);
2927 3344 
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 
@@ -2930,37 +3347,53 @@  discard block
 
 block discarded – undo
2930 3347 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2931 3348 
 				}
2932 3349 
 			}
2933 
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
3350 
+			if ($globalDebug) {
3351 
+				echo 'Count all aircraft types by airlines...'."\n";
3352 
+			}
2934 3353 
 			$Spotter = new Spotter($this->db);
2935 3354 
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2936 3355 
 			foreach ($alldata as $number) {
2937 3356 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2938 3357 
 			}
2939 
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
3358 
+			if ($globalDebug) {
3359 
+				echo 'Count all aircraft registrations by airlines...'."\n";
3360 
+			}
2940 3361 
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2941 3362 
 			foreach ($alldata as $number) {
2942 3363 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2943 3364 
 			}
2944 
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
3365 
+			if ($globalDebug) {
3366 
+				echo 'Count all callsigns by airlines...'."\n";
3367 
+			}
2945 3368 
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2946 3369 
 			foreach ($alldata as $number) {
2947 3370 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2948 3371 
 			}
2949 
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
3372 
+			if ($globalDebug) {
3373 
+				echo 'Count all owners by airlines...'."\n";
3374 
+			}
2950 3375 
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2951 3376 
 			foreach ($alldata as $number) {
2952 3377 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2953 3378 
 			}
2954 
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
3379 
+			if ($globalDebug) {
3380 
+				echo 'Count all pilots by airlines...'."\n";
3381 
+			}
2955 3382 
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2956 3383 
 			foreach ($alldata as $number) {
2957 3384 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2958 3385 
 			}
2959 
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
3386 
+			if ($globalDebug) {
3387 
+				echo 'Count all departure airports by airlines...'."\n";
3388 
+			}
2960 3389 
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2961 
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
3390 
+			if ($globalDebug) {
3391 
+				echo 'Count all detected departure airports by airlines...'."\n";
3392 
+			}
2962 3393 
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2963 
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
3394 
+			if ($globalDebug) {
3395 
+				echo 'Order detected departure airports by airlines...'."\n";
3396 
+			}
2964 3397 
 			//$alldata = array();
2965 3398 
 			foreach ($dall as $value) {
2966 3399 
 				$icao = $value['airport_departure_icao'];
 
@@ -2981,11 +3414,17 @@  discard block
 
 block discarded – undo
2981 3414 
 			foreach ($alldata as $number) {
2982 3415 
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
2983 3416 
 			}
2984 
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
3417 
+			if ($globalDebug) {
3418 
+				echo 'Count all arrival airports by airlines...'."\n";
3419 
+			}
2985 3420 
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2986 
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
3421 
+			if ($globalDebug) {
3422 
+				echo 'Count all detected arrival airports by airlines...'."\n";
3423 
+			}
2987 3424 
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2988 
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
3425 
+			if ($globalDebug) {
3426 
+				echo 'Order arrival airports by airlines...'."\n";
3427 
+			}
2989 3428 
 			//$alldata = array();
2990 3429 
 			foreach ($dall as $value) {
2991 3430 
 				$icao = $value['airport_arrival_icao'];
 
@@ -3004,37 +3443,53 @@  discard block
 
 block discarded – undo
3004 3443 
 			}
3005 3444 
 			$alldata = $pall;
3006 3445 
 			foreach ($alldata as $number) {
3007 
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
3446 
+				if ($number['airline_icao'] != '') {
3447 
+					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
3448 
+				}
3449 
+			}
3450 
+			if ($globalDebug) {
3451 
+				echo 'Count all flights by months by airlines...'."\n";
3008 3452 
 			}
3009 
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
3010 3453 
 			$Spotter = new Spotter($this->db);
3011 3454 
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
3012 3455 
 			$lastyear = false;
3013 3456 
 			foreach ($alldata as $number) {
3014 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
3457 
+				if ($number['year_name'] != date('Y')) {
3458 
+					$lastyear = true;
3459 
+				}
3015 3460 
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3016 3461 
 			}
3017 
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
3462 
+			if ($globalDebug) {
3463 
+				echo 'Count all owners by months by airlines...'."\n";
3464 
+			}
3018 3465 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
3019 3466 
 			foreach ($alldata as $number) {
3020 3467 
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3021 3468 
 			}
3022 
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
3469 
+			if ($globalDebug) {
3470 
+				echo 'Count all pilots by months by airlines...'."\n";
3471 
+			}
3023 3472 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
3024 3473 
 			foreach ($alldata as $number) {
3025 3474 
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3026 3475 
 			}
3027 
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
3476 
+			if ($globalDebug) {
3477 
+				echo 'Count all aircrafts by months by airlines...'."\n";
3478 
+			}
3028 3479 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
3029 3480 
 			foreach ($alldata as $number) {
3030 3481 
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3031 3482 
 			}
3032 
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
3483 
+			if ($globalDebug) {
3484 
+				echo 'Count all real arrivals by months by airlines...'."\n";
3485 
+			}
3033 3486 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
3034 3487 
 			foreach ($alldata as $number) {
3035 3488 
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
3036 3489 
 			}
3037 
-			if ($globalDebug) echo '...Departure'."\n";
3490 
+			if ($globalDebug) {
3491 
+				echo '...Departure'."\n";
3492 
+			}
3038 3493 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
3039 3494 
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
3040 3495 
 			foreach ($dall as $value) {
 
@@ -3057,7 +3512,9 @@  discard block
 
 block discarded – undo
3057 3512 
 			foreach ($alldata as $number) {
3058 3513 
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
3059 3514 
 			}
3060 
-			if ($globalDebug) echo '...Arrival'."\n";
3515 
+			if ($globalDebug) {
3516 
+				echo '...Arrival'."\n";
3517 
+			}
3061 3518 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
3062 3519 
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
3063 3520 
 			foreach ($dall as $value) {
 
@@ -3081,13 +3538,19 @@  discard block
 
 block discarded – undo
3081 3538 
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
3082 3539 
 			}
3083 3540
3084 
-			if ($globalDebug) echo 'Flights data...'."\n";
3085 
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
3541 
+			if ($globalDebug) {
3542 
+				echo 'Flights data...'."\n";
3543 
+			}
3544 
+			if ($globalDebug) {
3545 
+				echo '-> countAllDatesLastMonth...'."\n";
3546 
+			}
3086 3547 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
3087 3548 
 			foreach ($alldata as $number) {
3088 3549 
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
3089 3550 
 			}
3090 
-			if ($globalDebug) echo '-> countAllDates...'."\n";
3551 
+			if ($globalDebug) {
3552 
+				echo '-> countAllDates...'."\n";
3553 
+			}
3091 3554 
 			//$previousdata = $this->countAllDatesByAirlines();
3092 3555 
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
3093 3556 
 			$values = array();
 
@@ -3100,14 +3563,18 @@  discard block
 
 block discarded – undo
3100 3563 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
3101 3564 
 			}
3102 3565
3103 
-			if ($globalDebug) echo '-> countAllHours...'."\n";
3566 
+			if ($globalDebug) {
3567 
+				echo '-> countAllHours...'."\n";
3568 
+			}
3104 3569 
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
3105 3570 
 			foreach ($alldata as $number) {
3106 3571 
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
3107 3572 
 			}
3108 3573
3109 3574 
 			// Stats by filters
3110 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
3575 
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
3576 
+				$globalStatsFilters = array();
3577 
+			}
3111 3578 
 			foreach ($globalStatsFilters as $name => $filter) {
3112 3579 
 				if (!empty($filter)) {
3113 3580 
 					//$filter_name = $filter['name'];
 
@@ -3115,7 +3582,9 @@  discard block
 
 block discarded – undo
3115 3582 
 					$reset = false;
3116 3583 
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
3117 3584 
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
3118 
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3585 
+						if ($globalDebug) {
3586 
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3587 
+						}
3119 3588 
 						$this->deleteOldStats($filter_name);
3120 3589 
 						unset($last_update);
3121 3590 
 					}
 
@@ -3132,39 +3601,55 @@  discard block
 
 block discarded – undo
3132 3601 
 						$reset = true;
3133 3602 
 					}
3134 3603 
 					// Count by filter
3135 
-					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
3604 
+					if ($globalDebug) {
3605 
+						echo '--- Stats for filter '.$filter_name.' ---'."\n";
3606 
+					}
3136 3607 
 					$Spotter = new Spotter($this->db);
3137 
-					if ($globalDebug) echo 'Count all aircraft types...'."\n";
3608 
+					if ($globalDebug) {
3609 
+						echo 'Count all aircraft types...'."\n";
3610 
+					}
3138 3611 
 					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
3139 3612 
 					foreach ($alldata as $number) {
3140 3613 
 						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
3141 3614 
 					}
3142 
-					if ($globalDebug) echo 'Count all airlines...'."\n";
3615 
+					if ($globalDebug) {
3616 
+						echo 'Count all airlines...'."\n";
3617 
+					}
3143 3618 
 					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
3144 3619 
 					foreach ($alldata as $number) {
3145 3620 
 						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
3146 3621 
 					}
3147 
-					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
3622 
+					if ($globalDebug) {
3623 
+						echo 'Count all aircraft registrations...'."\n";
3624 
+					}
3148 3625 
 					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
3149 3626 
 					foreach ($alldata as $number) {
3150 3627 
 						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
3151 3628 
 					}
3152 
-					if ($globalDebug) echo 'Count all callsigns...'."\n";
3629 
+					if ($globalDebug) {
3630 
+						echo 'Count all callsigns...'."\n";
3631 
+					}
3153 3632 
 					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
3154 3633 
 					foreach ($alldata as $number) {
3155 3634 
 						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
3156 3635 
 					}
3157 
-					if ($globalDebug) echo 'Count all owners...'."\n";
3636 
+					if ($globalDebug) {
3637 
+						echo 'Count all owners...'."\n";
3638 
+					}
3158 3639 
 					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
3159 3640 
 					foreach ($alldata as $number) {
3160 3641 
 						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
3161 3642 
 					}
3162 
-					if ($globalDebug) echo 'Count all pilots...'."\n";
3643 
+					if ($globalDebug) {
3644 
+						echo 'Count all pilots...'."\n";
3645 
+					}
3163 3646 
 					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
3164 3647 
 					foreach ($alldata as $number) {
3165 3648 
 						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
3166 3649 
 					}
3167 
-					if ($globalDebug) echo 'Count departure airports...'."\n";
3650 
+					if ($globalDebug) {
3651 
+						echo 'Count departure airports...'."\n";
3652 
+					}
3168 3653 
 					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
3169 3654 
 					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
3170 3655 
 					$alldata = array();
 
@@ -3176,7 +3661,9 @@  discard block
 
 block discarded – undo
3176 3661 
 						$icao = $value['airport_departure_icao'];
3177 3662 
 						if (isset($alldata[$icao])) {
3178 3663 
 							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
3179 
-						} else $alldata[$icao] = $value;
3664 
+						} else {
3665 
+							$alldata[$icao] = $value;
3666 
+						}
3180 3667 
 					}
3181 3668 
 					$count = array();
3182 3669 
 					foreach ($alldata as $key => $row) {
 
@@ -3186,7 +3673,9 @@  discard block
 
 block discarded – undo
3186 3673 
 					foreach ($alldata as $number) {
3187 3674 
 						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
3188 3675 
 					}
3189 
-					if ($globalDebug) echo 'Count all arrival airports...'."\n";
3676 
+					if ($globalDebug) {
3677 
+						echo 'Count all arrival airports...'."\n";
3678 
+					}
3190 3679 
 					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
3191 3680 
 					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
3192 3681 
 					$alldata = array();
 
@@ -3198,7 +3687,9 @@  discard block
 
 block discarded – undo
3198 3687 
 						$icao = $value['airport_arrival_icao'];
3199 3688 
 						if (isset($alldata[$icao])) {
3200 3689 
 							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
3201 
-						} else $alldata[$icao] = $value;
3690 
+						} else {
3691 
+							$alldata[$icao] = $value;
3692 
+						}
3202 3693 
 					}
3203 3694 
 					$count = array();
3204 3695 
 					foreach ($alldata as $key => $row) {
 
@@ -3208,35 +3699,49 @@  discard block
 
 block discarded – undo
3208 3699 
 					foreach ($alldata as $number) {
3209 3700 
 						echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
3210 3701 
 					}
3211 
-					if ($globalDebug) echo 'Count all months...'."\n";
3702 
+					if ($globalDebug) {
3703 
+						echo 'Count all months...'."\n";
3704 
+					}
3212 3705 
 					$Spotter = new Spotter($this->db);
3213 3706 
 					$alldata = $Spotter->countAllMonths($filter);
3214 3707 
 					$lastyear = false;
3215 3708 
 					foreach ($alldata as $number) {
3216 
-						if ($number['year_name'] != date('Y')) $lastyear = true;
3709 
+						if ($number['year_name'] != date('Y')) {
3710 
+							$lastyear = true;
3711 
+						}
3217 3712 
 						$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3218 3713 
 					}
3219 
-					if ($globalDebug) echo 'Count all owners by months...'."\n";
3714 
+					if ($globalDebug) {
3715 
+						echo 'Count all owners by months...'."\n";
3716 
+					}
3220 3717 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
3221 3718 
 					foreach ($alldata as $number) {
3222 3719 
 						$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3223 3720 
 					}
3224 
-					if ($globalDebug) echo 'Count all pilots by months...'."\n";
3721 
+					if ($globalDebug) {
3722 
+						echo 'Count all pilots by months...'."\n";
3723 
+					}
3225 3724 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
3226 3725 
 					foreach ($alldata as $number) {
3227 3726 
 						$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3228 3727 
 					}
3229 
-					if ($globalDebug) echo 'Count all military by months...'."\n";
3728 
+					if ($globalDebug) {
3729 
+						echo 'Count all military by months...'."\n";
3730 
+					}
3230 3731 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
3231 3732 
 					foreach ($alldata as $number) {
3232 3733 
 						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3233 3734 
 					}
3234 
-					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3735 
+					if ($globalDebug) {
3736 
+						echo 'Count all aircrafts by months...'."\n";
3737 
+					}
3235 3738 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
3236 3739 
 				    	foreach ($alldata as $number) {
3237 3740 
 			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
3238 3741 
 					}
3239 
-					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3742 
+					if ($globalDebug) {
3743 
+						echo 'Count all real arrivals by months...'."\n";
3744 
+					}
3240 3745 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
3241 3746 
 					foreach ($alldata as $number) {
3242 3747 
 						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
Please login to merge, or discard this patch.
require/class.Source.php 3 patches
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 		try {
17 17 
 			$sth = $this->db->prepare($query);
18 18 
 			$sth->execute($query_values);
19 
-		} catch(PDOException $e) {
19 
+		} catch (PDOException $e) {
20 20 
 			return "error : ".$e->getMessage();
21 21 
 		}
22 22 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -29,20 +29,20 @@  discard block
 
 block discarded – undo
29 29 
 		try {
30 30 
 			$sth = $this->db->prepare($query);
31 31 
 			$sth->execute($query_values);
32 
-		} catch(PDOException $e) {
32 
+		} catch (PDOException $e) {
33 33 
 			return "error : ".$e->getMessage();
34 34 
 		}
35 35 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
36 36 
 		return $all;
37 37 
 	}
38 38
39 
-	public function getLocationInfobyNameType($name,$type) {
39 
+	public function getLocationInfobyNameType($name, $type) {
40 40 
 		$query = "SELECT * FROM source_location WHERE name = :name AND type = :type";
41 
-		$query_values = array(':name' => $name,':type' => $type);
41 
+		$query_values = array(':name' => $name, ':type' => $type);
42 42 
 		try {
43 43 
 			$sth = $this->db->prepare($query);
44 44 
 			$sth->execute($query_values);
45 
-		} catch(PDOException $e) {
45 
+		} catch (PDOException $e) {
46 46 
 			return "error : ".$e->getMessage();
47 47 
 		}
48 48 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
 		try {
56 56 
 			$sth = $this->db->prepare($query);
57 57 
 			$sth->execute($query_values);
58 
-		} catch(PDOException $e) {
58 
+		} catch (PDOException $e) {
59 59 
 			return "error : ".$e->getMessage();
60 60 
 		}
61 61 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -65,10 +65,10 @@  discard block
 
 block discarded – undo
65 65 
 	public function getLocationInfoByType($type, $coord = array(), $limit = false) {
66 66 
 		$query = "SELECT * FROM source_location WHERE type = :type";
67 67 
 		if (is_array($coord) && !empty($coord)) {
68 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
69 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
70 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
71 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
68 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
69 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
70 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
71 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
72 72 
 			$query .= " AND source_location.latitude BETWEEN ".$minlat." AND ".$maxlat." AND source_location.longitude BETWEEN ".$minlong." AND ".$maxlong." AND source_location.latitude <> 0 AND source_location.longitude <> 0";
73 73 
 		}
74 74 
 		$query .= " ORDER BY last_seen DESC";
 
@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77 
 		try {
78 78 
 			$sth = $this->db->prepare($query);
79 79 
 			$sth->execute($query_values);
80 
-		} catch(PDOException $e) {
80 
+		} catch (PDOException $e) {
81 81 
 			return "error : ".$e->getMessage();
82 82 
 		}
83 83 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -90,7 +90,7 @@  discard block
 
 block discarded – undo
90 90 
 		try {
91 91 
 			$sth = $this->db->prepare($query);
92 92 
 			$sth->execute($query_values);
93 
-		} catch(PDOException $e) {
93 
+		} catch (PDOException $e) {
94 94 
 			return "error : ".$e->getMessage();
95 95 
 		}
96 96 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -103,56 +103,56 @@  discard block
 
 block discarded – undo
103 103 
 		try {
104 104 
 			$sth = $this->db->prepare($query);
105 105 
 			$sth->execute($query_values);
106 
-		} catch(PDOException $e) {
106 
+		} catch (PDOException $e) {
107 107 
 			return "error : ".$e->getMessage();
108 108 
 		}
109 109 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
110 110 
 		return $all;
111 111 
 	}
112 112
113 
-	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
113 
+	public function addLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') {
114 114 
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
115 115 
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
116 
-		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
116 
+		$query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description);
117 117 
 		try {
118 118 
 			$sth = $this->db->prepare($query);
119 119 
 			$sth->execute($query_values);
120 
-		} catch(PDOException $e) {
120 
+		} catch (PDOException $e) {
121 121 
 			echo "error : ".$e->getMessage();
122 122 
 		}
123 123 
 	}
124 124
125 
-	public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') {
125 
+	public function updateLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') {
126 126 
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
127 127 
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source";
128 
-		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
128 
+		$query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description);
129 129 
 		try {
130 130 
 			$sth = $this->db->prepare($query);
131 131 
 			$sth->execute($query_values);
132 
-		} catch(PDOException $e) {
132 
+		} catch (PDOException $e) {
133 133 
 			return "error : ".$e->getMessage();
134 134 
 		}
135 135 
 	}
136 136
137 
-	public function updateLocationDescByName($name,$source,$source_id = 0,$description = '') {
137 
+	public function updateLocationDescByName($name, $source, $source_id = 0, $description = '') {
138 138 
 		$query = "UPDATE source_location SET description = :description WHERE source_id = :source_id AND name = :name AND source = :source";
139 
-		$query_values = array(':name' => $name,':source' => $source,':source_id' => $source_id,':description' => $description);
139 
+		$query_values = array(':name' => $name, ':source' => $source, ':source_id' => $source_id, ':description' => $description);
140 140 
 		try {
141 141 
 			$sth = $this->db->prepare($query);
142 142 
 			$sth->execute($query_values);
143 
-		} catch(PDOException $e) {
143 
+		} catch (PDOException $e) {
144 144 
 			return "error : ".$e->getMessage();
145 145 
 		}
146 146 
 	}
147 147
148 
-	public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') {
148 
+	public function updateLocationByLocationID($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id, $last_seen = '', $description = '') {
149 149 
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
150 150 
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id";
151 
-		$query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
151 
+		$query_values = array(':source_id' => $source_id, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description);
152 152 
 		try {
153 153 
 			$sth = $this->db->prepare($query);
154 154 
 			$sth->execute($query_values);
155 
-		} catch(PDOException $e) {
155 
+		} catch (PDOException $e) {
156 156 
 			echo "error : ".$e->getMessage();
157 157 
 		}
158 158 
 	}
 
@@ -163,7 +163,7 @@  discard block
 
 block discarded – undo
163 163 
 		try {
164 164 
 			$sth = $this->db->prepare($query);
165 165 
 			$sth->execute($query_values);
166 
-		} catch(PDOException $e) {
166 
+		} catch (PDOException $e) {
167 167 
 			return "error : ".$e->getMessage();
168 168 
 		}
169 169 
 	}
 
@@ -174,7 +174,7 @@  discard block
 
 block discarded – undo
174 174 
 		try {
175 175 
 			$sth = $this->db->prepare($query);
176 176 
 			$sth->execute($query_values);
177 
-		} catch(PDOException $e) {
177 
+		} catch (PDOException $e) {
178 178 
 			return "error : ".$e->getMessage();
179 179 
 		}
180 180 
 	}
 
@@ -185,7 +185,7 @@  discard block
 
 block discarded – undo
185 185 
 		try {
186 186 
 			$sth = $this->db->prepare($query);
187 187 
 			$sth->execute($query_values);
188 
-		} catch(PDOException $e) {
188 
+		} catch (PDOException $e) {
189 189 
 			return "error : ".$e->getMessage();
190 190 
 		}
191 191 
 	}
 
@@ -195,7 +195,7 @@  discard block
 
 block discarded – undo
195 195 
 		try {
196 196 
 			$sth = $this->db->prepare($query);
197 197 
 			$sth->execute();
198 
-		} catch(PDOException $e) {
198 
+		} catch (PDOException $e) {
199 199 
 			return "error : ".$e->getMessage();
200 200 
 		}
201 201 
 	}
 
@@ -224,7 +224,7 @@  discard block
 
 block discarded – undo
224 224 
 		try {
225 225 
 			$sth = $this->db->prepare($query);
226 226 
 			$sth->execute(array(':type' => $type));
227 
-		} catch(PDOException $e) {
227 
+		} catch (PDOException $e) {
228 228 
 			return "error";
229 229 
 		}
230 230 
 		return "success";
Please login to merge, or discard this patch.
Doc Comments   +9 added lines patch added patch discarded remove patch 
@@ -110,6 +110,12 @@  discard block
 
 block discarded – undo
110 110 
 		return $all;
111 111 
 	}
112 112
113 
+	/**
114 
+	 * @param string $name
115 
+	 * @param string $city
116 
+	 * @param string $country
117 
+	 * @param string $source
118 
+	 */
113 119 
 	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
114 120 
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
115 121 
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
 
@@ -168,6 +174,9 @@  discard block
 
 block discarded – undo
168 174 
 		}
169 175 
 	}
170 176
177 
+	/**
178 
+	 * @param string $type
179 
+	 */
171 180 
 	public function deleteLocationByType($type) {
172 181 
 		$query = "DELETE FROM source_location WHERE type = :type";
173 182 
 		$query_values = array(':type' => $type);
Please login to merge, or discard this patch.
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -7,7 +7,9 @@  discard block
 
 block discarded – undo
7 7 
 	public function __construct($dbc = null) {
8 8 
 		$Connection = new Connection($dbc);
9 9 
 		$this->db = $Connection->db;
10 
-		if ($this->db === null) die('Error: No DB connection. (Source)');
10 
+		if ($this->db === null) {
11 
+			die('Error: No DB connection. (Source)');
12 
+		}
11 13 
 	}
12 14
13 15 
 	public function getAllLocationInfo() {
 
@@ -72,7 +74,9 @@  discard block
 
 block discarded – undo
72 74 
 			$query .= " AND source_location.latitude BETWEEN ".$minlat." AND ".$maxlat." AND source_location.longitude BETWEEN ".$minlong." AND ".$maxlong." AND source_location.latitude <> 0 AND source_location.longitude <> 0";
73 75 
 		}
74 76 
 		$query .= " ORDER BY last_seen DESC";
75 
-		if ($limit) $query .= " LIMIT 400";
77 
+		if ($limit) {
78 
+			$query .= " LIMIT 400";
79 
+		}
76 80 
 		$query_values = array(':type' => $type);
77 81 
 		try {
78 82 
 			$sth = $this->db->prepare($query);
 
@@ -111,7 +115,9 @@  discard block
 
 block discarded – undo
111 115 
 	}
112 116
113 117 
 	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
114 
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
118 
+		if ($last_seen == '') {
119 
+			$last_seen = date('Y-m-d H:i:s');
120 
+		}
115 121 
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
116 122 
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
117 123 
 		try {
 
@@ -123,7 +129,9 @@  discard block
 
 block discarded – undo
123 129 
 	}
124 130
125 131 
 	public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') {
126 
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
132 
+		if ($last_seen == '') {
133 
+			$last_seen = date('Y-m-d H:i:s');
134 
+		}
127 135 
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source";
128 136 
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
129 137 
 		try {
 
@@ -146,7 +154,9 @@  discard block
 
 block discarded – undo
146 154 
 	}
147 155
148 156 
 	public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') {
149 
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
157 
+		if ($last_seen == '') {
158 
+			$last_seen = date('Y-m-d H:i:s');
159 
+		}
150 160 
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id";
151 161 
 		$query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
152 162 
 		try {
Please login to merge, or discard this patch.
location-geojson.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -79,7 +79,9 @@
 
 block discarded – undo
79 79 
 		$output .= '"type": "'.$spotter_item['type'].'",';
80 80 
 		if ($spotter_item['type'] == 'wx') {
81 81 
 			$weather = json_decode($spotter_item['description'],true);
82 
-			if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",';
82 
+			if (isset($weather['temp'])) {
83 
+				$output.= '"temp": "'.$weather['temp'].'",';
84 
+			}
83 85 
 		}
84 86 
 		$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
85 87 
 		$output .= '},';
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -14,40 +14,40 @@
 
 block discarded – undo
14 14 
 	{
15 15 
 		$coords = explode(',',$_GET['coord']);
16 16 
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true')
17 
-		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
17 
+			|| (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
18 18 
 			//$spotter_array = $Source->getAllLocationInfo();
19 19 
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords));
20 20 
 		}
21 21 
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true')
22 
-		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
22 
+			|| (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
23 23 
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords));
24 24 
 		}
25 25 
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true')
26 
-		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
26 
+			|| (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
27 27 
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords));
28 28 
 		}
29 29
30 30 
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true')
31 
-		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
31 
+			|| (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
32 32 
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true));
33 33 
 		}
34 34 
 		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
35 35 
 	} else {
36 36 
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true')
37 
-		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
37 
+			|| (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
38 38 
 			//$spotter_array = $Source->getAllLocationInfo();
39 39 
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs'));
40 40 
 		}
41 41 
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true')
42 
-		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
42 
+			|| (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
43 43 
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx'));
44 44 
 		}
45 45 
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true')
46 
-		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
46 
+			|| (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
47 47 
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning'));
48 48 
 		}
49 49 
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true')
50 
-		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
50 
+			|| (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
51 51 
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true));
52 52 
 		}
53 53 
 		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -12,52 +12,52 @@  discard block
 
 block discarded – undo
12 12 
 if (!isset($globalDemo)) {
13 13 
 	if (isset($_GET['coord']))
14 14 
 	{
15 
-		$coords = explode(',',$_GET['coord']);
15 
+		$coords = explode(',', $_GET['coord']);
16 16 
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true')
17 17 
 		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
18 18 
 			//$spotter_array = $Source->getAllLocationInfo();
19 
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords));
19 
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs', $coords));
20 20 
 		}
21 21 
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true')
22 22 
 		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
23 
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords));
23 
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx', $coords));
24 24 
 		}
25 25 
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true')
26 26 
 		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
27 
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords));
27 
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning', $coords));
28 28 
 		}
29 29
30 30 
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true')
31 31 
 		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
32 
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true));
32 
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', $coords, true));
33 33 
 		}
34 
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
34 
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
35 35 
 	} else {
36 36 
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true')
37 37 
 		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
38 38 
 			//$spotter_array = $Source->getAllLocationInfo();
39 
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs'));
39 
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs'));
40 40 
 		}
41 41 
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true')
42 42 
 		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
43 
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx'));
43 
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx'));
44 44 
 		}
45 45 
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true')
46 46 
 		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
47 
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning'));
47 
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning'));
48 48 
 		}
49 49 
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true')
50 50 
 		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
51 
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true));
51 
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', array(), true));
52 52 
 		}
53 
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
53 
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
54 54 
 	}
55 55 
 }
56 56
57 57 
 $output = '{"type": "FeatureCollection","features": [';
58 58 
 if (!empty($spotter_array) && count($spotter_array) > 0)
59 59 
 {
60 
-	foreach($spotter_array as $spotter_item)
60 
+	foreach ($spotter_array as $spotter_item)
61 61 
 	{
62 62 
 		date_default_timezone_set('UTC');
63 63 
 		$output .= '{"type": "Feature",';
 
@@ -76,8 +76,8 @@  discard block
 
 block discarded – undo
76 76 
 		$output .= '"icon": "'.$globalURL.'/images/'.$spotter_item['logo'].'",';
77 77 
 		$output .= '"type": "'.$spotter_item['type'].'",';
78 78 
 		if ($spotter_item['type'] == 'wx') {
79 
-			$weather = json_decode($spotter_item['description'],true);
80 
-			if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",';
79 
+			$weather = json_decode($spotter_item['description'], true);
80 
+			if (isset($weather['temp'])) $output .= '"temp": "'.$weather['temp'].'",';
81 81 
 		}
82 82 
 		$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
83 83 
 		$output .= '},';
 
@@ -87,7 +87,7 @@  discard block
 
 block discarded – undo
87 87 
 		$output .= '}';
88 88 
 		$output .= '},';
89 89 
 	}
90 
-	$output  = substr($output, 0, -1);
90 
+	$output = substr($output, 0, -1);
91 91 
 }
92 92 
 $output .= ']}';
93 93 
 print $output;
Please login to merge, or discard this patch.
ident-detailed.php 2 patches
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch 
@@ -3,7 +3,7 @@  discard block
 
 block discarded – undo
3 3 
 require_once('require/class.Language.php');
4 4 
 require_once('require/class.Translation.php');
5 5 
 $type = '';
6 
-$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
6 
+$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
7 7 
 if (isset($_GET['marine'])) {
8 8 
 	require_once('require/class.Marine.php');
9 9 
 	require_once('require/class.MarineLive.php');
 
@@ -30,12 +30,12 @@  discard block
 
 block discarded – undo
30 30 
 	$page_url = $globalURL.'/ident/'.$_GET['ident'];
31 31 
 }
32 32
33 
-if (!isset($_GET['ident'])){
33 
+if (!isset($_GET['ident'])) {
34 34 
 	header('Location: '.$globalURL.'');
35 35 
 } else {
36 36 
 	$Translation = new Translation();
37 37 
 	//calculuation for the pagination
38 
-	if(!isset($_GET['limit']))
38 
+	if (!isset($_GET['limit']))
39 39 
 	{
40 40 
 		$limit_start = 0;
41 41 
 		$limit_end = 25;
 
@@ -54,18 +54,18 @@  discard block
 
 block discarded – undo
54 54 
 	$limit_previous_1 = $limit_start - $absolute_difference;
55 55 
 	$limit_previous_2 = $limit_end - $absolute_difference;
56 56
57 
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
57 
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
58 58 
 	if ($type == 'aircraft') {
59 59 
 		if ($sort != '')
60 60 
 		{
61 
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
61 
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
62 62 
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
63 
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
63 
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
64 64 
 			}
65 65 
 		} else {
66 
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
66 
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
67 67 
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
68 
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
68 
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
69 69 
 			}
70 70 
 		}
71 71 
 		if (empty($spotter_array)) {
 
@@ -74,14 +74,14 @@  discard block
 
 block discarded – undo
74 74 
 				$ident = $new_ident;
75 75 
 				if ($sort != '')
76 76 
 				{
77 
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
77 
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
78 78 
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
79 
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
79 
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
80 80 
 					}
81 81 
 				} else {
82 
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
82 
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
83 83 
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
84 
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
84 
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
85 85 
 					}
86 86 
 				}
87 87 
 			}
 
@@ -89,34 +89,34 @@  discard block
 
 block discarded – undo
89 89 
 	} elseif ($type == 'marine') {
90 90 
 		if ($sort != '')
91 91 
 		{
92 
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
92 
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
93 93 
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
94 
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
94 
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
95 95 
 			}
96 96 
 		} else {
97 
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
97 
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
98 98 
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
99 
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
99 
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
100 100 
 			}
101 101 
 		}
102 102 
 	} elseif ($type == 'tracker') {
103 103 
 		if ($sort != '')
104 104 
 		{
105 
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
105 
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
106 106 
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
107 
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
107 
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
108 108 
 			}
109 109 
 		} else {
110 
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
110 
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
111 111 
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
112 
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
112 
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
113 113 
 			}
114 114 
 		}
115 115 
 	}
116 116
117 117 
 	if (!empty($spotter_array))
118 118 
 	{
119 
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
119 
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['ident']);
120 120 
 		$ident = $spotter_array[0]['ident'];
121 121 
 		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
122 122 
 		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
 
@@ -135,7 +135,7 @@  discard block
 
 block discarded – undo
135 135 
 				$altitude_data = '';
136 136 
 				$hour_data = '';
137 137 
 				$speed_data = '';
138 
-				foreach($all_data as $data)
138 
+				foreach ($all_data as $data)
139 139 
 				{
140 140 
 					$hour_data .= '"'.$data['date'].'",';
141 141 
 					if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
 
@@ -163,8 +163,8 @@  discard block
 
 block discarded – undo
163 163 
 					$speed_data .= $speed.',';
164 164 
 				}
165 165 
 				$hour_data = "['x',".substr($hour_data, 0, -1)."]";
166 
-				$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
167 
-				$speed_data = "['speed',".substr($speed_data,0,-1)."]";
166 
+				$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
167 
+				$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
168 168 
 				print 'c3.generate({
169 169 
 				    bindto: "#chart",
170 170 
 				    data: {
 
@@ -208,9 +208,9 @@  discard block
 
 block discarded – undo
208 208
209 209 
 		if ($type == 'aircraft') include('ident-sub-menu.php');
210 210 
 		print '<div class="table column">';
211 
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
212 
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
213 
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
211 
+		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
212 
+		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
213 
+		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
214 214
215 215 
 		include('table-output.php');
216 216 
 		print '<div class="pagination">';
Please login to merge, or discard this patch.
Braces   +25 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -123,15 +123,21 @@  discard block
 
 block discarded – undo
123 123 
 	{
124 124 
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
125 125 
 		$ident = $spotter_array[0]['ident'];
126 
-		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
127 
-		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
126 
+		if (isset($spotter_array[0]['latitude'])) {
127 
+			$latitude = $spotter_array[0]['latitude'];
128 
+		}
129 
+		if (isset($spotter_array[0]['longitude'])) {
130 
+			$longitude = $spotter_array[0]['longitude'];
131 
+		}
128 132 
 		require_once('header.php');
129 133 
 		if (isset($globalArchive) && $globalArchive && $type == 'aircraft') {
130 134 
 			// Requirement for altitude graph
131 135 
 			$all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']);
132 136 
 			if (isset($globalTimezone)) {
133 137 
 				date_default_timezone_set($globalTimezone);
134 
-			} else date_default_timezone_set('UTC');
138 
+			} else {
139 
+				date_default_timezone_set('UTC');
140 
+			}
135 141 
 			if (is_array($all_data) && count($all_data) > 1) {
136 142 
 				print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
137 143 
 				print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 
@@ -205,18 +211,28 @@  discard block
 
 block discarded – undo
205 211 
 		print '<br/><br/><br/>';
206 212 
 		print '<h1>'.$spotter_array[0]['ident'].'</h1>';
207 213 
 		print '<div><span class="label">'._("Ident").'</span>'.$spotter_array[0]['ident'].'</div>';
208 
-		if (isset($spotter_array[0]['blocked']) && $spotter_array[0]['blocked'] === true) print '<div>'._("Callsign is in blocked FAA list").'</div>';
214 
+		if (isset($spotter_array[0]['blocked']) && $spotter_array[0]['blocked'] === true) {
215 
+			print '<div>'._("Callsign is in blocked FAA list").'</div>';
216 
+		}
209 217 
 		if (isset($spotter_array[0]['airline_icao'])) {
210 218 
 			print '<div><span class="label">'._("Airline").'</span><a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a></div>';
211 219 
 		}
212 
-		if ($type == 'aircraft') print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
220 
+		if ($type == 'aircraft') {
221 
+			print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
222 
+		}
213 223 
 		print '</div>';
214 224
215 
-		if ($type == 'aircraft') include('ident-sub-menu.php');
225 
+		if ($type == 'aircraft') {
226 
+			include('ident-sub-menu.php');
227 
+		}
216 228 
 		print '<div class="table column">';
217 
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
218 
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
219 
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
229 
+		if ($type == 'aircraft') {
230 
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
231 
+		} elseif ($type == 'marine') {
232 
+			print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
233 
+		} elseif ($type == 'tracker') {
234 
+			print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
235 
+		}
220 236
221 237 
 		include('table-output.php');
222 238 
 		print '<div class="pagination">';
Please login to merge, or discard this patch.
install/class.update_db.php 4 patches
Doc Comments   +48 added lines patch added patch discarded remove patch 
@@ -10,6 +10,9 @@  discard block
 
 block discarded – undo
10 10 
 class update_db {
11 11 
 	public static $db_sqlite;
12 12
13 
+	/**
14 
+	 * @param string $file
15 
+	 */
13 16 
 	public static function download($url, $file, $referer = '') {
14 17 
 		global $globalProxy, $globalForceIPv4;
15 18 
 		$fp = fopen($file, 'w');
 
@@ -34,6 +37,9 @@  discard block
 
 block discarded – undo
34 37 
 		fclose($fp);
35 38 
 	}
36 39
40 
+	/**
41 
+	 * @param string $in_file
42 
+	 */
37 43 
 	public static function gunzip($in_file,$out_file_name = '') {
38 44 
 		//echo $in_file.' -> '.$out_file_name."\n";
39 45 
 		$buffer_size = 4096; // read 4kb at a time
 
@@ -55,6 +61,9 @@  discard block
 
 block discarded – undo
55 61 
 		}
56 62 
 	}
57 63
64 
+	/**
65 
+	 * @param string $in_file
66 
+	 */
58 67 
 	public static function unzip($in_file) {
59 68 
 		if ($in_file != '' && file_exists($in_file)) {
60 69 
 			$path = pathinfo(realpath($in_file), PATHINFO_DIRNAME);
 
@@ -76,6 +85,9 @@  discard block
 
 block discarded – undo
76 85 
 		}
77 86 
 	}
78 87
88 
+	/**
89 
+	 * @param string $database_file
90 
+	 */
79 91 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
80 92 
 		global $globalDebug, $globalTransaction;
81 93 
 		//$query = 'TRUNCATE TABLE routes';
 
@@ -118,6 +130,10 @@  discard block
 
 block discarded – undo
118 130 
 		}
119 131 
                 return '';
120 132 
 	}
133 
+
134 
+	/**
135 
+	 * @param string $database_file
136 
+	 */
121 137 
 	public static function retrieve_route_oneworld($database_file) {
122 138 
 		global $globalDebug, $globalTransaction;
123 139 
 		//$query = 'TRUNCATE TABLE routes';
 
@@ -159,6 +175,9 @@  discard block
 
 block discarded – undo
159 175 
                 return '';
160 176 
 	}
161 177
178 
+	/**
179 
+	 * @param string $database_file
180 
+	 */
162 181 
 	public static function retrieve_route_skyteam($database_file) {
163 182 
 		global $globalDebug, $globalTransaction;
164 183 
 		//$query = 'TRUNCATE TABLE routes';
 
@@ -201,6 +220,10 @@  discard block
 
 block discarded – undo
201 220 
 		}
202 221 
                 return '';
203 222 
 	}
223 
+
224 
+	/**
225 
+	 * @param string $database_file
226 
+	 */
204 227 
 	public static function retrieve_modes_sqlite_to_dest($database_file) {
205 228 
 		global $globalTransaction;
206 229 
 		//$query = 'TRUNCATE TABLE aircraft_modes';
 
@@ -267,6 +290,9 @@  discard block
 
 block discarded – undo
267 290 
 		return '';
268 291 
 	}
269 292
293 
+	/**
294 
+	 * @param string $database_file
295 
+	 */
270 296 
 	public static function retrieve_modes_flarmnet($database_file) {
271 297 
 		global $globalTransaction;
272 298 
 		$Common = new Common();
 
@@ -337,6 +363,9 @@  discard block
 
 block discarded – undo
337 363 
 		return '';
338 364 
 	}
339 365
366 
+	/**
367 
+	 * @param string $database_file
368 
+	 */
340 369 
 	public static function retrieve_modes_ogn($database_file) {
341 370 
 		global $globalTransaction;
342 371 
 		//$query = 'TRUNCATE TABLE aircraft_modes';
 
@@ -406,6 +435,9 @@  discard block
 
 block discarded – undo
406 435 
 		return '';
407 436 
 	}
408 437
438 
+	/**
439 
+	 * @param string $database_file
440 
+	 */
409 441 
 	public static function retrieve_owner($database_file,$country = 'F') {
410 442 
 		global $globalTransaction, $globalMasterSource;
411 443 
 		//$query = 'TRUNCATE TABLE aircraft_modes';
 
@@ -1393,6 +1425,10 @@  discard block
 
 block discarded – undo
1393 1425 
 		return '';
1394 1426 
         }
1395 1427
1428 
+	/**
1429 
+	 * @param string $filename
1430 
+	 * @param string $tletype
1431 
+	 */
1396 1432 
 	public static function tle($filename,$tletype) {
1397 1433 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
1398 1434 
 		global $tmp_dir, $globalTransaction;
 
@@ -1442,6 +1478,9 @@  discard block
 
 block discarded – undo
1442 1478 
 		return '';
1443 1479 
         }
1444 1480
1481 
+	/**
1482 
+	 * @param string $filename
1483 
+	 */
1445 1484 
 	public static function satellite_ucsdb($filename) {
1446 1485 
 		global $tmp_dir, $globalTransaction;
1447 1486 
 		$query = "DELETE FROM satellite";
 
@@ -1488,6 +1527,9 @@  discard block
 
 block discarded – undo
1488 1527 
 		return '';
1489 1528 
 	}
1490 1529
1530 
+	/**
1531 
+	 * @param string $filename
1532 
+	 */
1491 1533 
 	public static function satellite_celestrak($filename) {
1492 1534 
 		global $tmp_dir, $globalTransaction;
1493 1535 
 		$satcat_sources = array(
 
@@ -1815,6 +1857,9 @@  discard block
 
 block discarded – undo
1815 1857
1816 1858 
 	}
1817 1859 
 */
1860 
+	/**
1861 
+	 * @param string $filename
1862 
+	 */
1818 1863 
 	public static function waypoints($filename) {
1819 1864 
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
1820 1865 
 		global $tmp_dir, $globalTransaction;
 
@@ -1883,6 +1928,9 @@  discard block
 
 block discarded – undo
1883 1928 
 		}
1884 1929 
 	}
1885 1930
1931 
+	/**
1932 
+	 * @param string $filename
1933 
+	 */
1886 1934 
 	public static function ivao_airlines($filename) {
1887 1935 
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
1888 1936 
 		global $tmp_dir, $globalTransaction;
Please login to merge, or discard this patch.
Indentation   +357 added lines, -357 removed lines patch added patch discarded remove patch 
@@ -85,38 +85,38 @@  discard block
 
 block discarded – undo
85 85 
 		try {
86 86 
 			//$Connection = new Connection();
87 87 
 			$sth = $Connection->db->prepare($query);
88 
-                        $sth->execute(array(':source' => $database_file));
89 
-                } catch(PDOException $e) {
90 
-                        return "error : ".$e->getMessage();
91 
-                }
88 
+						$sth->execute(array(':source' => $database_file));
89 
+				} catch(PDOException $e) {
90 
+						return "error : ".$e->getMessage();
91 
+				}
92 92
93 
-    		if ($globalDebug) echo " - Add routes to DB -";
94 
-    		update_db::connect_sqlite($database_file);
93 
+			if ($globalDebug) echo " - Add routes to DB -";
94 
+			update_db::connect_sqlite($database_file);
95 95 
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
96 96 
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
97 97 
 		try {
98 
-                        $sth = update_db::$db_sqlite->prepare($query);
99 
-                        $sth->execute();
100 
-                } catch(PDOException $e) {
101 
-                        return "error : ".$e->getMessage();
102 
-                }
98 
+						$sth = update_db::$db_sqlite->prepare($query);
99 
+						$sth->execute();
100 
+				} catch(PDOException $e) {
101 
+						return "error : ".$e->getMessage();
102 
+				}
103 103 
 		//$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
104 104 
 		$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,ToAirport_ICAO,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
105 105 
 		$Connection = new Connection();
106 106 
 		$sth_dest = $Connection->db->prepare($query_dest);
107 107 
 		try {
108 108 
 			if ($globalTransaction) $Connection->db->beginTransaction();
109 
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
109 
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
110 110 
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
111 111 
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
112 112 
 				$sth_dest->execute($query_dest_values);
113 
-            		}
113 
+					}
114 114 
 			if ($globalTransaction) $Connection->db->commit();
115 115 
 		} catch(PDOException $e) {
116 116 
 			if ($globalTransaction) $Connection->db->rollBack();
117 117 
 			return "error : ".$e->getMessage();
118 118 
 		}
119 
-                return '';
119 
+				return '';
120 120 
 	}
121 121 
 	public static function retrieve_route_oneworld($database_file) {
122 122 
 		global $globalDebug, $globalTransaction;
 
@@ -127,12 +127,12 @@  discard block
 
 block discarded – undo
127 127 
 		try {
128 128 
 			//$Connection = new Connection();
129 129 
 			$sth = $Connection->db->prepare($query);
130 
-                        $sth->execute(array(':source' => 'oneworld'));
131 
-                } catch(PDOException $e) {
132 
-                        return "error : ".$e->getMessage();
133 
-                }
130 
+						$sth->execute(array(':source' => 'oneworld'));
131 
+				} catch(PDOException $e) {
132 
+						return "error : ".$e->getMessage();
133 
+				}
134 134
135 
-    		if ($globalDebug) echo " - Add routes to DB -";
135 
+			if ($globalDebug) echo " - Add routes to DB -";
136 136 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
137 137 
 		$Spotter = new Spotter();
138 138 
 		if ($fh = fopen($database_file,"r")) {
 
@@ -156,7 +156,7 @@  discard block
 
 block discarded – undo
156 156 
 			}
157 157 
 			if ($globalTransaction) $Connection->db->commit();
158 158 
 		}
159 
-                return '';
159 
+				return '';
160 160 
 	}
161 161
162 162 
 	public static function retrieve_route_skyteam($database_file) {
 
@@ -168,12 +168,12 @@  discard block
 
 block discarded – undo
168 168 
 		try {
169 169 
 			//$Connection = new Connection();
170 170 
 			$sth = $Connection->db->prepare($query);
171 
-                        $sth->execute(array(':source' => 'skyteam'));
172 
-                } catch(PDOException $e) {
173 
-                        return "error : ".$e->getMessage();
174 
-                }
171 
+						$sth->execute(array(':source' => 'skyteam'));
172 
+				} catch(PDOException $e) {
173 
+						return "error : ".$e->getMessage();
174 
+				}
175 175
176 
-    		if ($globalDebug) echo " - Add routes to DB -";
176 
+			if ($globalDebug) echo " - Add routes to DB -";
177 177
178 178 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
179 179 
 		$Spotter = new Spotter();
 
@@ -199,7 +199,7 @@  discard block
 
 block discarded – undo
199 199 
 				return "error : ".$e->getMessage();
200 200 
 			}
201 201 
 		}
202 
-                return '';
202 
+				return '';
203 203 
 	}
204 204 
 	public static function retrieve_modes_sqlite_to_dest($database_file) {
205 205 
 		global $globalTransaction;
 
@@ -208,27 +208,27 @@  discard block
 
 block discarded – undo
208 208 
 		try {
209 209 
 			$Connection = new Connection();
210 210 
 			$sth = $Connection->db->prepare($query);
211 
-                        $sth->execute(array(':source' => $database_file));
212 
-                } catch(PDOException $e) {
213 
-                        return "error : ".$e->getMessage();
214 
-                }
211 
+						$sth->execute(array(':source' => $database_file));
212 
+				} catch(PDOException $e) {
213 
+						return "error : ".$e->getMessage();
214 
+				}
215 215 
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
216 216 
 		try {
217 217 
 			$Connection = new Connection();
218 218 
 			$sth = $Connection->db->prepare($query);
219 
-                        $sth->execute(array(':source' => $database_file));
220 
-                } catch(PDOException $e) {
221 
-                        return "error : ".$e->getMessage();
222 
-                }
219 
+						$sth->execute(array(':source' => $database_file));
220 
+				} catch(PDOException $e) {
221 
+						return "error : ".$e->getMessage();
222 
+				}
223 223
224 
-    		update_db::connect_sqlite($database_file);
224 
+			update_db::connect_sqlite($database_file);
225 225 
 		$query = 'select * from Aircraft';
226 226 
 		try {
227 
-                        $sth = update_db::$db_sqlite->prepare($query);
228 
-                        $sth->execute();
229 
-                } catch(PDOException $e) {
230 
-                        return "error : ".$e->getMessage();
231 
-                }
227 
+						$sth = update_db::$db_sqlite->prepare($query);
228 
+						$sth->execute();
229 
+				} catch(PDOException $e) {
230 
+						return "error : ".$e->getMessage();
231 
+				}
232 232 
 		//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
233 233 
 		$query_dest = 'INSERT INTO aircraft_modes (LastModified, ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type,:source)';
234 234 
 		
@@ -239,17 +239,17 @@  discard block
 
 block discarded – undo
239 239 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
240 240 
 		try {
241 241 
 			if ($globalTransaction) $Connection->db->beginTransaction();
242 
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
242 
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
243 243 
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
244 244 
 				if ($values['UserString4'] == 'M') $type = 'military';
245 245 
 				else $type = null;
246 246 
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
247 247 
 				$sth_dest->execute($query_dest_values);
248 248 
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
249 
-				    $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
250 
-				    $sth_dest_owner->execute($query_dest_owner_values);
249 
+					$query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
250 
+					$sth_dest_owner->execute($query_dest_owner_values);
251 251 
 				}
252 
-            		}
252 
+					}
253 253 
 			if ($globalTransaction) $Connection->db->commit();
254 254 
 		} catch(PDOException $e) {
255 255 
 			return "error : ".$e->getMessage();
 
@@ -260,10 +260,10 @@  discard block
 
 block discarded – undo
260 260 
 		try {
261 261 
 			$Connection = new Connection();
262 262 
 			$sth = $Connection->db->prepare($query);
263 
-                        $sth->execute(array(':source' => $database_file));
264 
-                } catch(PDOException $e) {
265 
-                        return "error : ".$e->getMessage();
266 
-                }
263 
+						$sth->execute(array(':source' => $database_file));
264 
+				} catch(PDOException $e) {
265 
+						return "error : ".$e->getMessage();
266 
+				}
267 267 
 		return '';
268 268 
 	}
269 269 
 
@@ -275,10 +275,10 @@  discard block
 
 block discarded – undo
275 275 
 		try {
276 276 
 			$Connection = new Connection();
277 277 
 			$sth = $Connection->db->prepare($query);
278 
-                        $sth->execute(array(':source' => $database_file));
279 
-                } catch(PDOException $e) {
280 
-                        return "error : ".$e->getMessage();
281 
-                }
278 
+						$sth->execute(array(':source' => $database_file));
279 
+				} catch(PDOException $e) {
280 
+						return "error : ".$e->getMessage();
281 
+				}
282 282
283 283 
 		if ($fh = fopen($database_file,"r")) {
284 284 
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 
@@ -288,26 +288,26 @@  discard block
 
 block discarded – undo
288 288 
 			$sth_dest = $Connection->db->prepare($query_dest);
289 289 
 			try {
290 290 
 				if ($globalTransaction) $Connection->db->beginTransaction();
291 
-            			while (!feof($fh)) {
292 
-            				$values = array();
293 
-            				$line = $Common->hex2str(fgets($fh,9999));
291 
+						while (!feof($fh)) {
292 
+							$values = array();
293 
+							$line = $Common->hex2str(fgets($fh,9999));
294 294 
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
295 
-            				$values['ModeS'] = substr($line,0,6);
296 
-            				$values['Registration'] = trim(substr($line,69,6));
297 
-            				$aircraft_name = trim(substr($line,48,6));
298 
-            				// Check if we can find ICAO, else set it to GLID
299 
-            				$aircraft_name_split = explode(' ',$aircraft_name);
300 
-            				$search_more = '';
301 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
302 
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
303 
-            				$sth_search = $Connection->db->prepare($query_search);
295 
+							$values['ModeS'] = substr($line,0,6);
296 
+							$values['Registration'] = trim(substr($line,69,6));
297 
+							$aircraft_name = trim(substr($line,48,6));
298 
+							// Check if we can find ICAO, else set it to GLID
299 
+							$aircraft_name_split = explode(' ',$aircraft_name);
300 
+							$search_more = '';
301 
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
302 
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
303 
+							$sth_search = $Connection->db->prepare($query_search);
304 304 
 					try {
305 
-                                    		$sth_search->execute();
306 
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
307 
-	            				//if (count($result) > 0) {
308 
-	            				if (isset($result['icao']) && $result['icao'] != '') {
309 
-	            				    $values['ICAOTypeCode'] = $result['icao'];
310 
-	            				}
305 
+											$sth_search->execute();
306 
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
307 
+								//if (count($result) > 0) {
308 
+								if (isset($result['icao']) && $result['icao'] != '') {
309 
+									$values['ICAOTypeCode'] = $result['icao'];
310 
+								}
311 311 
 					} catch(PDOException $e) {
312 312 
 						return "error : ".$e->getMessage();
313 313 
 					}
 
@@ -330,10 +330,10 @@  discard block
 
 block discarded – undo
330 330 
 		try {
331 331 
 			$Connection = new Connection();
332 332 
 			$sth = $Connection->db->prepare($query);
333 
-                        $sth->execute(array(':source' => $database_file));
334 
-                } catch(PDOException $e) {
335 
-                        return "error : ".$e->getMessage();
336 
-                }
333 
+						$sth->execute(array(':source' => $database_file));
334 
+				} catch(PDOException $e) {
335 
+						return "error : ".$e->getMessage();
336 
+				}
337 337 
 		return '';
338 338 
 	}
339 339 
 
@@ -344,10 +344,10 @@  discard block
 
 block discarded – undo
344 344 
 		try {
345 345 
 			$Connection = new Connection();
346 346 
 			$sth = $Connection->db->prepare($query);
347 
-                        $sth->execute(array(':source' => $database_file));
348 
-                } catch(PDOException $e) {
349 
-                        return "error : ".$e->getMessage();
350 
-                }
347 
+						$sth->execute(array(':source' => $database_file));
348 
+				} catch(PDOException $e) {
349 
+						return "error : ".$e->getMessage();
350 
+				}
351 351
352 352 
 		if ($fh = fopen($database_file,"r")) {
353 353 
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 
@@ -358,25 +358,25 @@  discard block
 
 block discarded – undo
358 358 
 			try {
359 359 
 				if ($globalTransaction) $Connection->db->beginTransaction();
360 360 
 				$tmp = fgetcsv($fh,9999,',',"'");
361 
-            			while (!feof($fh)) {
362 
-            				$line = fgetcsv($fh,9999,',',"'");
361 
+						while (!feof($fh)) {
362 
+							$line = fgetcsv($fh,9999,',',"'");
363 363
364 364 
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
365 365 
 					//print_r($line);
366 
-            				$values['ModeS'] = $line[1];
367 
-            				$values['Registration'] = $line[3];
368 
-            				$values['ICAOTypeCode'] = '';
369 
-            				$aircraft_name = $line[2];
370 
-            				// Check if we can find ICAO, else set it to GLID
371 
-            				$aircraft_name_split = explode(' ',$aircraft_name);
372 
-            				$search_more = '';
373 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
374 
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
375 
-            				$sth_search = $Connection->db->prepare($query_search);
366 
+							$values['ModeS'] = $line[1];
367 
+							$values['Registration'] = $line[3];
368 
+							$values['ICAOTypeCode'] = '';
369 
+							$aircraft_name = $line[2];
370 
+							// Check if we can find ICAO, else set it to GLID
371 
+							$aircraft_name_split = explode(' ',$aircraft_name);
372 
+							$search_more = '';
373 
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
374 
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
375 
+							$sth_search = $Connection->db->prepare($query_search);
376 376 
 					try {
377 
-                                    		$sth_search->execute();
378 
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
379 
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
377 
+											$sth_search->execute();
378 
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
379 
+								if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
380 380 
 					} catch(PDOException $e) {
381 381 
 						return "error : ".$e->getMessage();
382 382 
 					}
 
@@ -399,10 +399,10 @@  discard block
 
 block discarded – undo
399 399 
 		try {
400 400 
 			$Connection = new Connection();
401 401 
 			$sth = $Connection->db->prepare($query);
402 
-                        $sth->execute(array(':source' => $database_file));
403 
-                } catch(PDOException $e) {
404 
-                        return "error : ".$e->getMessage();
405 
-                }
402 
+						$sth->execute(array(':source' => $database_file));
403 
+				} catch(PDOException $e) {
404 
+						return "error : ".$e->getMessage();
405 
+				}
406 406 
 		return '';
407 407 
 	}
408 408 
 
@@ -413,16 +413,16 @@  discard block
 
 block discarded – undo
413 413 
 		try {
414 414 
 			$Connection = new Connection();
415 415 
 			$sth = $Connection->db->prepare($query);
416 
-                        $sth->execute(array(':source' => $database_file));
417 
-                } catch(PDOException $e) {
418 
-                        return "error : ".$e->getMessage();
419 
-                }
416 
+						$sth->execute(array(':source' => $database_file));
417 
+				} catch(PDOException $e) {
418 
+						return "error : ".$e->getMessage();
419 
+				}
420 420 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
421 421 
 		$Spotter = new Spotter();
422 422 
 		if ($fh = fopen($database_file,"r")) {
423 423 
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
424 424 
 			$query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
425 
-		        $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)';
425 
+				$query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)';
426 426
427 427 
 			$Connection = new Connection();
428 428 
 			$sth_dest = $Connection->db->prepare($query_dest);
 
@@ -430,126 +430,126 @@  discard block
 
 block discarded – undo
430 430 
 			try {
431 431 
 				if ($globalTransaction) $Connection->db->beginTransaction();
432 432 
 				$tmp = fgetcsv($fh,9999,',','"');
433 
-            			while (!feof($fh)) {
434 
-            				$line = fgetcsv($fh,9999,',','"');
435 
-            				$values = array();
436 
-            				//print_r($line);
437 
-            				if ($country == 'F') {
438 
-            				    $values['registration'] = $line[0];
439 
-            				    $values['base'] = $line[4];
440 
-            				    $values['owner'] = $line[5];
441 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
442 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
443 
-					    $values['cancel'] = $line[7];
433 
+						while (!feof($fh)) {
434 
+							$line = fgetcsv($fh,9999,',','"');
435 
+							$values = array();
436 
+							//print_r($line);
437 
+							if ($country == 'F') {
438 
+								$values['registration'] = $line[0];
439 
+								$values['base'] = $line[4];
440 
+								$values['owner'] = $line[5];
441 
+								if ($line[6] == '') $values['date_first_reg'] = null;
442 
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
443 
+						$values['cancel'] = $line[7];
444 444 
 					} elseif ($country == 'EI') {
445 
-					    // TODO : add modeS & reg to aircraft_modes
446 
-            				    $values['registration'] = $line[0];
447 
-            				    $values['base'] = $line[3];
448 
-            				    $values['owner'] = $line[2];
449 
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
450 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
451 
-					    $values['cancel'] = '';
452 
-					    $values['modes'] = $line[7];
453 
-					    $values['icao'] = $line[8];
445 
+						// TODO : add modeS & reg to aircraft_modes
446 
+								$values['registration'] = $line[0];
447 
+								$values['base'] = $line[3];
448 
+								$values['owner'] = $line[2];
449 
+								if ($line[1] == '') $values['date_first_reg'] = null;
450 
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
451 
+						$values['cancel'] = '';
452 
+						$values['modes'] = $line[7];
453 
+						$values['icao'] = $line[8];
454 454
455 455 
 					} elseif ($country == 'HB') {
456 
-					    // TODO : add modeS & reg to aircraft_modes
457 
-            				    $values['registration'] = $line[0];
458 
-            				    $values['base'] = null;
459 
-            				    $values['owner'] = $line[5];
460 
-            				    $values['date_first_reg'] = null;
461 
-					    $values['cancel'] = '';
462 
-					    $values['modes'] = $line[4];
463 
-					    $values['icao'] = $line[7];
456 
+						// TODO : add modeS & reg to aircraft_modes
457 
+								$values['registration'] = $line[0];
458 
+								$values['base'] = null;
459 
+								$values['owner'] = $line[5];
460 
+								$values['date_first_reg'] = null;
461 
+						$values['cancel'] = '';
462 
+						$values['modes'] = $line[4];
463 
+						$values['icao'] = $line[7];
464 464 
 					} elseif ($country == 'OK') {
465 
-					    // TODO : add modeS & reg to aircraft_modes
466 
-            				    $values['registration'] = $line[3];
467 
-            				    $values['base'] = null;
468 
-            				    $values['owner'] = $line[5];
469 
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
470 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
471 
-					    $values['cancel'] = '';
465 
+						// TODO : add modeS & reg to aircraft_modes
466 
+								$values['registration'] = $line[3];
467 
+								$values['base'] = null;
468 
+								$values['owner'] = $line[5];
469 
+								if ($line[18] == '') $values['date_first_reg'] = null;
470 
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
471 
+						$values['cancel'] = '';
472 472 
 					} elseif ($country == 'VH') {
473 
-					    // TODO : add modeS & reg to aircraft_modes
474 
-            				    $values['registration'] = $line[0];
475 
-            				    $values['base'] = null;
476 
-            				    $values['owner'] = $line[12];
477 
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
478 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
479 
-
480 
-					    $values['cancel'] = $line[39];
473 
+						// TODO : add modeS & reg to aircraft_modes
474 
+								$values['registration'] = $line[0];
475 
+								$values['base'] = null;
476 
+								$values['owner'] = $line[12];
477 
+								if ($line[28] == '') $values['date_first_reg'] = null;
478 
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
479 
+
480 
+						$values['cancel'] = $line[39];
481 481 
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
482 
-            				    $values['registration'] = $line[0];
483 
-            				    $values['base'] = null;
484 
-            				    $values['owner'] = $line[4];
485 
-            				    $values['date_first_reg'] = null;
486 
-					    $values['cancel'] = '';
482 
+								$values['registration'] = $line[0];
483 
+								$values['base'] = null;
484 
+								$values['owner'] = $line[4];
485 
+								$values['date_first_reg'] = null;
486 
+						$values['cancel'] = '';
487 487 
 					} elseif ($country == 'CC') {
488 
-            				    $values['registration'] = $line[0];
489 
-            				    $values['base'] = null;
490 
-            				    $values['owner'] = $line[6];
491 
-            				    $values['date_first_reg'] = null;
492 
-					    $values['cancel'] = '';
488 
+								$values['registration'] = $line[0];
489 
+								$values['base'] = null;
490 
+								$values['owner'] = $line[6];
491 
+								$values['date_first_reg'] = null;
492 
+						$values['cancel'] = '';
493 493 
 					} elseif ($country == 'HJ') {
494 
-            				    $values['registration'] = $line[0];
495 
-            				    $values['base'] = null;
496 
-            				    $values['owner'] = $line[8];
497 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
498 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
499 
-					    $values['cancel'] = '';
494 
+								$values['registration'] = $line[0];
495 
+								$values['base'] = null;
496 
+								$values['owner'] = $line[8];
497 
+								if ($line[7] == '') $values['date_first_reg'] = null;
498 
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
499 
+						$values['cancel'] = '';
500 500 
 					} elseif ($country == 'PP') {
501 
-            				    $values['registration'] = $line[0];
502 
-            				    $values['base'] = null;
503 
-            				    $values['owner'] = $line[4];
504 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
505 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
506 
-					    $values['cancel'] = $line[7];
501 
+								$values['registration'] = $line[0];
502 
+								$values['base'] = null;
503 
+								$values['owner'] = $line[4];
504 
+								if ($line[6] == '') $values['date_first_reg'] = null;
505 
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
506 
+						$values['cancel'] = $line[7];
507 507 
 					} elseif ($country == 'E7') {
508 
-            				    $values['registration'] = $line[0];
509 
-            				    $values['base'] = null;
510 
-            				    $values['owner'] = $line[4];
511 
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
512 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
513 
-					    $values['cancel'] = '';
508 
+								$values['registration'] = $line[0];
509 
+								$values['base'] = null;
510 
+								$values['owner'] = $line[4];
511 
+								if ($line[5] == '') $values['date_first_reg'] = null;
512 
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
513 
+						$values['cancel'] = '';
514 514 
 					} elseif ($country == '8Q') {
515 
-            				    $values['registration'] = $line[0];
516 
-            				    $values['base'] = null;
517 
-            				    $values['owner'] = $line[3];
518 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
519 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
520 
-					    $values['cancel'] = '';
515 
+								$values['registration'] = $line[0];
516 
+								$values['base'] = null;
517 
+								$values['owner'] = $line[3];
518 
+								if ($line[7] == '') $values['date_first_reg'] = null;
519 
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
520 
+						$values['cancel'] = '';
521 521 
 					} elseif ($country == 'ZK') {
522 
-            				    $values['registration'] = $line[0];
523 
-            				    $values['base'] = null;
524 
-            				    $values['owner'] = $line[3];
525 
-            				    $values['date_first_reg'] = null;
526 
-					    $values['cancel'] = '';
527 
-					    $values['modes'] = $line[5];
528 
-					    $values['icao'] = $line[9];
522 
+								$values['registration'] = $line[0];
523 
+								$values['base'] = null;
524 
+								$values['owner'] = $line[3];
525 
+								$values['date_first_reg'] = null;
526 
+						$values['cancel'] = '';
527 
+						$values['modes'] = $line[5];
528 
+						$values['icao'] = $line[9];
529 529 
 					} elseif ($country == 'M') {
530 
-            				    $values['registration'] = $line[0];
531 
-            				    $values['base'] = null;
532 
-            				    $values['owner'] = $line[6];
533 
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
534 
-					    $values['cancel'] = date("Y-m-d",strtotime($line[8]));
535 
-					    $values['modes'] = $line[4];
536 
-					    $values['icao'] = $line[10];
530 
+								$values['registration'] = $line[0];
531 
+								$values['base'] = null;
532 
+								$values['owner'] = $line[6];
533 
+								$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
534 
+						$values['cancel'] = date("Y-m-d",strtotime($line[8]));
535 
+						$values['modes'] = $line[4];
536 
+						$values['icao'] = $line[10];
537 537 
 					} elseif ($country == 'OY') {
538 
-            				    $values['registration'] = $line[0];
539 
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[4]));
540 
-					    $values['modes'] = $line[5];
541 
-					    $values['icao'] = $line[6];
538 
+								$values['registration'] = $line[0];
539 
+								$values['date_first_reg'] = date("Y-m-d",strtotime($line[4]));
540 
+						$values['modes'] = $line[5];
541 
+						$values['icao'] = $line[6];
542 542 
 					} elseif ($country == 'PH') {
543 
-            				    $values['registration'] = $line[0];
544 
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[3]));
545 
-					    $values['modes'] = $line[4];
546 
-					    $values['icao'] = $line[5];
543 
+								$values['registration'] = $line[0];
544 
+								$values['date_first_reg'] = date("Y-m-d",strtotime($line[3]));
545 
+						$values['modes'] = $line[4];
546 
+						$values['icao'] = $line[5];
547 547 
 					} elseif ($country == 'OM' || $country == 'TF') {
548 
-            				    $values['registration'] = $line[0];
549 
-            				    $values['base'] = null;
550 
-            				    $values['owner'] = $line[3];
551 
-            				    $values['date_first_reg'] = null;
552 
-					    $values['cancel'] = '';
548 
+								$values['registration'] = $line[0];
549 
+								$values['base'] = null;
550 
+								$values['owner'] = $line[3];
551 
+								$values['date_first_reg'] = null;
552 
+						$values['cancel'] = '';
553 553 
 					}
554 554 
 					if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) {
555 555 
 						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
 
@@ -682,7 +682,7 @@  discard block
 
 block discarded – undo
682 682 
                         return "error : ".$e->getMessage();
683 683 
                 }
684 684 
                 */
685 
-                /*
685 
+				/*
686 686 
 		$query = 'ALTER TABLE airport DROP INDEX icaoidx';
687 687 
 		try {
688 688 
 			$Connection = new Connection();
 
@@ -927,10 +927,10 @@  discard block
 
 block discarded – undo
927 927 
 		try {
928 928 
 			$Connection = new Connection();
929 929 
 			$sth = $Connection->db->prepare($query);
930 
-                        $sth->execute(array(':source' => 'translation.csv'));
931 
-                } catch(PDOException $e) {
932 
-                        return "error : ".$e->getMessage();
933 
-                }
930 
+						$sth->execute(array(':source' => 'translation.csv'));
931 
+				} catch(PDOException $e) {
932 
+						return "error : ".$e->getMessage();
933 
+				}
934 934
935 935
936 936 
 		//update_db::unzip($out_file);
 
@@ -949,21 +949,21 @@  discard block
 
 block discarded – undo
949 949 
 					$data = $row;
950 950 
 					$operator = $data[2];
951 951 
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
952 
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
953 
-                                                //echo substr($operator, 0, 2)."\n";;
954 
-                                                if (count($airline_array) > 0) {
952 
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
953 
+												//echo substr($operator, 0, 2)."\n";;
954 
+												if (count($airline_array) > 0) {
955 955 
 							//print_r($airline_array);
956 956 
 							$operator = $airline_array[0]['icao'].substr($operator,2);
957 
-                                                }
958 
-                                        }
957 
+												}
958 
+										}
959 959
960 960 
 					$operator_correct = $data[3];
961 961 
 					if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) {
962 
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
963 
-                                                if (count($airline_array) > 0) {
964 
-                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
965 
-                                            	}
966 
-                                        }
962 
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
963 
+												if (count($airline_array) > 0) {
964 
+													$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
965 
+												}
966 
+										}
967 967 
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
968 968 
 					try {
969 969 
 						$sth = $Connection->db->prepare($query);
 
@@ -977,7 +977,7 @@  discard block
 
 block discarded – undo
977 977 
 			//$Connection->db->commit();
978 978 
 		}
979 979 
 		return '';
980 
-        }
980 
+		}
981 981
982 982 
 	public static function translation_fam() {
983 983 
 		global $tmp_dir, $globalTransaction;
 
@@ -1015,7 +1015,7 @@  discard block
 
 block discarded – undo
1015 1015 
 			//$Connection->db->commit();
1016 1016 
 		}
1017 1017 
 		return '';
1018 
-        }
1018 
+		}
1019 1019
1020 1020 
 	/*
1021 1021 
 	* This function use FAA public data.
 
@@ -1027,19 +1027,19 @@  discard block
 
 block discarded – undo
1027 1027 
 		try {
1028 1028 
 			$Connection = new Connection();
1029 1029 
 			$sth = $Connection->db->prepare($query);
1030 
-                        $sth->execute(array(':source' => 'website_faa'));
1031 
-                } catch(PDOException $e) {
1032 
-                        return "error : ".$e->getMessage();
1033 
-                }
1030 
+						$sth->execute(array(':source' => 'website_faa'));
1031 
+				} catch(PDOException $e) {
1032 
+						return "error : ".$e->getMessage();
1033 
+				}
1034 1034
1035 1035 
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source = :source";
1036 1036 
 		try {
1037 1037 
 			$Connection = new Connection();
1038 1038 
 			$sth = $Connection->db->prepare($query);
1039 
-                        $sth->execute(array(':source' => 'website_faa'));
1040 
-                } catch(PDOException $e) {
1041 
-                        return "error : ".$e->getMessage();
1042 
-                }
1039 
+						$sth->execute(array(':source' => 'website_faa'));
1040 
+				} catch(PDOException $e) {
1041 
+						return "error : ".$e->getMessage();
1042 
+				}
1043 1043
1044 1044 
 		$delimiter = ",";
1045 1045 
 		$mfr = array();
 
@@ -1207,7 +1207,7 @@  discard block
 
 block discarded – undo
1207 1207 
 		}
1208 1208 
 		*/
1209 1209 
 		return '';
1210 
-        }
1210 
+		}
1211 1211
1212 1212 
 	public static function owner_fam() {
1213 1213 
 		global $tmp_dir, $globalTransaction;
 
@@ -1215,10 +1215,10 @@  discard block
 
 block discarded – undo
1215 1215 
 		try {
1216 1216 
 			$Connection = new Connection();
1217 1217 
 			$sth = $Connection->db->prepare($query);
1218 
-                        $sth->execute(array(':source' => 'website_fam'));
1219 
-                } catch(PDOException $e) {
1220 
-                        return "error : ".$e->getMessage();
1221 
-                }
1218 
+						$sth->execute(array(':source' => 'website_fam'));
1219 
+				} catch(PDOException $e) {
1220 
+						return "error : ".$e->getMessage();
1221 
+				}
1222 1222
1223 1223 
 		$delimiter = "\t";
1224 1224 
 		$Connection = new Connection();
 
@@ -1244,7 +1244,7 @@  discard block
 
 block discarded – undo
1244 1244 
 			if ($globalTransaction) $Connection->db->commit();
1245 1245 
 		}
1246 1246 
 		return '';
1247 
-        }
1247 
+		}
1248 1248
1249 1249 
 	public static function routes_fam() {
1250 1250 
 		global $tmp_dir, $globalTransaction, $globalDebug;
 
@@ -1286,7 +1286,7 @@  discard block
 
 block discarded – undo
1286 1286 
 			if ($globalTransaction) $Connection->db->commit();
1287 1287 
 		}
1288 1288 
 		return '';
1289 
-        }
1289 
+		}
1290 1290
1291 1291 
 	public static function marine_identity_fam() {
1292 1292 
 		global $tmp_dir, $globalTransaction;
 
@@ -1294,10 +1294,10 @@  discard block
 
 block discarded – undo
1294 1294 
 		try {
1295 1295 
 			$Connection = new Connection();
1296 1296 
 			$sth = $Connection->db->prepare($query);
1297 
-                        $sth->execute();
1298 
-                } catch(PDOException $e) {
1299 
-                        return "error : ".$e->getMessage();
1300 
-                }
1297 
+						$sth->execute();
1298 
+				} catch(PDOException $e) {
1299 
+						return "error : ".$e->getMessage();
1300 
+				}
1301 1301
1302 1302
1303 1303 
 		//update_db::unzip($out_file);
 
@@ -1327,7 +1327,7 @@  discard block
 
 block discarded – undo
1327 1327 
 			if ($globalTransaction) $Connection->db->commit();
1328 1328 
 		}
1329 1329 
 		return '';
1330 
-        }
1330 
+		}
1331 1331
1332 1332 
 	public static function satellite_fam() {
1333 1333 
 		global $tmp_dir, $globalTransaction;
 
@@ -1398,7 +1398,7 @@  discard block
 
 block discarded – undo
1398 1398 
 			if ($globalTransaction) $Connection->db->commit();
1399 1399 
 		}
1400 1400 
 		return '';
1401 
-        }
1401 
+		}
1402 1402
1403 1403 
 	public static function tle($filename,$tletype) {
1404 1404 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 
@@ -1409,10 +1409,10 @@  discard block
 
 block discarded – undo
1409 1409 
 		try {
1410 1410 
 			$Connection = new Connection();
1411 1411 
 			$sth = $Connection->db->prepare($query);
1412 
-                        $sth->execute(array(':source' => $filename));
1413 
-                } catch(PDOException $e) {
1414 
-                        return "error : ".$e->getMessage();
1415 
-                }
1412 
+						$sth->execute(array(':source' => $filename));
1413 
+				} catch(PDOException $e) {
1414 
+						return "error : ".$e->getMessage();
1415 
+				}
1416 1416
1417 1417 
 		$Connection = new Connection();
1418 1418 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 
@@ -1447,7 +1447,7 @@  discard block
 
 block discarded – undo
1447 1447 
 			//$Connection->db->commit();
1448 1448 
 		}
1449 1449 
 		return '';
1450 
-        }
1450 
+		}
1451 1451
1452 1452 
 	public static function satellite_ucsdb($filename) {
1453 1453 
 		global $tmp_dir, $globalTransaction;
 
@@ -1706,11 +1706,11 @@  discard block
 
 block discarded – undo
1706 1706 
 							try {
1707 1707 
 								$sth = $Connection->db->prepare($query);
1708 1708 
 								$sth->execute(array(
1709 
-								    ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'],
1710 
-								    ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'],
1711 
-								    ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'],
1712 
-								    ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => ''
1713 
-								    )
1709 
+									':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'],
1710 
+									':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'],
1711 
+									':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'],
1712 
+									':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => ''
1713 
+									)
1714 1714 
 								);
1715 1715 
 							} catch(PDOException $e) {
1716 1716 
 								return "error : ".$e->getMessage();
 
@@ -1734,13 +1734,13 @@  discard block
 
 block discarded – undo
1734 1734 
 			//$Connection->db->commit();
1735 1735 
 		}
1736 1736 
 		return '';
1737 
-        }
1737 
+		}
1738 1738
1739 1739 
 	/**
1740 
-        * Convert a HTML table to an array
1741 
-        * @param String $data HTML page
1742 
-        * @return Array array of the tables in HTML page
1743 
-        */
1740 
+	 * Convert a HTML table to an array
1741 
+	 * @param String $data HTML page
1742 
+	 * @return Array array of the tables in HTML page
1743 
+	 */
1744 1744 
 /*
1745 1745 
         private static function table2array($data) {
1746 1746 
                 $html = str_get_html($data);
 
@@ -1770,11 +1770,11 @@  discard block
 
 block discarded – undo
1770 1770 
                 return(array_filter($tabledata));
1771 1771 
         }
1772 1772 
 */
1773 
-       /**
1774 
-        * Get data from form result
1775 
-        * @param String $url form URL
1776 
-        * @return String the result
1777 
-        */
1773 
+	   /**
1774 
+	    * Get data from form result
1775 
+	    * @param String $url form URL
1776 
+	    * @return String the result
1777 
+	    */
1778 1778 
 /*
1779 1779 
         private static function getData($url) {
1780 1780 
                 $ch = curl_init();
 
@@ -1924,7 +1924,7 @@  discard block
 
 block discarded – undo
1924 1924 
 			if ($globalTransaction) $Connection->db->commit();
1925 1925 
 		}
1926 1926 
 		return '';
1927 
-        }
1927 
+		}
1928 1928
1929 1929 
 	public static function update_airspace() {
1930 1930 
 		global $tmp_dir, $globalDBdriver;
 
@@ -1934,11 +1934,11 @@  discard block
 
 block discarded – undo
1934 1934 
 			$query = 'DROP TABLE airspace';
1935 1935 
 			try {
1936 1936 
 				$sth = $Connection->db->prepare($query);
1937 
-                    		$sth->execute();
1938 
-	                } catch(PDOException $e) {
1937 
+							$sth->execute();
1938 
+					} catch(PDOException $e) {
1939 1939 
 				return "error : ".$e->getMessage();
1940 
-	                }
1941 
-	        }
1940 
+					}
1941 
+			}
1942 1942
1943 1943
1944 1944 
 		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
 
@@ -2003,10 +2003,10 @@  discard block
 
 block discarded – undo
2003 2003 
 			$query = 'DROP TABLE countries';
2004 2004 
 			try {
2005 2005 
 				$sth = $Connection->db->prepare($query);
2006 
-            	        	$sth->execute();
2007 
-	                } catch(PDOException $e) {
2008 
-    	                	echo "error : ".$e->getMessage();
2009 
-	                }
2006 
+							$sth->execute();
2007 
+					} catch(PDOException $e) {
2008 
+							echo "error : ".$e->getMessage();
2009 
+					}
2010 2010 
 		}
2011 2011 
 		if ($globalDBdriver == 'mysql') {
2012 2012 
 			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
 
@@ -2465,7 +2465,7 @@  discard block
 
 block discarded – undo
2465 2465 
 						$error = update_db::airlines_fam();
2466 2466 
 						update_db::insert_airlines_version($airlines_md5);
2467 2467 
 					} else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
2468 
-			    } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
2468 
+				} else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
2469 2469 
 			} elseif ($globalDebug) echo "No update.";
2470 2470 
 		} else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
2471 2471 
 		if ($error != '') {
 
@@ -2956,10 +2956,10 @@  discard block
 
 block discarded – undo
2956 2956 
 		try {
2957 2957 
 			$Connection = new Connection();
2958 2958 
 			$sth = $Connection->db->prepare($query);
2959 
-                        $sth->execute();
2960 
-                } catch(PDOException $e) {
2961 
-                        return "error : ".$e->getMessage();
2962 
-                }
2959 
+						$sth->execute();
2960 
+				} catch(PDOException $e) {
2961 
+						return "error : ".$e->getMessage();
2962 
+				}
2963 2963
2964 2964 
 		$error = '';
2965 2965 
 		if ($globalDebug) echo "Notam : Download...";
 
@@ -3015,8 +3015,8 @@  discard block
 
 block discarded – undo
3015 3015 
 					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
3016 3016 
 					$data['permanent'] = 0;
3017 3017 
 				} else {
3018 
-				    $data['date_end'] = NULL;
3019 
-				    $data['permanent'] = 1;
3018 
+					$data['date_end'] = NULL;
3019 
+					$data['permanent'] = 1;
3020 3020 
 				}
3021 3021 
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
3022 3022 
 				$NOTAM = new NOTAM();
 
@@ -3090,13 +3090,13 @@  discard block
 
 block discarded – undo
3090 3090 
 		try {
3091 3091 
 			$Connection = new Connection();
3092 3092 
 			$sth = $Connection->db->prepare($query);
3093 
-                        $sth->execute();
3094 
-                } catch(PDOException $e) {
3095 
-                        return "error : ".$e->getMessage();
3096 
-                }
3097 
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
3098 
-                if ($row['nb'] > 0) return false;
3099 
-                else return true;
3093 
+						$sth->execute();
3094 
+				} catch(PDOException $e) {
3095 
+						return "error : ".$e->getMessage();
3096 
+				}
3097 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
3098 
+				if ($row['nb'] > 0) return false;
3099 
+				else return true;
3100 3100 
 	}
3101 3101
3102 3102 
 	public static function insert_last_update() {
 
@@ -3105,10 +3105,10 @@  discard block
 
 block discarded – undo
3105 3105 
 		try {
3106 3106 
 			$Connection = new Connection();
3107 3107 
 			$sth = $Connection->db->prepare($query);
3108 
-                        $sth->execute();
3109 
-                } catch(PDOException $e) {
3110 
-                        return "error : ".$e->getMessage();
3111 
-                }
3108 
+						$sth->execute();
3109 
+				} catch(PDOException $e) {
3110 
+						return "error : ".$e->getMessage();
3111 
+				}
3112 3112 
 	}
3113 3113
3114 3114 
 	public static function check_airspace_version($version) {
 
@@ -3116,13 +3116,13 @@  discard block
 
 block discarded – undo
3116 3116 
 		try {
3117 3117 
 			$Connection = new Connection();
3118 3118 
 			$sth = $Connection->db->prepare($query);
3119 
-                        $sth->execute(array(':version' => $version));
3120 
-                } catch(PDOException $e) {
3121 
-                        return "error : ".$e->getMessage();
3122 
-                }
3123 
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
3124 
-                if ($row['nb'] > 0) return true;
3125 
-                else return false;
3119 
+						$sth->execute(array(':version' => $version));
3120 
+				} catch(PDOException $e) {
3121 
+						return "error : ".$e->getMessage();
3122 
+				}
3123 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
3124 
+				if ($row['nb'] > 0) return true;
3125 
+				else return false;
3126 3126 
 	}
3127 3127
3128 3128 
 	public static function check_geoid_version($version) {
 
@@ -3130,13 +3130,13 @@  discard block
 
 block discarded – undo
3130 3130 
 		try {
3131 3131 
 			$Connection = new Connection();
3132 3132 
 			$sth = $Connection->db->prepare($query);
3133 
-                        $sth->execute(array(':version' => $version));
3134 
-                } catch(PDOException $e) {
3135 
-                        return "error : ".$e->getMessage();
3136 
-                }
3137 
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
3138 
-                if ($row['nb'] > 0) return true;
3139 
-                else return false;
3133 
+						$sth->execute(array(':version' => $version));
3134 
+				} catch(PDOException $e) {
3135 
+						return "error : ".$e->getMessage();
3136 
+				}
3137 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
3138 
+				if ($row['nb'] > 0) return true;
3139 
+				else return false;
3140 3140 
 	}
3141 3141
3142 3142 
 	public static function check_marine_identity_version($version) {
 
@@ -3237,10 +3237,10 @@  discard block
 
 block discarded – undo
3237 3237 
 		try {
3238 3238 
 			$Connection = new Connection();
3239 3239 
 			$sth = $Connection->db->prepare($query);
3240 
-                        $sth->execute(array(':version' => $version));
3241 
-                } catch(PDOException $e) {
3242 
-                        return "error : ".$e->getMessage();
3243 
-                }
3240 
+						$sth->execute(array(':version' => $version));
3241 
+				} catch(PDOException $e) {
3242 
+						return "error : ".$e->getMessage();
3243 
+				}
3244 3244 
 	}
3245 3245
3246 3246 
 	public static function insert_marine_identity_version($version) {
 
@@ -3277,13 +3277,13 @@  discard block
 
 block discarded – undo
3277 3277 
 		try {
3278 3278 
 			$Connection = new Connection();
3279 3279 
 			$sth = $Connection->db->prepare($query);
3280 
-                        $sth->execute();
3281 
-                } catch(PDOException $e) {
3282 
-                        return "error : ".$e->getMessage();
3283 
-                }
3284 
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
3285 
-                if ($row['nb'] > 0) return false;
3286 
-                else return true;
3280 
+						$sth->execute();
3281 
+				} catch(PDOException $e) {
3282 
+						return "error : ".$e->getMessage();
3283 
+				}
3284 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
3285 
+				if ($row['nb'] > 0) return false;
3286 
+				else return true;
3287 3287 
 	}
3288 3288
3289 3289 
 	public static function insert_last_notam_update() {
 
@@ -3292,10 +3292,10 @@  discard block
 
 block discarded – undo
3292 3292 
 		try {
3293 3293 
 			$Connection = new Connection();
3294 3294 
 			$sth = $Connection->db->prepare($query);
3295 
-                        $sth->execute();
3296 
-                } catch(PDOException $e) {
3297 
-                        return "error : ".$e->getMessage();
3298 
-                }
3295 
+						$sth->execute();
3296 
+				} catch(PDOException $e) {
3297 
+						return "error : ".$e->getMessage();
3298 
+				}
3299 3299 
 	}
3300 3300
3301 3301 
 	public static function check_last_airspace_update() {
 
@@ -3308,13 +3308,13 @@  discard block
 
 block discarded – undo
3308 3308 
 		try {
3309 3309 
 			$Connection = new Connection();
3310 3310 
 			$sth = $Connection->db->prepare($query);
3311 
-                        $sth->execute();
3312 
-                } catch(PDOException $e) {
3313 
-                        return "error : ".$e->getMessage();
3314 
-                }
3315 
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
3316 
-                if ($row['nb'] > 0) return false;
3317 
-                else return true;
3311 
+						$sth->execute();
3312 
+				} catch(PDOException $e) {
3313 
+						return "error : ".$e->getMessage();
3314 
+				}
3315 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
3316 
+				if ($row['nb'] > 0) return false;
3317 
+				else return true;
3318 3318 
 	}
3319 3319
3320 3320 
 	public static function insert_last_airspace_update() {
 
@@ -3323,10 +3323,10 @@  discard block
 
 block discarded – undo
3323 3323 
 		try {
3324 3324 
 			$Connection = new Connection();
3325 3325 
 			$sth = $Connection->db->prepare($query);
3326 
-                        $sth->execute();
3327 
-                } catch(PDOException $e) {
3328 
-                        return "error : ".$e->getMessage();
3329 
-                }
3326 
+						$sth->execute();
3327 
+				} catch(PDOException $e) {
3328 
+						return "error : ".$e->getMessage();
3329 
+				}
3330 3330 
 	}
3331 3331
3332 3332 
 	public static function check_last_geoid_update() {
 
@@ -3339,13 +3339,13 @@  discard block
 
 block discarded – undo
3339 3339 
 		try {
3340 3340 
 			$Connection = new Connection();
3341 3341 
 			$sth = $Connection->db->prepare($query);
3342 
-                        $sth->execute();
3343 
-                } catch(PDOException $e) {
3344 
-                        return "error : ".$e->getMessage();
3345 
-                }
3346 
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
3347 
-                if ($row['nb'] > 0) return false;
3348 
-                else return true;
3342 
+						$sth->execute();
3343 
+				} catch(PDOException $e) {
3344 
+						return "error : ".$e->getMessage();
3345 
+				}
3346 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
3347 
+				if ($row['nb'] > 0) return false;
3348 
+				else return true;
3349 3349 
 	}
3350 3350
3351 3351 
 	public static function insert_last_geoid_update() {
 
@@ -3354,10 +3354,10 @@  discard block
 
 block discarded – undo
3354 3354 
 		try {
3355 3355 
 			$Connection = new Connection();
3356 3356 
 			$sth = $Connection->db->prepare($query);
3357 
-                        $sth->execute();
3358 
-                } catch(PDOException $e) {
3359 
-                        return "error : ".$e->getMessage();
3360 
-                }
3357 
+						$sth->execute();
3358 
+				} catch(PDOException $e) {
3359 
+						return "error : ".$e->getMessage();
3360 
+				}
3361 3361 
 	}
3362 3362
3363 3363 
 	public static function check_last_owner_update() {
 
@@ -3463,13 +3463,13 @@  discard block
 
 block discarded – undo
3463 3463 
 		try {
3464 3464 
 			$Connection = new Connection();
3465 3465 
 			$sth = $Connection->db->prepare($query);
3466 
-                        $sth->execute();
3467 
-                } catch(PDOException $e) {
3468 
-                        return "error : ".$e->getMessage();
3469 
-                }
3470 
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
3471 
-                if ($row['nb'] > 0) return false;
3472 
-                else return true;
3466 
+						$sth->execute();
3467 
+				} catch(PDOException $e) {
3468 
+						return "error : ".$e->getMessage();
3469 
+				}
3470 
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
3471 
+				if ($row['nb'] > 0) return false;
3472 
+				else return true;
3473 3473 
 	}
3474 3474
3475 3475 
 	public static function insert_last_schedules_update() {
 
@@ -3649,10 +3649,10 @@  discard block
 
 block discarded – undo
3649 3649 
 		try {
3650 3650 
 			$Connection = new Connection();
3651 3651 
 			$sth = $Connection->db->prepare($query);
3652 
-                        $sth->execute();
3653 
-                } catch(PDOException $e) {
3654 
-                        return "error : ".$e->getMessage();
3655 
-                }
3652 
+						$sth->execute();
3653 
+				} catch(PDOException $e) {
3654 
+						return "error : ".$e->getMessage();
3655 
+				}
3656 3656 
 	}
3657 3657 
 	public static function delete_duplicateowner() {
3658 3658 
 		global $globalDBdriver;
 
@@ -3664,10 +3664,10 @@  discard block
 
 block discarded – undo
3664 3664 
 		try {
3665 3665 
 			$Connection = new Connection();
3666 3666 
 			$sth = $Connection->db->prepare($query);
3667 
-                        $sth->execute();
3668 
-                } catch(PDOException $e) {
3669 
-                        return "error : ".$e->getMessage();
3670 
-                }
3667 
+						$sth->execute();
3668 
+				} catch(PDOException $e) {
3669 
+						return "error : ".$e->getMessage();
3670 
+				}
3671 3671 
 	}
3672 3672
3673 3673 
 	public static function update_all() {
Please login to merge, or discard this patch.
Braces   +1190 added lines, -412 removed lines patch added patch discarded remove patch 
@@ -26,7 +26,9 @@  discard block
 
 block discarded – undo
26 26 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
27 27 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
28 28 
 		curl_setopt($ch, CURLOPT_TIMEOUT, 200);
29 
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
29 
+		if ($referer != '') {
30 
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
31 
+		}
30 32 
 		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');
31 33 
 		curl_setopt($ch, CURLOPT_FILE, $fp);
32 34 
 		curl_exec($ch);
 
@@ -37,12 +39,16 @@  discard block
 
 block discarded – undo
37 39 
 	public static function gunzip($in_file,$out_file_name = '') {
38 40 
 		//echo $in_file.' -> '.$out_file_name."\n";
39 41 
 		$buffer_size = 4096; // read 4kb at a time
40 
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file);
42 
+		if ($out_file_name == '') {
43 
+			$out_file_name = str_replace('.gz', '', $in_file);
44 
+		}
41 45 
 		if ($in_file != '' && file_exists($in_file)) {
42 46 
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
43 
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
44 
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
45 
-			else {
47 
+			if (function_exists('gzopen')) {
48 
+				$file = gzopen($in_file,'rb');
49 
+			} elseif (function_exists('gzopen64')) {
50 
+				$file = gzopen64($in_file,'rb');
51 
+			} else {
46 52 
 				echo 'gzopen not available';
47 53 
 				die;
48 54 
 			}
 
@@ -63,8 +69,12 @@  discard block
 
 block discarded – undo
63 69 
 			if ($res === TRUE) {
64 70 
 				$zip->extractTo($path);
65 71 
 				$zip->close();
66 
-			} else return false;
67 
-		} else return false;
72 
+			} else {
73 
+				return false;
74 
+			}
75 
+		} else {
76 
+			return false;
77 
+		}
68 78 
 	}
69 79
70 80 
 	public static function connect_sqlite($database) {
 
@@ -79,7 +89,9 @@  discard block
 
 block discarded – undo
79 89 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
80 90 
 		global $globalDebug, $globalTransaction;
81 91 
 		//$query = 'TRUNCATE TABLE routes';
82 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
92 
+		if ($globalDebug) {
93 
+			echo " - Delete previous routes from DB -";
94 
+		}
83 95 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
84 96 
 		$Connection = new Connection();
85 97 
 		try {
 
@@ -90,7 +102,9 @@  discard block
 
 block discarded – undo
90 102 
                         return "error : ".$e->getMessage();
91 103 
                 }
92 104
93 
-    		if ($globalDebug) echo " - Add routes to DB -";
105 
+    		if ($globalDebug) {
106 
+    			echo " - Add routes to DB -";
107 
+    		}
94 108 
     		update_db::connect_sqlite($database_file);
95 109 
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
96 110 
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
 
@@ -105,15 +119,21 @@  discard block
 
 block discarded – undo
105 119 
 		$Connection = new Connection();
106 120 
 		$sth_dest = $Connection->db->prepare($query_dest);
107 121 
 		try {
108 
-			if ($globalTransaction) $Connection->db->beginTransaction();
122 
+			if ($globalTransaction) {
123 
+				$Connection->db->beginTransaction();
124 
+			}
109 125 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
110 126 
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
111 127 
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
112 128 
 				$sth_dest->execute($query_dest_values);
113 129 
             		}
114 
-			if ($globalTransaction) $Connection->db->commit();
130 
+			if ($globalTransaction) {
131 
+				$Connection->db->commit();
132 
+			}
115 133 
 		} catch(PDOException $e) {
116 
-			if ($globalTransaction) $Connection->db->rollBack();
134 
+			if ($globalTransaction) {
135 
+				$Connection->db->rollBack();
136 
+			}
117 137 
 			return "error : ".$e->getMessage();
118 138 
 		}
119 139 
                 return '';
 
@@ -121,7 +141,9 @@  discard block
 
 block discarded – undo
121 141 
 	public static function retrieve_route_oneworld($database_file) {
122 142 
 		global $globalDebug, $globalTransaction;
123 143 
 		//$query = 'TRUNCATE TABLE routes';
124 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
144 
+		if ($globalDebug) {
145 
+			echo " - Delete previous routes from DB -";
146 
+		}
125 147 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
126 148 
 		$Connection = new Connection();
127 149 
 		try {
 
@@ -132,14 +154,18 @@  discard block
 
 block discarded – undo
132 154 
                         return "error : ".$e->getMessage();
133 155 
                 }
134 156
135 
-    		if ($globalDebug) echo " - Add routes to DB -";
157 
+    		if ($globalDebug) {
158 
+    			echo " - Add routes to DB -";
159 
+    		}
136 160 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
137 161 
 		$Spotter = new Spotter();
138 162 
 		if ($fh = fopen($database_file,"r")) {
139 163 
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
140 164 
 			$Connection = new Connection();
141 165 
 			$sth_dest = $Connection->db->prepare($query_dest);
142 
-			if ($globalTransaction) $Connection->db->beginTransaction();
166 
+			if ($globalTransaction) {
167 
+				$Connection->db->beginTransaction();
168 
+			}
143 169 
 			while (!feof($fh)) {
144 170 
 				$line = fgetcsv($fh,9999,',');
145 171 
 				if ($line[0] != '') {
 
@@ -148,13 +174,17 @@  discard block
 
 block discarded – undo
148 174 
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
149 175 
 							$sth_dest->execute($query_dest_values);
150 176 
 						} catch(PDOException $e) {
151 
-							if ($globalTransaction) $Connection->db->rollBack();
177 
+							if ($globalTransaction) {
178 
+								$Connection->db->rollBack();
179 
+							}
152 180 
 							return "error : ".$e->getMessage();
153 181 
 						}
154 182 
 					}
155 183 
 				}
156 184 
 			}
157 
-			if ($globalTransaction) $Connection->db->commit();
185 
+			if ($globalTransaction) {
186 
+				$Connection->db->commit();
187 
+			}
158 188 
 		}
159 189 
                 return '';
160 190 
 	}
 
@@ -162,7 +192,9 @@  discard block
 
 block discarded – undo
162 192 
 	public static function retrieve_route_skyteam($database_file) {
163 193 
 		global $globalDebug, $globalTransaction;
164 194 
 		//$query = 'TRUNCATE TABLE routes';
165 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
195 
+		if ($globalDebug) {
196 
+			echo " - Delete previous routes from DB -";
197 
+		}
166 198 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
167 199 
 		$Connection = new Connection();
168 200 
 		try {
 
@@ -173,7 +205,9 @@  discard block
 
 block discarded – undo
173 205 
                         return "error : ".$e->getMessage();
174 206 
                 }
175 207
176 
-    		if ($globalDebug) echo " - Add routes to DB -";
208 
+    		if ($globalDebug) {
209 
+    			echo " - Add routes to DB -";
210 
+    		}
177 211
178 212 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
179 213 
 		$Spotter = new Spotter();
 
@@ -182,7 +216,9 @@  discard block
 
 block discarded – undo
182 216 
 			$Connection = new Connection();
183 217 
 			$sth_dest = $Connection->db->prepare($query_dest);
184 218 
 			try {
185 
-				if ($globalTransaction) $Connection->db->beginTransaction();
219 
+				if ($globalTransaction) {
220 
+					$Connection->db->beginTransaction();
221 
+				}
186 222 
 				while (!feof($fh)) {
187 223 
 					$line = fgetcsv($fh,9999,',');
188 224 
 					if ($line[0] != '') {
 
@@ -193,9 +229,13 @@  discard block
 
 block discarded – undo
193 229 
 						}
194 230 
 					}
195 231 
 				}
196 
-				if ($globalTransaction) $Connection->db->commit();
232 
+				if ($globalTransaction) {
233 
+					$Connection->db->commit();
234 
+				}
197 235 
 			} catch(PDOException $e) {
198 
-				if ($globalTransaction) $Connection->db->rollBack();
236 
+				if ($globalTransaction) {
237 
+					$Connection->db->rollBack();
238 
+				}
199 239 
 				return "error : ".$e->getMessage();
200 240 
 			}
201 241 
 		}
 
@@ -238,11 +278,16 @@  discard block
 
 block discarded – undo
238 278 
 		$sth_dest = $Connection->db->prepare($query_dest);
239 279 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
240 280 
 		try {
241 
-			if ($globalTransaction) $Connection->db->beginTransaction();
281 
+			if ($globalTransaction) {
282 
+				$Connection->db->beginTransaction();
283 
+			}
242 284 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
243 285 
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
244 
-				if ($values['UserString4'] == 'M') $type = 'military';
245 
-				else $type = null;
286 
+				if ($values['UserString4'] == 'M') {
287 
+					$type = 'military';
288 
+				} else {
289 
+					$type = null;
290 
+				}
246 291 
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
247 292 
 				$sth_dest->execute($query_dest_values);
248 293 
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
 
@@ -250,7 +295,9 @@  discard block
 
 block discarded – undo
250 295 
 				    $sth_dest_owner->execute($query_dest_owner_values);
251 296 
 				}
252 297 
             		}
253 
-			if ($globalTransaction) $Connection->db->commit();
298 
+			if ($globalTransaction) {
299 
+				$Connection->db->commit();
300 
+			}
254 301 
 		} catch(PDOException $e) {
255 302 
 			return "error : ".$e->getMessage();
256 303 
 		}
 
@@ -287,7 +334,9 @@  discard block
 
 block discarded – undo
287 334 
 			$Connection = new Connection();
288 335 
 			$sth_dest = $Connection->db->prepare($query_dest);
289 336 
 			try {
290 
-				if ($globalTransaction) $Connection->db->beginTransaction();
337 
+				if ($globalTransaction) {
338 
+					$Connection->db->beginTransaction();
339 
+				}
291 340 
             			while (!feof($fh)) {
292 341 
             				$values = array();
293 342 
             				$line = $Common->hex2str(fgets($fh,9999));
 
@@ -298,7 +347,9 @@  discard block
 
 block discarded – undo
298 347 
             				// Check if we can find ICAO, else set it to GLID
299 348 
             				$aircraft_name_split = explode(' ',$aircraft_name);
300 349 
             				$search_more = '';
301 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
350 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
351 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
352 
+            				}
302 353 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
303 354 
             				$sth_search = $Connection->db->prepare($query_search);
304 355 
 					try {
 
@@ -311,7 +362,9 @@  discard block
 
 block discarded – undo
311 362 
 					} catch(PDOException $e) {
312 363 
 						return "error : ".$e->getMessage();
313 364 
 					}
314 
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
365 
+					if (!isset($values['ICAOTypeCode'])) {
366 
+						$values['ICAOTypeCode'] = 'GLID';
367 
+					}
315 368 
 					// Add data to db
316 369 
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
317 370 
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 
@@ -320,7 +373,9 @@  discard block
 
 block discarded – undo
320 373 
 						$sth_dest->execute($query_dest_values);
321 374 
 					}
322 375 
 				}
323 
-				if ($globalTransaction) $Connection->db->commit();
376 
+				if ($globalTransaction) {
377 
+					$Connection->db->commit();
378 
+				}
324 379 
 			} catch(PDOException $e) {
325 380 
 				return "error : ".$e->getMessage();
326 381 
 			}
 
@@ -356,7 +411,9 @@  discard block
 
 block discarded – undo
356 411 
 			$Connection = new Connection();
357 412 
 			$sth_dest = $Connection->db->prepare($query_dest);
358 413 
 			try {
359 
-				if ($globalTransaction) $Connection->db->beginTransaction();
414 
+				if ($globalTransaction) {
415 
+					$Connection->db->beginTransaction();
416 
+				}
360 417 
 				$tmp = fgetcsv($fh,9999,',',"'");
361 418 
             			while (!feof($fh)) {
362 419 
             				$line = fgetcsv($fh,9999,',',"'");
 
@@ -370,13 +427,17 @@  discard block
 
 block discarded – undo
370 427 
             				// Check if we can find ICAO, else set it to GLID
371 428 
             				$aircraft_name_split = explode(' ',$aircraft_name);
372 429 
             				$search_more = '';
373 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
430 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
431 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
432 
+            				}
374 433 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
375 434 
             				$sth_search = $Connection->db->prepare($query_search);
376 435 
 					try {
377 436 
                                     		$sth_search->execute();
378 437 
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
379 
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
438 
+	            				if (isset($result['icao']) && $result['icao'] != '') {
439 
+	            					$values['ICAOTypeCode'] = $result['icao'];
440 
+	            				}
380 441 
 					} catch(PDOException $e) {
381 442 
 						return "error : ".$e->getMessage();
382 443 
 					}
 
@@ -389,7 +450,9 @@  discard block
 
 block discarded – undo
389 450 
 						$sth_dest->execute($query_dest_values);
390 451 
 					}
391 452 
 				}
392 
-				if ($globalTransaction) $Connection->db->commit();
453 
+				if ($globalTransaction) {
454 
+					$Connection->db->commit();
455 
+				}
393 456 
 			} catch(PDOException $e) {
394 457 
 				return "error : ".$e->getMessage();
395 458 
 			}
 
@@ -428,7 +491,9 @@  discard block
 
 block discarded – undo
428 491 
 			$sth_dest = $Connection->db->prepare($query_dest);
429 492 
 			$sth_modes = $Connection->db->prepare($query_modes);
430 493 
 			try {
431 
-				if ($globalTransaction) $Connection->db->beginTransaction();
494 
+				if ($globalTransaction) {
495 
+					$Connection->db->beginTransaction();
496 
+				}
432 497 
 				$tmp = fgetcsv($fh,9999,',','"');
433 498 
             			while (!feof($fh)) {
434 499 
             				$line = fgetcsv($fh,9999,',','"');
 
@@ -438,16 +503,22 @@  discard block
 
 block discarded – undo
438 503 
             				    $values['registration'] = $line[0];
439 504 
             				    $values['base'] = $line[4];
440 505 
             				    $values['owner'] = $line[5];
441 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
442 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
506 
+            				    if ($line[6] == '') {
507 
+            				    	$values['date_first_reg'] = null;
508 
+            				    } else {
509 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
510 
+					    }
443 511 
 					    $values['cancel'] = $line[7];
444 512 
 					} elseif ($country == 'EI') {
445 513 
 					    // TODO : add modeS & reg to aircraft_modes
446 514 
             				    $values['registration'] = $line[0];
447 515 
             				    $values['base'] = $line[3];
448 516 
             				    $values['owner'] = $line[2];
449 
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
450 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
517 
+            				    if ($line[1] == '') {
518 
+            				    	$values['date_first_reg'] = null;
519 
+            				    } else {
520 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
521 
+					    }
451 522 
 					    $values['cancel'] = '';
452 523 
 					    $values['modes'] = $line[7];
453 524 
 					    $values['icao'] = $line[8];
 
@@ -466,16 +537,22 @@  discard block
 
 block discarded – undo
466 537 
             				    $values['registration'] = $line[3];
467 538 
             				    $values['base'] = null;
468 539 
             				    $values['owner'] = $line[5];
469 
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
470 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
540 
+            				    if ($line[18] == '') {
541 
+            				    	$values['date_first_reg'] = null;
542 
+            				    } else {
543 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
544 
+					    }
471 545 
 					    $values['cancel'] = '';
472 546 
 					} elseif ($country == 'VH') {
473 547 
 					    // TODO : add modeS & reg to aircraft_modes
474 548 
             				    $values['registration'] = $line[0];
475 549 
             				    $values['base'] = null;
476 550 
             				    $values['owner'] = $line[12];
477 
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
478 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
551 
+            				    if ($line[28] == '') {
552 
+            				    	$values['date_first_reg'] = null;
553 
+            				    } else {
554 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
555 
+					    }
479 556
480 557 
 					    $values['cancel'] = $line[39];
481 558 
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
 
@@ -494,29 +571,41 @@  discard block
 
 block discarded – undo
494 571 
             				    $values['registration'] = $line[0];
495 572 
             				    $values['base'] = null;
496 573 
             				    $values['owner'] = $line[8];
497 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
498 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
574 
+            				    if ($line[7] == '') {
575 
+            				    	$values['date_first_reg'] = null;
576 
+            				    } else {
577 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
578 
+					    }
499 579 
 					    $values['cancel'] = '';
500 580 
 					} elseif ($country == 'PP') {
501 581 
             				    $values['registration'] = $line[0];
502 582 
             				    $values['base'] = null;
503 583 
             				    $values['owner'] = $line[4];
504 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
505 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
584 
+            				    if ($line[6] == '') {
585 
+            				    	$values['date_first_reg'] = null;
586 
+            				    } else {
587 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
588 
+					    }
506 589 
 					    $values['cancel'] = $line[7];
507 590 
 					} elseif ($country == 'E7') {
508 591 
             				    $values['registration'] = $line[0];
509 592 
             				    $values['base'] = null;
510 593 
             				    $values['owner'] = $line[4];
511 
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
512 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
594 
+            				    if ($line[5] == '') {
595 
+            				    	$values['date_first_reg'] = null;
596 
+            				    } else {
597 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
598 
+					    }
513 599 
 					    $values['cancel'] = '';
514 600 
 					} elseif ($country == '8Q') {
515 601 
             				    $values['registration'] = $line[0];
516 602 
             				    $values['base'] = null;
517 603 
             				    $values['owner'] = $line[3];
518 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
519 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
604 
+            				    if ($line[7] == '') {
605 
+            				    	$values['date_first_reg'] = null;
606 
+            				    } else {
607 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
608 
+					    }
520 609 
 					    $values['cancel'] = '';
521 610 
 					} elseif ($country == 'ZK') {
522 611 
             				    $values['registration'] = $line[0];
 
@@ -561,7 +650,9 @@  discard block
 
 block discarded – undo
561 650 
 						$sth_modes->execute($query_modes_values);
562 651 
 					}
563 652 
 				}
564 
-				if ($globalTransaction) $Connection->db->commit();
653 
+				if ($globalTransaction) {
654 
+					$Connection->db->commit();
655 
+				}
565 656 
 			} catch(PDOException $e) {
566 657 
 				return "error : ".$e->getMessage();
567 658 
 			}
 
@@ -697,25 +788,45 @@  discard block
 
 block discarded – undo
697 788 
 		    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
698 789 
 		$Connection = new Connection();
699 790 
 		$sth_dest = $Connection->db->prepare($query_dest);
700 
-		if ($globalTransaction) $Connection->db->beginTransaction();
791 
+		if ($globalTransaction) {
792 
+			$Connection->db->beginTransaction();
793 
+		}
701 794
702 795 
 		$i = 0;
703 796 
 		while($row = sparql_fetch_array($result))
704 797 
 		{
705 798 
 			if ($i >= 1) {
706 799 
 			//print_r($row);
707 
-			if (!isset($row['iata'])) $row['iata'] = '';
708 
-			if (!isset($row['icao'])) $row['icao'] = '';
709 
-			if (!isset($row['type'])) $row['type'] = '';
710 
-			if (!isset($row['altitude'])) $row['altitude'] = '';
800 
+			if (!isset($row['iata'])) {
801 
+				$row['iata'] = '';
802 
+			}
803 
+			if (!isset($row['icao'])) {
804 
+				$row['icao'] = '';
805 
+			}
806 
+			if (!isset($row['type'])) {
807 
+				$row['type'] = '';
808 
+			}
809 
+			if (!isset($row['altitude'])) {
810 
+				$row['altitude'] = '';
811 
+			}
711 812 
 			if (isset($row['city_bis'])) {
712 813 
 				$row['city'] = $row['city_bis'];
713 814 
 			}
714 
-			if (!isset($row['city'])) $row['city'] = '';
715 
-			if (!isset($row['country'])) $row['country'] = '';
716 
-			if (!isset($row['homepage'])) $row['homepage'] = '';
717 
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
718 
-			if (!isset($row['name'])) continue;
815 
+			if (!isset($row['city'])) {
816 
+				$row['city'] = '';
817 
+			}
818 
+			if (!isset($row['country'])) {
819 
+				$row['country'] = '';
820 
+			}
821 
+			if (!isset($row['homepage'])) {
822 
+				$row['homepage'] = '';
823 
+			}
824 
+			if (!isset($row['wikipedia_page'])) {
825 
+				$row['wikipedia_page'] = '';
826 
+			}
827 
+			if (!isset($row['name'])) {
828 
+				continue;
829 
+			}
719 830 
 			if (!isset($row['image'])) {
720 831 
 				$row['image'] = '';
721 832 
 				$row['image_thumb'] = '';
 
@@ -771,7 +882,9 @@  discard block
 
 block discarded – undo
771 882
772 883 
 			$i++;
773 884 
 		}
774 
-		if ($globalTransaction) $Connection->db->commit();
885 
+		if ($globalTransaction) {
886 
+			$Connection->db->commit();
887 
+		}
775 888 
 		/*
776 889 
 		echo "Delete duplicate rows...\n";
777 890 
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
 
@@ -814,7 +927,9 @@  discard block
 
 block discarded – undo
814 927 
 		$delimiter = ',';
815 928 
 		$out_file = $tmp_dir.'airports.csv';
816 929 
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
817 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
930 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
931 
+			return FALSE;
932 
+		}
818 933 
 		echo "Add data from ourairports.com...\n";
819 934
820 935 
 		$header = NULL;
 
@@ -824,8 +939,9 @@  discard block
 
 block discarded – undo
824 939 
 			//$Connection->db->beginTransaction();
825 940 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
826 941 
 			{
827 
-				if(!$header) $header = $row;
828 
-				else {
942 
+				if(!$header) {
943 
+					$header = $row;
944 
+				} else {
829 945 
 					$data = array();
830 946 
 					$data = array_combine($header, $row);
831 947 
 					try {
 
@@ -866,7 +982,9 @@  discard block
 
 block discarded – undo
866 982 
 		echo "Download data from another free database...\n";
867 983 
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
868 984 
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
869 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
985 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
986 
+			return FALSE;
987 
+		}
870 988 
 		update_db::unzip($out_file);
871 989 
 		$header = NULL;
872 990 
 		echo "Add data from another free database...\n";
 
@@ -877,8 +995,9 @@  discard block
 
 block discarded – undo
877 995 
 			//$Connection->db->beginTransaction();
878 996 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
879 997 
 			{
880 
-				if(!$header) $header = $row;
881 
-				else {
998 
+				if(!$header) {
999 
+					$header = $row;
1000 
+				} else {
882 1001 
 					$data = $row;
883 1002
884 1003 
 					$query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao';
 
@@ -1047,7 +1166,9 @@  discard block
 
 block discarded – undo
1047 1166 
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
1048 1167 
 		{
1049 1168 
 			$i = 0;
1050 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1169 
+			if ($globalTransaction) {
1170 
+				$Connection->db->beginTransaction();
1171 
+			}
1051 1172 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1052 1173 
 			{
1053 1174 
 				if ($i > 0) {
 
@@ -1060,7 +1181,9 @@  discard block
 
 block discarded – undo
1060 1181 
 					}
1061 1182 
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
1062 1183 
 					if (!empty($result_search)) {
1063 
-						if ($globalDebug) echo '.';
1184 
+						if ($globalDebug) {
1185 
+							echo '.';
1186 
+						}
1064 1187 
 							//if ($globalDBdriver == 'mysql') {
1065 1188 
 							//	$queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao';
1066 1189 
 							//} else {
 
@@ -1082,8 +1205,12 @@  discard block
 
 block discarded – undo
1082 1205 
 						}
1083 1206 
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
1084 1207 
 						if (!empty($result_search_mfr)) {
1085 
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
1086 
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
1208 
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
1209 
+								$data[16] = $data[23];
1210 
+							}
1211 
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
1212 
+								$data[16] = $data[15];
1213 
+							}
1087 1214 
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
1088 1215 
 							try {
1089 1216 
 								$sthf = $Connection->db->prepare($queryf);
 
@@ -1094,7 +1221,9 @@  discard block
 
 block discarded – undo
1094 1221 
 						}
1095 1222 
 					}
1096 1223 
 					if (strtotime($data[29]) > time()) {
1097 
-						if ($globalDebug) echo 'i';
1224 
+						if ($globalDebug) {
1225 
+							echo 'i';
1226 
+						}
1098 1227 
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
1099 1228 
 						try {
1100 1229 
 							$sth = $Connection->db->prepare($query);
 
@@ -1105,13 +1234,19 @@  discard block
 
 block discarded – undo
1105 1234 
 					}
1106 1235 
 				}
1107 1236 
 				if ($i % 90 == 0) {
1108 
-					if ($globalTransaction) $Connection->db->commit();
1109 
-					if ($globalTransaction) $Connection->db->beginTransaction();
1237 
+					if ($globalTransaction) {
1238 
+						$Connection->db->commit();
1239 
+					}
1240 
+					if ($globalTransaction) {
1241 
+						$Connection->db->beginTransaction();
1242 
+					}
1110 1243 
 				}
1111 1244 
 				$i++;
1112 1245 
 			}
1113 1246 
 			fclose($handle);
1114 
-			if ($globalTransaction) $Connection->db->commit();
1247 
+			if ($globalTransaction) {
1248 
+				$Connection->db->commit();
1249 
+			}
1115 1250 
 		}
1116 1251 
 		return '';
1117 1252 
 	}
 
@@ -1131,11 +1266,15 @@  discard block
 
 block discarded – undo
1131 1266 
 		if (($handle = fopen($tmp_dir.'modes.tsv', 'r')) !== FALSE)
1132 1267 
 		{
1133 1268 
 			$i = 0;
1134 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1269 
+			if ($globalTransaction) {
1270 
+				$Connection->db->beginTransaction();
1271 
+			}
1135 1272 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1136 1273 
 			{
1137 1274 
 				if ($i > 0) {
1138 
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1275 
+					if ($data[1] == 'NULL') {
1276 
+						$data[1] = $data[0];
1277 
+					}
1139 1278 
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
1140 1279 
 					try {
1141 1280 
 						$sth = $Connection->db->prepare($query);
 
@@ -1147,7 +1286,9 @@  discard block
 
 block discarded – undo
1147 1286 
 				$i++;
1148 1287 
 			}
1149 1288 
 			fclose($handle);
1150 
-			if ($globalTransaction) $Connection->db->commit();
1289 
+			if ($globalTransaction) {
1290 
+				$Connection->db->commit();
1291 
+			}
1151 1292 
 		}
1152 1293 
 		return '';
1153 1294 
 	}
 
@@ -1179,11 +1320,15 @@  discard block
 
 block discarded – undo
1179 1320 
 		if (($handle = fopen($tmp_dir.'airlines.tsv', 'r')) !== FALSE)
1180 1321 
 		{
1181 1322 
 			$i = 0;
1182 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1323 
+			if ($globalTransaction) {
1324 
+				$Connection->db->beginTransaction();
1325 
+			}
1183 1326 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1184 1327 
 			{
1185 1328 
 				if ($i > 0) {
1186 
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1329 
+					if ($data[1] == 'NULL') {
1330 
+						$data[1] = $data[0];
1331 
+					}
1187 1332 
 					$query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)';
1188 1333 
 					try {
1189 1334 
 						$sth = $Connection->db->prepare($query);
 
@@ -1195,7 +1340,9 @@  discard block
 
 block discarded – undo
1195 1340 
 				$i++;
1196 1341 
 			}
1197 1342 
 			fclose($handle);
1198 
-			if ($globalTransaction) $Connection->db->commit();
1343 
+			if ($globalTransaction) {
1344 
+				$Connection->db->commit();
1345 
+			}
1199 1346 
 		}
1200 1347 
 		/*
1201 1348 
 		$query = "UNLOCK TABLES";
 
@@ -1225,7 +1372,9 @@  discard block
 
 block discarded – undo
1225 1372 
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
1226 1373 
 		{
1227 1374 
 			$i = 0;
1228 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1375 
+			if ($globalTransaction) {
1376 
+				$Connection->db->beginTransaction();
1377 
+			}
1229 1378 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1230 1379 
 			{
1231 1380 
 				if ($i > 0) {
 
@@ -1241,7 +1390,9 @@  discard block
 
 block discarded – undo
1241 1390 
 				$i++;
1242 1391 
 			}
1243 1392 
 			fclose($handle);
1244 
-			if ($globalTransaction) $Connection->db->commit();
1393 
+			if ($globalTransaction) {
1394 
+				$Connection->db->commit();
1395 
+			}
1245 1396 
 		}
1246 1397 
 		return '';
1247 1398 
         }
 
@@ -1261,7 +1412,9 @@  discard block
 
 block discarded – undo
1261 1412 
 		if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE)
1262 1413 
 		{
1263 1414 
 			$i = 0;
1264 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1415 
+			if ($globalTransaction) {
1416 
+				$Connection->db->beginTransaction();
1417 
+			}
1265 1418 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1266 1419 
 			{
1267 1420 
 				if ($i > 0) {
 
@@ -1271,19 +1424,25 @@  discard block
 
 block discarded – undo
1271 1424 
 						$sth = $Connection->db->prepare($query);
1272 1425 
 						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
1273 1426 
 					} catch(PDOException $e) {
1274 
-						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
1427 
+						if ($globalDebug) {
1428 
+							echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
1429 
+						}
1275 1430 
 						die();
1276 1431 
 					}
1277 1432 
 				}
1278 1433 
 				if ($globalTransaction && $i % 2000 == 0) {
1279 1434 
 					$Connection->db->commit();
1280 
-					if ($globalDebug) echo '.';
1435 
+					if ($globalDebug) {
1436 
+						echo '.';
1437 
+					}
1281 1438 
 					$Connection->db->beginTransaction();
1282 1439 
 				}
1283 1440 
 				$i++;
1284 1441 
 			}
1285 1442 
 			fclose($handle);
1286 
-			if ($globalTransaction) $Connection->db->commit();
1443 
+			if ($globalTransaction) {
1444 
+				$Connection->db->commit();
1445 
+			}
1287 1446 
 		}
1288 1447 
 		return '';
1289 1448 
 	}
 
@@ -1303,7 +1462,9 @@  discard block
 
 block discarded – undo
1303 1462 
 		if (($handle = fopen($tmp_dir.'block.tsv', 'r')) !== FALSE)
1304 1463 
 		{
1305 1464 
 			$i = 0;
1306 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1465 
+			if ($globalTransaction) {
1466 
+				$Connection->db->beginTransaction();
1467 
+			}
1307 1468 
 			while (($data = fgets($handle, 1000)) !== FALSE)
1308 1469 
 			{
1309 1470 
 				$query = 'INSERT INTO aircraft_block (callSign,Source) VALUES (:callSign,:source)';
 
@@ -1311,18 +1472,24 @@  discard block
 
 block discarded – undo
1311 1472 
 					$sth = $Connection->db->prepare($query);
1312 1473 
 					$sth->execute(array(':callSign' => trim($data),':source' => 'website_fam'));
1313 1474 
 				} catch(PDOException $e) {
1314 
-					if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".$data;
1475 
+					if ($globalDebug) {
1476 
+						echo "error: ".$e->getMessage()." - data: ".$data;
1477 
+					}
1315 1478 
 					die();
1316 1479 
 				}
1317 1480 
 				if ($globalTransaction && $i % 2000 == 0) {
1318 1481 
 					$Connection->db->commit();
1319 
-					if ($globalDebug) echo '.';
1482 
+					if ($globalDebug) {
1483 
+						echo '.';
1484 
+					}
1320 1485 
 					$Connection->db->beginTransaction();
1321 1486 
 				}
1322 1487 
 				$i++;
1323 1488 
 			}
1324 1489 
 			fclose($handle);
1325 
-			if ($globalTransaction) $Connection->db->commit();
1490 
+			if ($globalTransaction) {
1491 
+				$Connection->db->commit();
1492 
+			}
1326 1493 
 		}
1327 1494 
 		return '';
1328 1495 
         }
 
@@ -1347,7 +1514,9 @@  discard block
 
 block discarded – undo
1347 1514 
 			$i = 0;
1348 1515 
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1349 1516 
 			//$Connection->db->beginTransaction();
1350 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1517 
+			if ($globalTransaction) {
1518 
+				$Connection->db->beginTransaction();
1519 
+			}
1351 1520 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1352 1521 
 			{
1353 1522 
 				if ($i > 0) {
 
@@ -1363,7 +1532,9 @@  discard block
 
 block discarded – undo
1363 1532 
 				$i++;
1364 1533 
 			}
1365 1534 
 			fclose($handle);
1366 
-			if ($globalTransaction) $Connection->db->commit();
1535 
+			if ($globalTransaction) {
1536 
+				$Connection->db->commit();
1537 
+			}
1367 1538 
 		}
1368 1539 
 		return '';
1369 1540 
         }
 
@@ -1383,7 +1554,9 @@  discard block
 
 block discarded – undo
1383 1554 
 		if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE)
1384 1555 
 		{
1385 1556 
 			$i = 0;
1386 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1557 
+			if ($globalTransaction) {
1558 
+				$Connection->db->beginTransaction();
1559 
+			}
1387 1560 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1388 1561 
 			{
1389 1562 
 				if ($i > 0) {
 
@@ -1400,7 +1573,9 @@  discard block
 
 block discarded – undo
1400 1573 
 				$i++;
1401 1574 
 			}
1402 1575 
 			fclose($handle);
1403 
-			if ($globalTransaction) $Connection->db->commit();
1576 
+			if ($globalTransaction) {
1577 
+				$Connection->db->commit();
1578 
+			}
1404 1579 
 		}
1405 1580 
 		return '';
1406 1581 
 	}
 
@@ -1419,7 +1594,9 @@  discard block
 
 block discarded – undo
1419 1594 
 		$Connection = new Connection();
1420 1595 
 		if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE)
1421 1596 
 		{
1422 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1597 
+			if ($globalTransaction) {
1598 
+				$Connection->db->beginTransaction();
1599 
+			}
1423 1600 
 			while (($data = fgetcsv($handle, 1000)) !== FALSE)
1424 1601 
 			{
1425 1602 
 				$query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL';
 
@@ -1434,7 +1611,9 @@  discard block
 
 block discarded – undo
1434 1611 
 				}
1435 1612 
 			}
1436 1613 
 			fclose($handle);
1437 
-			if ($globalTransaction) $Connection->db->commit();
1614 
+			if ($globalTransaction) {
1615 
+				$Connection->db->commit();
1616 
+			}
1438 1617 
 		}
1439 1618 
 		return '';
1440 1619 
         }
 
@@ -1510,9 +1689,14 @@  discard block
 
 block discarded – undo
1510 1689 
 				if ($i > 0 && $data[0] != '') {
1511 1690 
 					$sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]);
1512 1691 
 					$period = str_replace(',','',$data[14]);
1513 
-					if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60;
1514 
-					if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18]));
1515 
-					else $launch_date = NULL;
1692 
+					if (!empty($period) && strpos($period,'days')) {
1693 
+						$period = str_replace(' days','',$period)*24*60;
1694 
+					}
1695 
+					if ($data[18] != '') {
1696 
+						$launch_date = date('Y-m-d',strtotime($data[18]));
1697 
+					} else {
1698 
+						$launch_date = NULL;
1699 
+					}
1516 1700 
 					$data = array_map(function($value) {
1517 1701 
 						return trim($value) === '' ? null : $value;
1518 1702 
 					}, $data);
 
@@ -1875,7 +2059,9 @@  discard block
 
 block discarded – undo
1875 2059 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1876 2060 
 		{
1877 2061 
 			$i = 0;
1878 
-			if ($globalTransaction) $Connection->db->beginTransaction();
2062 
+			if ($globalTransaction) {
2063 
+				$Connection->db->beginTransaction();
2064 
+			}
1879 2065 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1880 2066 
 			{
1881 2067 
 				$i++;
 
@@ -1903,7 +2089,9 @@  discard block
 
 block discarded – undo
1903 2089 
 				}
1904 2090 
 			}
1905 2091 
 			fclose($handle);
1906 
-			if ($globalTransaction) $Connection->db->commit();
2092 
+			if ($globalTransaction) {
2093 
+				$Connection->db->commit();
2094 
+			}
1907 2095 
 		}
1908 2096 
 		return '';
1909 2097 
 	}
 
@@ -1946,7 +2134,9 @@  discard block
 
 block discarded – undo
1946 2134 
 		$Connection = new Connection();
1947 2135 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1948 2136 
 		{
1949 
-			if ($globalTransaction) $Connection->db->beginTransaction();
2137 
+			if ($globalTransaction) {
2138 
+				$Connection->db->beginTransaction();
2139 
+			}
1950 2140 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1951 2141 
 			{
1952 2142 
 				if(count($row) > 1) {
 
@@ -1960,7 +2150,9 @@  discard block
 
 block discarded – undo
1960 2150 
 				}
1961 2151 
 			}
1962 2152 
 			fclose($handle);
1963 
-			if ($globalTransaction) $Connection->db->commit();
2153 
+			if ($globalTransaction) {
2154 
+				$Connection->db->commit();
2155 
+			}
1964 2156 
 		}
1965 2157 
 		return '';
1966 2158 
         }
 
@@ -1980,8 +2172,9 @@  discard block
 
 block discarded – undo
1980 2172 
 	        }
1981 2173
1982 2174
1983 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1984 
-		else {
2175 
+		if ($globalDBdriver == 'mysql') {
2176 
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
2177 
+		} else {
1985 2178 
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
1986 2179 
 			$query = "CREATE EXTENSION postgis";
1987 2180 
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
 
@@ -2000,7 +2193,9 @@  discard block
 
 block discarded – undo
2000 2193 
 		global $tmp_dir, $globalDebug;
2001 2194 
 		include_once('class.create_db.php');
2002 2195 
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
2003 
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
2196 
+		if ($globalDebug) {
2197 
+			echo "NOTAM from FlightAirMap website : Download...";
2198 
+		}
2004 2199 
 		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5');
2005 2200 
 		$error = '';
2006 2201 
 		if (file_exists($tmp_dir.'notam.txt.gz.md5')) {
 
@@ -2010,20 +2205,34 @@  discard block
 
 block discarded – undo
2010 2205 
 				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
2011 2206 
 				if (file_exists($tmp_dir.'notam.txt.gz')) {
2012 2207 
 					if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) {
2013 
-						if ($globalDebug) echo "Gunzip...";
2208 
+						if ($globalDebug) {
2209 
+							echo "Gunzip...";
2210 
+						}
2014 2211 
 						update_db::gunzip($tmp_dir.'notam.txt.gz');
2015 
-						if ($globalDebug) echo "Add to DB...";
2212 
+						if ($globalDebug) {
2213 
+							echo "Add to DB...";
2214 
+						}
2016 2215 
 						//$error = create_db::import_file($tmp_dir.'notam.sql');
2017 2216 
 						$NOTAM = new NOTAM();
2018 2217 
 						$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
2019 2218 
 						update_db::insert_notam_version($notam_md5);
2020 
-					} else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
2021 
-				} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
2022 
-			} elseif ($globalDebug) echo "No new version.";
2023 
-		} else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
2219 
+					} else {
2220 
+						$error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
2221 
+					}
2222 
+				} else {
2223 
+					$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
2224 
+				}
2225 
+			} elseif ($globalDebug) {
2226 
+				echo "No new version.";
2227 
+			}
2228 
+		} else {
2229 
+			$error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
2230 
+		}
2024 2231 
 		if ($error != '') {
2025 2232 
 			return $error;
2026 
-		} elseif ($globalDebug) echo "Done\n";
2233 
+		} elseif ($globalDebug) {
2234 
+			echo "Done\n";
2235 
+		}
2027 2236 
 		return '';
2028 2237 
 	}
2029 2238 
 
@@ -2078,68 +2287,114 @@  discard block
 
 block discarded – undo
2078 2287 
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
2079 2288 
 		if (extension_loaded('zip')) {
2080 2289 
 			if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
2081 
-				if ($globalDebug) echo "Unzip...";
2290 
+				if ($globalDebug) {
2291 
+					echo "Unzip...";
2292 
+				}
2082 2293 
 				update_db::unzip($tmp_dir.'ivae_feb2013.zip');
2083 
-				if ($globalDebug) echo "Add to DB...";
2294 
+				if ($globalDebug) {
2295 
+					echo "Add to DB...";
2296 
+				}
2084 2297 
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
2085 
-				if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
2298 
+				if ($globalDebug) {
2299 
+					echo "Copy airlines logos to airlines images directory...";
2300 
+				}
2086 2301 
 				if (is_writable(dirname(__FILE__).'/../images/airlines')) {
2087 
-					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
2088 
-				} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
2089 
-			} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
2090 
-		} else $error = "ZIP module not loaded but required for IVAO.";
2302 
+					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
2303 
+						$error = "Failed to copy airlines logo.";
2304 
+					}
2305 
+				} else {
2306 
+					$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
2307 
+				}
2308 
+			} else {
2309 
+				$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
2310 
+			}
2311 
+		} else {
2312 
+			$error = "ZIP module not loaded but required for IVAO.";
2313 
+		}
2091 2314 
 		if ($error != '') {
2092 2315 
 			return $error;
2093 
-		} elseif ($globalDebug) echo "Done\n";
2316 
+		} elseif ($globalDebug) {
2317 
+			echo "Done\n";
2318 
+		}
2094 2319 
 		return '';
2095 2320 
 	}
2096 2321
2097 2322 
 	public static function update_routes() {
2098 2323 
 		global $tmp_dir, $globalDebug;
2099 2324 
 		$error = '';
2100 
-		if ($globalDebug) echo "Routes : Download...";
2325 
+		if ($globalDebug) {
2326 
+			echo "Routes : Download...";
2327 
+		}
2101 2328 
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
2102 2329 
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
2103 
-			if ($globalDebug) echo "Gunzip...";
2330 
+			if ($globalDebug) {
2331 
+				echo "Gunzip...";
2332 
+			}
2104 2333 
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
2105 
-			if ($globalDebug) echo "Add to DB...";
2334 
+			if ($globalDebug) {
2335 
+				echo "Add to DB...";
2336 
+			}
2106 2337 
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
2107 
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
2338 
+		} else {
2339 
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
2340 
+		}
2108 2341 
 		if ($error != '') {
2109 2342 
 			return $error;
2110 
-		} elseif ($globalDebug) echo "Done\n";
2343 
+		} elseif ($globalDebug) {
2344 
+			echo "Done\n";
2345 
+		}
2111 2346 
 		return '';
2112 2347 
 	}
2113 2348 
 	public static function update_oneworld() {
2114 2349 
 		global $tmp_dir, $globalDebug;
2115 2350 
 		$error = '';
2116 
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
2351 
+		if ($globalDebug) {
2352 
+			echo "Schedules Oneworld : Download...";
2353 
+		}
2117 2354 
 		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
2118 2355 
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
2119 
-			if ($globalDebug) echo "Gunzip...";
2356 
+			if ($globalDebug) {
2357 
+				echo "Gunzip...";
2358 
+			}
2120 2359 
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
2121 
-			if ($globalDebug) echo "Add to DB...";
2360 
+			if ($globalDebug) {
2361 
+				echo "Add to DB...";
2362 
+			}
2122 2363 
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
2123 
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
2364 
+		} else {
2365 
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
2366 
+		}
2124 2367 
 		if ($error != '') {
2125 2368 
 			return $error;
2126 
-		} elseif ($globalDebug) echo "Done\n";
2369 
+		} elseif ($globalDebug) {
2370 
+			echo "Done\n";
2371 
+		}
2127 2372 
 		return '';
2128 2373 
 	}
2129 2374 
 	public static function update_skyteam() {
2130 2375 
 		global $tmp_dir, $globalDebug;
2131 2376 
 		$error = '';
2132 
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
2377 
+		if ($globalDebug) {
2378 
+			echo "Schedules Skyteam : Download...";
2379 
+		}
2133 2380 
 		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
2134 2381 
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
2135 
-			if ($globalDebug) echo "Gunzip...";
2382 
+			if ($globalDebug) {
2383 
+				echo "Gunzip...";
2384 
+			}
2136 2385 
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
2137 
-			if ($globalDebug) echo "Add to DB...";
2386 
+			if ($globalDebug) {
2387 
+				echo "Add to DB...";
2388 
+			}
2138 2389 
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
2139 
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
2390 
+		} else {
2391 
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
2392 
+		}
2140 2393 
 		if ($error != '') {
2141 2394 
 			return $error;
2142 
-		} elseif ($globalDebug) echo "Done\n";
2395 
+		} elseif ($globalDebug) {
2396 
+			echo "Done\n";
2397 
+		}
2143 2398 
 		return '';
2144 2399 
 	}
2145 2400 
 	public static function update_ModeS() {
 
@@ -2156,340 +2411,590 @@  discard block
 
 block discarded – undo
2156 2411 
 			exit;
2157 2412 
 		} elseif ($globalDebug) echo "Done\n";
2158 2413 
 */
2159 
-		if ($globalDebug) echo "Modes : Download...";
2160 
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
2414 
+		if ($globalDebug) {
2415 
+			echo "Modes : Download...";
2416 
+		}
2417 
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
2161 2418 
 		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
2162 2419
2163 2420 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
2164 2421 
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
2165 
-			if ($globalDebug) echo "Unzip...";
2166 
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
2422 
+			if ($globalDebug) {
2423 
+				echo "Unzip...";
2424 
+			}
2425 
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
2167 2426 
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
2168 
-			if ($globalDebug) echo "Add to DB...";
2427 
+			if ($globalDebug) {
2428 
+				echo "Add to DB...";
2429 
+			}
2169 2430 
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
2170 2431 
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
2171 
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
2432 
+		} else {
2433 
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
2434 
+		}
2172 2435 
 		if ($error != '') {
2173 2436 
 			return $error;
2174 
-		} elseif ($globalDebug) echo "Done\n";
2437 
+		} elseif ($globalDebug) {
2438 
+			echo "Done\n";
2439 
+		}
2175 2440 
 		return '';
2176 2441 
 	}
2177 2442
2178 2443 
 	public static function update_ModeS_faa() {
2179 2444 
 		global $tmp_dir, $globalDebug;
2180 
-		if ($globalDebug) echo "Modes FAA: Download...";
2445 
+		if ($globalDebug) {
2446 
+			echo "Modes FAA: Download...";
2447 
+		}
2181 2448 
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
2182 2449 
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
2183 
-			if ($globalDebug) echo "Unzip...";
2450 
+			if ($globalDebug) {
2451 
+				echo "Unzip...";
2452 
+			}
2184 2453 
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
2185 
-			if ($globalDebug) echo "Add to DB...";
2454 
+			if ($globalDebug) {
2455 
+				echo "Add to DB...";
2456 
+			}
2186 2457 
 			$error = update_db::modes_faa();
2187 
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
2458 
+		} else {
2459 
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
2460 
+		}
2188 2461 
 		if ($error != '') {
2189 2462 
 			return $error;
2190 
-		} elseif ($globalDebug) echo "Done\n";
2463 
+		} elseif ($globalDebug) {
2464 
+			echo "Done\n";
2465 
+		}
2191 2466 
 		return '';
2192 2467 
 	}
2193 2468
2194 2469 
 	public static function update_ModeS_flarm() {
2195 2470 
 		global $tmp_dir, $globalDebug;
2196 
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
2471 
+		if ($globalDebug) {
2472 
+			echo "Modes Flarmnet: Download...";
2473 
+		}
2197 2474 
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
2198 2475 
 		if (file_exists($tmp_dir.'data.fln')) {
2199 
-			if ($globalDebug) echo "Add to DB...";
2476 
+			if ($globalDebug) {
2477 
+				echo "Add to DB...";
2478 
+			}
2200 2479 
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
2201 
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
2480 
+		} else {
2481 
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
2482 
+		}
2202 2483 
 		if ($error != '') {
2203 2484 
 			return $error;
2204 
-		} elseif ($globalDebug) echo "Done\n";
2485 
+		} elseif ($globalDebug) {
2486 
+			echo "Done\n";
2487 
+		}
2205 2488 
 		return '';
2206 2489 
 	}
2207 2490
2208 2491 
 	public static function update_ModeS_ogn() {
2209 2492 
 		global $tmp_dir, $globalDebug;
2210 
-		if ($globalDebug) echo "Modes OGN: Download...";
2493 
+		if ($globalDebug) {
2494 
+			echo "Modes OGN: Download...";
2495 
+		}
2211 2496 
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
2212 2497 
 		if (file_exists($tmp_dir.'ogn.csv')) {
2213 
-			if ($globalDebug) echo "Add to DB...";
2498 
+			if ($globalDebug) {
2499 
+				echo "Add to DB...";
2500 
+			}
2214 2501 
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
2215 
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
2502 
+		} else {
2503 
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
2504 
+		}
2216 2505 
 		if ($error != '') {
2217 2506 
 			return $error;
2218 
-		} elseif ($globalDebug) echo "Done\n";
2507 
+		} elseif ($globalDebug) {
2508 
+			echo "Done\n";
2509 
+		}
2219 2510 
 		return '';
2220 2511 
 	}
2221 2512
2222 2513 
 	public static function update_owner() {
2223 2514 
 		global $tmp_dir, $globalDebug, $globalMasterSource;
2224 2515
2225 
-		if ($globalDebug) echo "Owner France: Download...";
2516 
+		if ($globalDebug) {
2517 
+			echo "Owner France: Download...";
2518 
+		}
2226 2519 
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
2227 2520 
 		if (file_exists($tmp_dir.'owner_f.csv')) {
2228 
-			if ($globalDebug) echo "Add to DB...";
2521 
+			if ($globalDebug) {
2522 
+				echo "Add to DB...";
2523 
+			}
2229 2524 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
2230 
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2525 
+		} else {
2526 
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2527 
+		}
2231 2528 
 		if ($error != '') {
2232 2529 
 			return $error;
2233 
-		} elseif ($globalDebug) echo "Done\n";
2530 
+		} elseif ($globalDebug) {
2531 
+			echo "Done\n";
2532 
+		}
2234 2533
2235 
-		if ($globalDebug) echo "Owner Ireland: Download...";
2534 
+		if ($globalDebug) {
2535 
+			echo "Owner Ireland: Download...";
2536 
+		}
2236 2537 
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
2237 2538 
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
2238 
-			if ($globalDebug) echo "Add to DB...";
2539 
+			if ($globalDebug) {
2540 
+				echo "Add to DB...";
2541 
+			}
2239 2542 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
2240 
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2543 
+		} else {
2544 
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2545 
+		}
2241 2546 
 		if ($error != '') {
2242 2547 
 			return $error;
2243 
-		} elseif ($globalDebug) echo "Done\n";
2244 
-		if ($globalDebug) echo "Owner Switzerland: Download...";
2548 
+		} elseif ($globalDebug) {
2549 
+			echo "Done\n";
2550 
+		}
2551 
+		if ($globalDebug) {
2552 
+			echo "Owner Switzerland: Download...";
2553 
+		}
2245 2554 
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
2246 2555 
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
2247 
-			if ($globalDebug) echo "Add to DB...";
2556 
+			if ($globalDebug) {
2557 
+				echo "Add to DB...";
2558 
+			}
2248 2559 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
2249 
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2560 
+		} else {
2561 
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2562 
+		}
2250 2563 
 		if ($error != '') {
2251 2564 
 			return $error;
2252 
-		} elseif ($globalDebug) echo "Done\n";
2253 
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
2565 
+		} elseif ($globalDebug) {
2566 
+			echo "Done\n";
2567 
+		}
2568 
+		if ($globalDebug) {
2569 
+			echo "Owner Czech Republic: Download...";
2570 
+		}
2254 2571 
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
2255 2572 
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
2256 
-			if ($globalDebug) echo "Add to DB...";
2573 
+			if ($globalDebug) {
2574 
+				echo "Add to DB...";
2575 
+			}
2257 2576 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
2258 
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2577 
+		} else {
2578 
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2579 
+		}
2259 2580 
 		if ($error != '') {
2260 2581 
 			return $error;
2261 
-		} elseif ($globalDebug) echo "Done\n";
2262 
-		if ($globalDebug) echo "Owner Australia: Download...";
2582 
+		} elseif ($globalDebug) {
2583 
+			echo "Done\n";
2584 
+		}
2585 
+		if ($globalDebug) {
2586 
+			echo "Owner Australia: Download...";
2587 
+		}
2263 2588 
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
2264 2589 
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
2265 
-			if ($globalDebug) echo "Add to DB...";
2590 
+			if ($globalDebug) {
2591 
+				echo "Add to DB...";
2592 
+			}
2266 2593 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
2267 
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2594 
+		} else {
2595 
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2596 
+		}
2268 2597 
 		if ($error != '') {
2269 2598 
 			return $error;
2270 
-		} elseif ($globalDebug) echo "Done\n";
2271 
-		if ($globalDebug) echo "Owner Austria: Download...";
2599 
+		} elseif ($globalDebug) {
2600 
+			echo "Done\n";
2601 
+		}
2602 
+		if ($globalDebug) {
2603 
+			echo "Owner Austria: Download...";
2604 
+		}
2272 2605 
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
2273 2606 
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
2274 
-			if ($globalDebug) echo "Add to DB...";
2607 
+			if ($globalDebug) {
2608 
+				echo "Add to DB...";
2609 
+			}
2275 2610 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
2276 
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2611 
+		} else {
2612 
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2613 
+		}
2277 2614 
 		if ($error != '') {
2278 2615 
 			return $error;
2279 
-		} elseif ($globalDebug) echo "Done\n";
2280 
-		if ($globalDebug) echo "Owner Chile: Download...";
2616 
+		} elseif ($globalDebug) {
2617 
+			echo "Done\n";
2618 
+		}
2619 
+		if ($globalDebug) {
2620 
+			echo "Owner Chile: Download...";
2621 
+		}
2281 2622 
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
2282 2623 
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
2283 
-			if ($globalDebug) echo "Add to DB...";
2624 
+			if ($globalDebug) {
2625 
+				echo "Add to DB...";
2626 
+			}
2284 2627 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
2285 
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2628 
+		} else {
2629 
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2630 
+		}
2286 2631 
 		if ($error != '') {
2287 2632 
 			return $error;
2288 
-		} elseif ($globalDebug) echo "Done\n";
2289 
-		if ($globalDebug) echo "Owner Colombia: Download...";
2633 
+		} elseif ($globalDebug) {
2634 
+			echo "Done\n";
2635 
+		}
2636 
+		if ($globalDebug) {
2637 
+			echo "Owner Colombia: Download...";
2638 
+		}
2290 2639 
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
2291 2640 
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
2292 
-			if ($globalDebug) echo "Add to DB...";
2641 
+			if ($globalDebug) {
2642 
+				echo "Add to DB...";
2643 
+			}
2293 2644 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
2294 
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2645 
+		} else {
2646 
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2647 
+		}
2295 2648 
 		if ($error != '') {
2296 2649 
 			return $error;
2297 
-		} elseif ($globalDebug) echo "Done\n";
2298 
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
2650 
+		} elseif ($globalDebug) {
2651 
+			echo "Done\n";
2652 
+		}
2653 
+		if ($globalDebug) {
2654 
+			echo "Owner Bosnia Herzegobina: Download...";
2655 
+		}
2299 2656 
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
2300 2657 
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
2301 
-			if ($globalDebug) echo "Add to DB...";
2658 
+			if ($globalDebug) {
2659 
+				echo "Add to DB...";
2660 
+			}
2302 2661 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
2303 
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2662 
+		} else {
2663 
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2664 
+		}
2304 2665 
 		if ($error != '') {
2305 2666 
 			return $error;
2306 
-		} elseif ($globalDebug) echo "Done\n";
2307 
-		if ($globalDebug) echo "Owner Brazil: Download...";
2667 
+		} elseif ($globalDebug) {
2668 
+			echo "Done\n";
2669 
+		}
2670 
+		if ($globalDebug) {
2671 
+			echo "Owner Brazil: Download...";
2672 
+		}
2308 2673 
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
2309 2674 
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
2310 
-			if ($globalDebug) echo "Add to DB...";
2675 
+			if ($globalDebug) {
2676 
+				echo "Add to DB...";
2677 
+			}
2311 2678 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
2312 
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2679 
+		} else {
2680 
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2681 
+		}
2313 2682 
 		if ($error != '') {
2314 2683 
 			return $error;
2315 
-		} elseif ($globalDebug) echo "Done\n";
2316 
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
2684 
+		} elseif ($globalDebug) {
2685 
+			echo "Done\n";
2686 
+		}
2687 
+		if ($globalDebug) {
2688 
+			echo "Owner Cayman Islands: Download...";
2689 
+		}
2317 2690 
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
2318 2691 
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
2319 
-			if ($globalDebug) echo "Add to DB...";
2692 
+			if ($globalDebug) {
2693 
+				echo "Add to DB...";
2694 
+			}
2320 2695 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
2321 
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2696 
+		} else {
2697 
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2698 
+		}
2322 2699 
 		if ($error != '') {
2323 2700 
 			return $error;
2324 
-		} elseif ($globalDebug) echo "Done\n";
2325 
-		if ($globalDebug) echo "Owner Croatia: Download...";
2701 
+		} elseif ($globalDebug) {
2702 
+			echo "Done\n";
2703 
+		}
2704 
+		if ($globalDebug) {
2705 
+			echo "Owner Croatia: Download...";
2706 
+		}
2326 2707 
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
2327 2708 
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
2328 
-			if ($globalDebug) echo "Add to DB...";
2709 
+			if ($globalDebug) {
2710 
+				echo "Add to DB...";
2711 
+			}
2329 2712 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
2330 
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2713 
+		} else {
2714 
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2715 
+		}
2331 2716 
 		if ($error != '') {
2332 2717 
 			return $error;
2333 
-		} elseif ($globalDebug) echo "Done\n";
2334 
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
2718 
+		} elseif ($globalDebug) {
2719 
+			echo "Done\n";
2720 
+		}
2721 
+		if ($globalDebug) {
2722 
+			echo "Owner Luxembourg: Download...";
2723 
+		}
2335 2724 
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
2336 2725 
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
2337 
-			if ($globalDebug) echo "Add to DB...";
2726 
+			if ($globalDebug) {
2727 
+				echo "Add to DB...";
2728 
+			}
2338 2729 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
2339 
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2730 
+		} else {
2731 
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2732 
+		}
2340 2733 
 		if ($error != '') {
2341 2734 
 			return $error;
2342 
-		} elseif ($globalDebug) echo "Done\n";
2343 
-		if ($globalDebug) echo "Owner Maldives: Download...";
2735 
+		} elseif ($globalDebug) {
2736 
+			echo "Done\n";
2737 
+		}
2738 
+		if ($globalDebug) {
2739 
+			echo "Owner Maldives: Download...";
2740 
+		}
2344 2741 
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
2345 2742 
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
2346 
-			if ($globalDebug) echo "Add to DB...";
2743 
+			if ($globalDebug) {
2744 
+				echo "Add to DB...";
2745 
+			}
2347 2746 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
2348 
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2747 
+		} else {
2748 
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2749 
+		}
2349 2750 
 		if ($error != '') {
2350 2751 
 			return $error;
2351 
-		} elseif ($globalDebug) echo "Done\n";
2352 
-		if ($globalDebug) echo "Owner New Zealand: Download...";
2752 
+		} elseif ($globalDebug) {
2753 
+			echo "Done\n";
2754 
+		}
2755 
+		if ($globalDebug) {
2756 
+			echo "Owner New Zealand: Download...";
2757 
+		}
2353 2758 
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
2354 2759 
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
2355 
-			if ($globalDebug) echo "Add to DB...";
2760 
+			if ($globalDebug) {
2761 
+				echo "Add to DB...";
2762 
+			}
2356 2763 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
2357 
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2764 
+		} else {
2765 
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2766 
+		}
2358 2767 
 		if ($error != '') {
2359 2768 
 			return $error;
2360 
-		} elseif ($globalDebug) echo "Done\n";
2361 
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
2769 
+		} elseif ($globalDebug) {
2770 
+			echo "Done\n";
2771 
+		}
2772 
+		if ($globalDebug) {
2773 
+			echo "Owner Papua New Guinea: Download...";
2774 
+		}
2362 2775 
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
2363 2776 
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
2364 
-			if ($globalDebug) echo "Add to DB...";
2777 
+			if ($globalDebug) {
2778 
+				echo "Add to DB...";
2779 
+			}
2365 2780 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
2366 
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2781 
+		} else {
2782 
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2783 
+		}
2367 2784 
 		if ($error != '') {
2368 2785 
 			return $error;
2369 
-		} elseif ($globalDebug) echo "Done\n";
2370 
-		if ($globalDebug) echo "Owner Slovakia: Download...";
2786 
+		} elseif ($globalDebug) {
2787 
+			echo "Done\n";
2788 
+		}
2789 
+		if ($globalDebug) {
2790 
+			echo "Owner Slovakia: Download...";
2791 
+		}
2371 2792 
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
2372 2793 
 		if (file_exists($tmp_dir.'owner_om.csv')) {
2373 
-			if ($globalDebug) echo "Add to DB...";
2794 
+			if ($globalDebug) {
2795 
+				echo "Add to DB...";
2796 
+			}
2374 2797 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
2375 
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2798 
+		} else {
2799 
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2800 
+		}
2376 2801 
 		if ($error != '') {
2377 2802 
 			return $error;
2378 
-		} elseif ($globalDebug) echo "Done\n";
2379 
-		if ($globalDebug) echo "Owner Ecuador: Download...";
2803 
+		} elseif ($globalDebug) {
2804 
+			echo "Done\n";
2805 
+		}
2806 
+		if ($globalDebug) {
2807 
+			echo "Owner Ecuador: Download...";
2808 
+		}
2380 2809 
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
2381 2810 
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
2382 
-			if ($globalDebug) echo "Add to DB...";
2811 
+			if ($globalDebug) {
2812 
+				echo "Add to DB...";
2813 
+			}
2383 2814 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
2384 
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2815 
+		} else {
2816 
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2817 
+		}
2385 2818 
 		if ($error != '') {
2386 2819 
 			return $error;
2387 
-		} elseif ($globalDebug) echo "Done\n";
2388 
-		if ($globalDebug) echo "Owner Iceland: Download...";
2820 
+		} elseif ($globalDebug) {
2821 
+			echo "Done\n";
2822 
+		}
2823 
+		if ($globalDebug) {
2824 
+			echo "Owner Iceland: Download...";
2825 
+		}
2389 2826 
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
2390 2827 
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
2391 
-			if ($globalDebug) echo "Add to DB...";
2828 
+			if ($globalDebug) {
2829 
+				echo "Add to DB...";
2830 
+			}
2392 2831 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
2393 
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2832 
+		} else {
2833 
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2834 
+		}
2394 2835 
 		if ($error != '') {
2395 2836 
 			return $error;
2396 
-		} elseif ($globalDebug) echo "Done\n";
2397 
-		if ($globalDebug) echo "Owner Isle of Man: Download...";
2837 
+		} elseif ($globalDebug) {
2838 
+			echo "Done\n";
2839 
+		}
2840 
+		if ($globalDebug) {
2841 
+			echo "Owner Isle of Man: Download...";
2842 
+		}
2398 2843 
 		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
2399 2844 
 		if (file_exists($tmp_dir.'owner_m.csv')) {
2400 
-			if ($globalDebug) echo "Add to DB...";
2845 
+			if ($globalDebug) {
2846 
+				echo "Add to DB...";
2847 
+			}
2401 2848 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
2402 
-		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2849 
+		} else {
2850 
+			$error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2851 
+		}
2403 2852 
 		if ($error != '') {
2404 2853 
 			return $error;
2405 
-		} elseif ($globalDebug) echo "Done\n";
2854 
+		} elseif ($globalDebug) {
2855 
+			echo "Done\n";
2856 
+		}
2406 2857 
 		if ($globalMasterSource) {
2407 
-			if ($globalDebug) echo "ModeS Netherlands: Download...";
2858 
+			if ($globalDebug) {
2859 
+				echo "ModeS Netherlands: Download...";
2860 
+			}
2408 2861 
 			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
2409 2862 
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
2410 
-				if ($globalDebug) echo "Add to DB...";
2863 
+				if ($globalDebug) {
2864 
+					echo "Add to DB...";
2865 
+				}
2411 2866 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
2412 
-			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2867 
+			} else {
2868 
+				$error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2869 
+			}
2413 2870 
 			if ($error != '') {
2414 2871 
 				return $error;
2415 
-			} elseif ($globalDebug) echo "Done\n";
2416 
-			if ($globalDebug) echo "ModeS Denmark: Download...";
2872 
+			} elseif ($globalDebug) {
2873 
+				echo "Done\n";
2874 
+			}
2875 
+			if ($globalDebug) {
2876 
+				echo "ModeS Denmark: Download...";
2877 
+			}
2417 2878 
 			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
2418 2879 
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
2419 
-				if ($globalDebug) echo "Add to DB...";
2880 
+				if ($globalDebug) {
2881 
+					echo "Add to DB...";
2882 
+				}
2420 2883 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
2421 
-			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2884 
+			} else {
2885 
+				$error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2886 
+			}
2422 2887 
 			if ($error != '') {
2423 2888 
 				return $error;
2424 
-			} elseif ($globalDebug) echo "Done\n";
2425 
-		} elseif ($globalDebug) echo "Done\n";
2889 
+			} elseif ($globalDebug) {
2890 
+				echo "Done\n";
2891 
+			}
2892 
+		} elseif ($globalDebug) {
2893 
+			echo "Done\n";
2894 
+		}
2426 2895 
 		return '';
2427 2896 
 	}
2428 2897
2429 2898 
 	public static function update_translation() {
2430 2899 
 		global $tmp_dir, $globalDebug;
2431 2900 
 		$error = '';
2432 
-		if ($globalDebug) echo "Translation : Download...";
2901 
+		if ($globalDebug) {
2902 
+			echo "Translation : Download...";
2903 
+		}
2433 2904 
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
2434 2905 
 		if (file_exists($tmp_dir.'translation.zip')) {
2435 
-			if ($globalDebug) echo "Unzip...";
2906 
+			if ($globalDebug) {
2907 
+				echo "Unzip...";
2908 
+			}
2436 2909 
 			update_db::unzip($tmp_dir.'translation.zip');
2437 
-			if ($globalDebug) echo "Add to DB...";
2910 
+			if ($globalDebug) {
2911 
+				echo "Add to DB...";
2912 
+			}
2438 2913 
 			$error = update_db::translation();
2439 
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2914 
+		} else {
2915 
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2916 
+		}
2440 2917 
 		if ($error != '') {
2441 2918 
 			return $error;
2442 
-		} elseif ($globalDebug) echo "Done\n";
2919 
+		} elseif ($globalDebug) {
2920 
+			echo "Done\n";
2921 
+		}
2443 2922 
 		return '';
2444 2923 
 	}
2445 2924
2446 2925 
 	public static function update_translation_fam() {
2447 2926 
 		global $tmp_dir, $globalDebug;
2448 2927 
 		$error = '';
2449 
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
2928 
+		if ($globalDebug) {
2929 
+			echo "Translation from FlightAirMap website : Download...";
2930 
+		}
2450 2931 
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
2451 2932 
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5');
2452 2933 
 		if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) {
2453 2934 
 			$translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
2454 2935 
 			$translation_md5 = $translation_md5_file[0];
2455 2936 
 			if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) {
2456 
-				if ($globalDebug) echo "Gunzip...";
2937 
+				if ($globalDebug) {
2938 
+					echo "Gunzip...";
2939 
+				}
2457 2940 
 				update_db::gunzip($tmp_dir.'translation.tsv.gz');
2458 
-				if ($globalDebug) echo "Add to DB...";
2941 
+				if ($globalDebug) {
2942 
+					echo "Add to DB...";
2943 
+				}
2459 2944 
 				$error = update_db::translation_fam();
2460 
-			} else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
2461 
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2945 
+			} else {
2946 
+				$error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
2947 
+			}
2948 
+		} else {
2949 
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2950 
+		}
2462 2951 
 		if ($error != '') {
2463 2952 
 			return $error;
2464 
-		} elseif ($globalDebug) echo "Done\n";
2953 
+		} elseif ($globalDebug) {
2954 
+			echo "Done\n";
2955 
+		}
2465 2956 
 		return '';
2466 2957 
 	}
2467 2958 
 	public static function update_ModeS_fam() {
2468 2959 
 		global $tmp_dir, $globalDebug;
2469 2960 
 		$error = '';
2470 
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
2961 
+		if ($globalDebug) {
2962 
+			echo "ModeS from FlightAirMap website : Download...";
2963 
+		}
2471 2964 
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
2472 2965 
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5');
2473 2966 
 		if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) {
2474 2967 
 			$modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
2475 2968 
 			$modes_md5 = $modes_md5_file[0];
2476 2969 
 			if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) {
2477 
-				if ($globalDebug) echo "Gunzip...";
2970 
+				if ($globalDebug) {
2971 
+					echo "Gunzip...";
2972 
+				}
2478 2973 
 				update_db::gunzip($tmp_dir.'modes.tsv.gz');
2479 
-				if ($globalDebug) echo "Add to DB...";
2974 
+				if ($globalDebug) {
2975 
+					echo "Add to DB...";
2976 
+				}
2480 2977 
 				$error = update_db::modes_fam();
2481 
-			} else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
2482 
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2978 
+			} else {
2979 
+				$error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
2980 
+			}
2981 
+		} else {
2982 
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2983 
+		}
2483 2984 
 		if ($error != '') {
2484 2985 
 			return $error;
2485 
-		} elseif ($globalDebug) echo "Done\n";
2986 
+		} elseif ($globalDebug) {
2987 
+			echo "Done\n";
2988 
+		}
2486 2989 
 		return '';
2487 2990 
 	}
2488 2991
2489 2992 
 	public static function update_airlines_fam() {
2490 2993 
 		global $tmp_dir, $globalDebug;
2491 2994 
 		$error = '';
2492 
-		if ($globalDebug) echo "Airlines from FlightAirMap website : Download...";
2995 
+		if ($globalDebug) {
2996 
+			echo "Airlines from FlightAirMap website : Download...";
2997 
+		}
2493 2998 
 		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5');
2494 2999 
 		if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) {
2495 3000 
 			$airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
 
@@ -2498,26 +3003,42 @@  discard block
 
 block discarded – undo
2498 3003 
 				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
2499 3004 
 				if (file_exists($tmp_dir.'airlines.tsv.gz')) {
2500 3005 
 					if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) {
2501 
-						if ($globalDebug) echo "Gunzip...";
3006 
+						if ($globalDebug) {
3007 
+							echo "Gunzip...";
3008 
+						}
2502 3009 
 						update_db::gunzip($tmp_dir.'airlines.tsv.gz');
2503 
-						if ($globalDebug) echo "Add to DB...";
3010 
+						if ($globalDebug) {
3011 
+							echo "Add to DB...";
3012 
+						}
2504 3013 
 						$error = update_db::airlines_fam();
2505 3014 
 						update_db::insert_airlines_version($airlines_md5);
2506 
-					} else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
2507 
-			    } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
2508 
-			} elseif ($globalDebug) echo "No update.";
2509 
-		} else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
3015 
+					} else {
3016 
+						$error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
3017 
+					}
3018 
+			    } else {
3019 
+			    	$error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
3020 
+			    }
3021 
+			} elseif ($globalDebug) {
3022 
+				echo "No update.";
3023 
+			}
3024 
+		} else {
3025 
+			$error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
3026 
+		}
2510 3027 
 		if ($error != '') {
2511 3028 
 			return $error;
2512 3029 
 		} else {
2513 
-			if ($globalDebug) echo "Done\n";
3030 
+			if ($globalDebug) {
3031 
+				echo "Done\n";
3032 
+			}
2514 3033 
 		}
2515 3034 
 		return '';
2516 3035 
 	}
2517 3036
2518 3037 
 	public static function update_owner_fam() {
2519 3038 
 		global $tmp_dir, $globalDebug, $globalOwner;
2520 
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
3039 
+		if ($globalDebug) {
3040 
+			echo "owner from FlightAirMap website : Download...";
3041 
+		}
2521 3042 
 		$error = '';
2522 3043 
 		if ($globalOwner === TRUE) {
2523 3044 
 			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
 
@@ -2530,55 +3051,89 @@  discard block
 
 block discarded – undo
2530 3051 
 			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
2531 3052 
 			$owners_md5 = $owners_md5_file[0];
2532 3053 
 			if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) {
2533 
-				if ($globalDebug) echo "Gunzip...";
3054 
+				if ($globalDebug) {
3055 
+					echo "Gunzip...";
3056 
+				}
2534 3057 
 				update_db::gunzip($tmp_dir.'owners.tsv.gz');
2535 
-				if ($globalDebug) echo "Add to DB...";
3058 
+				if ($globalDebug) {
3059 
+					echo "Add to DB...";
3060 
+				}
2536 3061 
 				$error = update_db::owner_fam();
2537 
-			} else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
2538 
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
3062 
+			} else {
3063 
+				$error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
3064 
+			}
3065 
+		} else {
3066 
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
3067 
+		}
2539 3068 
 		if ($error != '') {
2540 3069 
 			return $error;
2541 
-		} elseif ($globalDebug) echo "Done\n";
3070 
+		} elseif ($globalDebug) {
3071 
+			echo "Done\n";
3072 
+		}
2542 3073 
 		return '';
2543 3074 
 	}
2544 3075 
 	public static function update_routes_fam() {
2545 3076 
 		global $tmp_dir, $globalDebug;
2546 
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
3077 
+		if ($globalDebug) {
3078 
+			echo "Routes from FlightAirMap website : Download...";
3079 
+		}
2547 3080 
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
2548 3081 
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5');
2549 3082 
 		if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) {
2550 3083 
 			$routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
2551 3084 
 			$routes_md5 = $routes_md5_file[0];
2552 3085 
 			if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) {
2553 
-				if ($globalDebug) echo "Gunzip...";
3086 
+				if ($globalDebug) {
3087 
+					echo "Gunzip...";
3088 
+				}
2554 3089 
 				update_db::gunzip($tmp_dir.'routes.tsv.gz');
2555 
-				if ($globalDebug) echo "Add to DB...";
3090 
+				if ($globalDebug) {
3091 
+					echo "Add to DB...";
3092 
+				}
2556 3093 
 				$error = update_db::routes_fam();
2557 
-			} else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
2558 
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
3094 
+			} else {
3095 
+				$error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
3096 
+			}
3097 
+		} else {
3098 
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
3099 
+		}
2559 3100 
 		if ($error != '') {
2560 3101 
 			return $error;
2561 
-		} elseif ($globalDebug) echo "Done\n";
3102 
+		} elseif ($globalDebug) {
3103 
+			echo "Done\n";
3104 
+		}
2562 3105 
 		return '';
2563 3106 
 	}
2564 3107 
 	public static function update_block_fam() {
2565 3108 
 		global $tmp_dir, $globalDebug;
2566 
-		if ($globalDebug) echo "Blocked aircraft from FlightAirMap website : Download...";
3109 
+		if ($globalDebug) {
3110 
+			echo "Blocked aircraft from FlightAirMap website : Download...";
3111 
+		}
2567 3112 
 		update_db::download('http://data.flightairmap.com/data/block.tsv.gz',$tmp_dir.'block.tsv.gz');
2568 3113 
 		update_db::download('http://data.flightairmap.com/data/block.tsv.gz.md5',$tmp_dir.'block.tsv.gz.md5');
2569 3114 
 		if (file_exists($tmp_dir.'block.tsv.gz') && file_exists($tmp_dir.'block.tsv.gz.md5')) {
2570 3115 
 			$block_md5_file = explode(' ',file_get_contents($tmp_dir.'block.tsv.gz.md5'));
2571 3116 
 			$block_md5 = $block_md5_file[0];
2572 3117 
 			if (md5_file($tmp_dir.'block.tsv.gz') == $block_md5) {
2573 
-				if ($globalDebug) echo "Gunzip...";
3118 
+				if ($globalDebug) {
3119 
+					echo "Gunzip...";
3120 
+				}
2574 3121 
 				update_db::gunzip($tmp_dir.'block.tsv.gz');
2575 
-				if ($globalDebug) echo "Add to DB...";
3122 
+				if ($globalDebug) {
3123 
+					echo "Add to DB...";
3124 
+				}
2576 3125 
 				$error = update_db::block_fam();
2577 
-			} else $error = "File ".$tmp_dir.'block.tsv.gz'." md5 failed. Download failed.";
2578 
-		} else $error = "File ".$tmp_dir.'block.tsv.gz'." doesn't exist. Download failed.";
3126 
+			} else {
3127 
+				$error = "File ".$tmp_dir.'block.tsv.gz'." md5 failed. Download failed.";
3128 
+			}
3129 
+		} else {
3130 
+			$error = "File ".$tmp_dir.'block.tsv.gz'." doesn't exist. Download failed.";
3131 
+		}
2579 3132 
 		if ($error != '') {
2580 3133 
 			return $error;
2581 
-		} elseif ($globalDebug) echo "Done\n";
3134 
+		} elseif ($globalDebug) {
3135 
+			echo "Done\n";
3136 
+		}
2582 3137 
 		return '';
2583 3138 
 	}
2584 3139 
 	public static function update_marine_identity_fam() {
 
@@ -2588,21 +3143,33 @@  discard block
 
 block discarded – undo
2588 3143 
 			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
2589 3144 
 			$marine_identity_md5 = $marine_identity_md5_file[0];
2590 3145 
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
2591 
-				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
3146 
+				if ($globalDebug) {
3147 
+					echo "Marine identity from FlightAirMap website : Download...";
3148 
+				}
2592 3149 
 				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
2593 3150 
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
2594 3151 
 					if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) {
2595 
-						if ($globalDebug) echo "Gunzip...";
3152 
+						if ($globalDebug) {
3153 
+							echo "Gunzip...";
3154 
+						}
2596 3155 
 						update_db::gunzip($tmp_dir.'marine_identity.tsv.gz');
2597 
-						if ($globalDebug) echo "Add to DB...";
3156 
+						if ($globalDebug) {
3157 
+							echo "Add to DB...";
3158 
+						}
2598 3159 
 						$error = update_db::marine_identity_fam();
2599 
-					} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
2600 
-				} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
3160 
+					} else {
3161 
+						$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
3162 
+					}
3163 
+				} else {
3164 
+					$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
3165 
+				}
2601 3166 
 				if ($error != '') {
2602 3167 
 					return $error;
2603 3168 
 				} else {
2604 3169 
 					update_db::insert_marine_identity_version($marine_identity_md5);
2605 
-					if ($globalDebug) echo "Done\n";
3170 
+					if ($globalDebug) {
3171 
+						echo "Done\n";
3172 
+					}
2606 3173 
 				}
2607 3174 
 			}
2608 3175 
 		}
 
@@ -2616,21 +3183,33 @@  discard block
 
 block discarded – undo
2616 3183 
 			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
2617 3184 
 			$satellite_md5 = $satellite_md5_file[0];
2618 3185 
 			if (!update_db::check_satellite_version($satellite_md5)) {
2619 
-				if ($globalDebug) echo "Satellite from FlightAirMap website : Download...";
3186 
+				if ($globalDebug) {
3187 
+					echo "Satellite from FlightAirMap website : Download...";
3188 
+				}
2620 3189 
 				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
2621 3190 
 				if (file_exists($tmp_dir.'satellite.tsv.gz')) {
2622 3191 
 					if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) {
2623 
-						if ($globalDebug) echo "Gunzip...";
3192 
+						if ($globalDebug) {
3193 
+							echo "Gunzip...";
3194 
+						}
2624 3195 
 						update_db::gunzip($tmp_dir.'satellite.tsv.gz');
2625 
-						if ($globalDebug) echo "Add to DB...";
3196 
+						if ($globalDebug) {
3197 
+							echo "Add to DB...";
3198 
+						}
2626 3199 
 						$error = update_db::satellite_fam();
2627 
-					} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
2628 
-				} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
3200 
+					} else {
3201 
+						$error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
3202 
+					}
3203 
+				} else {
3204 
+					$error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
3205 
+				}
2629 3206 
 				if ($error != '') {
2630 3207 
 					return $error;
2631 3208 
 				} else {
2632 3209 
 					update_db::insert_satellite_version($satellite_md5);
2633 
-					if ($globalDebug) echo "Done\n";
3210 
+					if ($globalDebug) {
3211 
+						echo "Done\n";
3212 
+					}
2634 3213 
 				}
2635 3214 
 			}
2636 3215 
 		}
 
@@ -2638,17 +3217,25 @@  discard block
 
 block discarded – undo
2638 3217 
 	}
2639 3218 
 	public static function update_banned_fam() {
2640 3219 
 		global $tmp_dir, $globalDebug;
2641 
-		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
3220 
+		if ($globalDebug) {
3221 
+			echo "Banned airlines in Europe from FlightAirMap website : Download...";
3222 
+		}
2642 3223 
 		update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
2643 3224 
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
2644 3225 
 			//if ($globalDebug) echo "Gunzip...";
2645 3226 
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
2646 
-			if ($globalDebug) echo "Add to DB...";
3227 
+			if ($globalDebug) {
3228 
+				echo "Add to DB...";
3229 
+			}
2647 3230 
 			$error = update_db::banned_fam();
2648 
-		} else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
3231 
+		} else {
3232 
+			$error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
3233 
+		}
2649 3234 
 		if ($error != '') {
2650 3235 
 			return $error;
2651 
-		} elseif ($globalDebug) echo "Done\n";
3236 
+		} elseif ($globalDebug) {
3237 
+			echo "Done\n";
3238 
+		}
2652 3239 
 		return '';
2653 3240 
 	}
2654 3241 
 
@@ -2656,7 +3243,9 @@  discard block
 
 block discarded – undo
2656 3243 
 		global $tmp_dir, $globalDebug, $globalDBdriver;
2657 3244 
 		include_once('class.create_db.php');
2658 3245 
 		$error = '';
2659 
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
3246 
+		if ($globalDebug) {
3247 
+			echo "Airspace from FlightAirMap website : Download...";
3248 
+		}
2660 3249 
 		if ($globalDBdriver == 'mysql') {
2661 3250 
 			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
2662 3251 
 		} else {
 
@@ -2673,9 +3262,13 @@  discard block
 
 block discarded – undo
2673 3262 
 				}
2674 3263 
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
2675 3264 
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
2676 
-						if ($globalDebug) echo "Gunzip...";
3265 
+						if ($globalDebug) {
3266 
+							echo "Gunzip...";
3267 
+						}
2677 3268 
 						update_db::gunzip($tmp_dir.'airspace.sql.gz');
2678 
-						if ($globalDebug) echo "Add to DB...";
3269 
+						if ($globalDebug) {
3270 
+							echo "Add to DB...";
3271 
+						}
2679 3272 
 						$Connection = new Connection();
2680 3273 
 						if ($Connection->tableExists('airspace')) {
2681 3274 
 							$query = 'DROP TABLE airspace';
 
@@ -2688,20 +3281,30 @@  discard block
 
 block discarded – undo
2688 3281 
 						}
2689 3282 
 						$error = create_db::import_file($tmp_dir.'airspace.sql');
2690 3283 
 						update_db::insert_airspace_version($airspace_md5);
2691 
-					} else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
2692 
-				} else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
3284 
+					} else {
3285 
+						$error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
3286 
+					}
3287 
+				} else {
3288 
+					$error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
3289 
+				}
2693 3290 
 			}
2694 
-		} else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
3291 
+		} else {
3292 
+			$error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
3293 
+		}
2695 3294 
 		if ($error != '') {
2696 3295 
 			return $error;
2697 
-		} elseif ($globalDebug) echo "Done\n";
3296 
+		} elseif ($globalDebug) {
3297 
+			echo "Done\n";
3298 
+		}
2698 3299 
 		return '';
2699 3300 
 	}
2700 3301
2701 3302 
 	public static function update_geoid_fam() {
2702 3303 
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
2703 3304 
 		$error = '';
2704 
-		if ($globalDebug) echo "Geoid from FlightAirMap website : Download...";
3305 
+		if ($globalDebug) {
3306 
+			echo "Geoid from FlightAirMap website : Download...";
3307 
+		}
2705 3308 
 		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
2706 3309 
 		if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) {
2707 3310 
 			$geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
 
@@ -2710,76 +3313,120 @@  discard block
 
 block discarded – undo
2710 3313 
 				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
2711 3314 
 				if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) {
2712 3315 
 					if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) {
2713 
-						if ($globalDebug) echo "Gunzip...";
3316 
+						if ($globalDebug) {
3317 
+							echo "Gunzip...";
3318 
+						}
2714 3319 
 						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
2715 3320 
 						if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) {
2716 3321 
 							update_db::insert_geoid_version($geoid_md5);
2717 
-						} else $error = "File data/".$globalGeoidSource.'.pgm'." doesn't exist. Gunzip failed.";
2718 
-					} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
2719 
-				} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
2720 
-			} elseif ($globalDebug) echo 'No new version'."\n";
2721 
-		} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
3322 
+						} else {
3323 
+							$error = "File data/".$globalGeoidSource.'.pgm'." doesn't exist. Gunzip failed.";
3324 
+						}
3325 
+					} else {
3326 
+						$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
3327 
+					}
3328 
+				} else {
3329 
+					$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
3330 
+				}
3331 
+			} elseif ($globalDebug) {
3332 
+				echo 'No new version'."\n";
3333 
+			}
3334 
+		} else {
3335 
+			$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
3336 
+		}
2722 3337 
 		if ($error != '') {
2723 3338 
 			return $error;
2724 
-		} elseif ($globalDebug) echo "Done\n";
3339 
+		} elseif ($globalDebug) {
3340 
+			echo "Done\n";
3341 
+		}
2725 3342 
 		return '';
2726 3343 
 	}
2727 3344
2728 3345 
 	public static function update_tle() {
2729 3346 
 		global $tmp_dir, $globalDebug;
2730 
-		if ($globalDebug) echo "Download TLE : Download...";
3347 
+		if ($globalDebug) {
3348 
+			echo "Download TLE : Download...";
3349 
+		}
2731 3350 
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
2732 3351 
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
2733 3352 
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt');
2734 3353 
 		foreach ($alltle as $filename) {
2735 
-			if ($globalDebug) echo "downloading ".$filename.'...';
3354 
+			if ($globalDebug) {
3355 
+				echo "downloading ".$filename.'...';
3356 
+			}
2736 3357 
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
2737 3358 
 			if (file_exists($tmp_dir.$filename)) {
2738 
-				if ($globalDebug) echo "Add to DB ".$filename."...";
3359 
+				if ($globalDebug) {
3360 
+					echo "Add to DB ".$filename."...";
3361 
+				}
2739 3362 
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
2740 
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
3363 
+			} else {
3364 
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
3365 
+			}
2741 3366 
 			if ($error != '') {
2742 3367 
 				echo $error."\n";
2743 
-			} elseif ($globalDebug) echo "Done\n";
3368 
+			} elseif ($globalDebug) {
3369 
+				echo "Done\n";
3370 
+			}
2744 3371 
 		}
2745 3372 
 		return '';
2746 3373 
 	}
2747 3374
2748 3375 
 	public static function update_ucsdb() {
2749 3376 
 		global $tmp_dir, $globalDebug;
2750 
-		if ($globalDebug) echo "Download UCS DB : Download...";
3377 
+		if ($globalDebug) {
3378 
+			echo "Download UCS DB : Download...";
3379 
+		}
2751 3380 
 		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2752 3381 
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
2753 
-			if ($globalDebug) echo "Add to DB...";
3382 
+			if ($globalDebug) {
3383 
+				echo "Add to DB...";
3384 
+			}
2754 3385 
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2755 
-		} else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
3386 
+		} else {
3387 
+			$error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
3388 
+		}
2756 3389 
 		if ($error != '') {
2757 3390 
 			echo $error."\n";
2758 
-		} elseif ($globalDebug) echo "Done\n";
3391 
+		} elseif ($globalDebug) {
3392 
+			echo "Done\n";
3393 
+		}
2759 3394 
 		return '';
2760 3395 
 	}
2761 3396
2762 3397 
 	public static function update_celestrak() {
2763 3398 
 		global $tmp_dir, $globalDebug;
2764 
-		if ($globalDebug) echo "Download Celestrak DB : Download...";
3399 
+		if ($globalDebug) {
3400 
+			echo "Download Celestrak DB : Download...";
3401 
+		}
2765 3402 
 		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
2766 3403 
 		if (file_exists($tmp_dir.'satcat.txt')) {
2767 
-			if ($globalDebug) echo "Add to DB...";
3404 
+			if ($globalDebug) {
3405 
+				echo "Add to DB...";
3406 
+			}
2768 3407 
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
2769 
-		} else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
3408 
+		} else {
3409 
+			$error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
3410 
+		}
2770 3411 
 		if ($error != '') {
2771 3412 
 			echo $error."\n";
2772 
-		} elseif ($globalDebug) echo "Done\n";
3413 
+		} elseif ($globalDebug) {
3414 
+			echo "Done\n";
3415 
+		}
2773 3416 
 		return '';
2774 3417 
 	}
2775 3418
2776 3419 
 	public static function update_models() {
2777 3420 
 		global $tmp_dir, $globalDebug;
2778 3421 
 		$error = '';
2779 
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
3422 
+		if ($globalDebug) {
3423 
+			echo "Models from FlightAirMap website : Download...";
3424 
+		}
2780 3425 
 		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
2781 3426 
 		if (file_exists($tmp_dir.'models.md5sum')) {
2782 
-			if ($globalDebug) echo "Check files...\n";
3427 
+			if ($globalDebug) {
3428 
+				echo "Check files...\n";
3429 
+			}
2783 3430 
 			$newmodelsdb = array();
2784 3431 
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
2785 3432 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2798,19 +3445,29 @@  discard block
 
 block discarded – undo
2798 3445 
 			}
2799 3446 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2800 3447 
 			foreach ($diff as $key => $value) {
2801 
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
3448 
+				if ($globalDebug) {
3449 
+					echo 'Downloading model '.$key.' ...'."\n";
3450 
+				}
2802 3451 
 				update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
2803 3452
2804 3453 
 			}
2805 3454 
 			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
2806 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3455 
+		} else {
3456 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3457 
+		}
2807 3458 
 		if ($error != '') {
2808 3459 
 			return $error;
2809 
-		} elseif ($globalDebug) echo "Done\n";
2810 
-		if ($globalDebug) echo "glTF 2.0 Models from FlightAirMap website : Download...";
3460 
+		} elseif ($globalDebug) {
3461 
+			echo "Done\n";
3462 
+		}
3463 
+		if ($globalDebug) {
3464 
+			echo "glTF 2.0 Models from FlightAirMap website : Download...";
3465 
+		}
2811 3466 
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',$tmp_dir.'modelsgltf2.md5sum');
2812 3467 
 		if (file_exists($tmp_dir.'modelsgltf2.md5sum')) {
2813 
-			if ($globalDebug) echo "Check files...\n";
3468 
+			if ($globalDebug) {
3469 
+				echo "Check files...\n";
3470 
+			}
2814 3471 
 			$newmodelsdb = array();
2815 3472 
 			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) {
2816 3473 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2829,25 +3486,35 @@  discard block
 
 block discarded – undo
2829 3486 
 			}
2830 3487 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2831 3488 
 			foreach ($diff as $key => $value) {
2832 
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
3489 
+				if ($globalDebug) {
3490 
+					echo 'Downloading model '.$key.' ...'."\n";
3491 
+				}
2833 3492 
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key,dirname(__FILE__).'/../models/gltf2/'.$key);
2834 3493
2835 3494 
 			}
2836 3495 
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum');
2837 
-		} else $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
3496 
+		} else {
3497 
+			$error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
3498 
+		}
2838 3499 
 		if ($error != '') {
2839 3500 
 			return $error;
2840 
-		} elseif ($globalDebug) echo "Done\n";
3501 
+		} elseif ($globalDebug) {
3502 
+			echo "Done\n";
3503 
+		}
2841 3504 
 		return '';
2842 3505 
 	}
2843 3506
2844 3507 
 	public static function update_liveries() {
2845 3508 
 		global $tmp_dir, $globalDebug;
2846 3509 
 		$error = '';
2847 
-		if ($globalDebug) echo "Liveries from FlightAirMap website : Download...";
3510 
+		if ($globalDebug) {
3511 
+			echo "Liveries from FlightAirMap website : Download...";
3512 
+		}
2848 3513 
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',$tmp_dir.'liveries.md5sum');
2849 3514 
 		if (file_exists($tmp_dir.'liveries.md5sum')) {
2850 
-			if ($globalDebug) echo "Check files...\n";
3515 
+			if ($globalDebug) {
3516 
+				echo "Check files...\n";
3517 
+			}
2851 3518 
 			$newmodelsdb = array();
2852 3519 
 			if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) {
2853 3520 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2866,25 +3533,35 @@  discard block
 
 block discarded – undo
2866 3533 
 			}
2867 3534 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2868 3535 
 			foreach ($diff as $key => $value) {
2869 
-				if ($globalDebug) echo 'Downloading liveries '.$key.' ...'."\n";
3536 
+				if ($globalDebug) {
3537 
+					echo 'Downloading liveries '.$key.' ...'."\n";
3538 
+				}
2870 3539 
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key,dirname(__FILE__).'/../models/gltf2/liveries/'.$key);
2871 3540
2872 3541 
 			}
2873 3542 
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum');
2874 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3543 
+		} else {
3544 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3545 
+		}
2875 3546 
 		if ($error != '') {
2876 3547 
 			return $error;
2877 
-		} elseif ($globalDebug) echo "Done\n";
3548 
+		} elseif ($globalDebug) {
3549 
+			echo "Done\n";
3550 
+		}
2878 3551 
 		return '';
2879 3552 
 	}
2880 3553
2881 3554 
 	public static function update_space_models() {
2882 3555 
 		global $tmp_dir, $globalDebug;
2883 3556 
 		$error = '';
2884 
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
3557 
+		if ($globalDebug) {
3558 
+			echo "Space models from FlightAirMap website : Download...";
3559 
+		}
2885 3560 
 		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
2886 3561 
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
2887 
-			if ($globalDebug) echo "Check files...\n";
3562 
+			if ($globalDebug) {
3563 
+				echo "Check files...\n";
3564 
+			}
2888 3565 
 			$newmodelsdb = array();
2889 3566 
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
2890 3567 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2903,25 +3580,35 @@  discard block
 
 block discarded – undo
2903 3580 
 			}
2904 3581 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2905 3582 
 			foreach ($diff as $key => $value) {
2906 
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
3583 
+				if ($globalDebug) {
3584 
+					echo 'Downloading space model '.$key.' ...'."\n";
3585 
+				}
2907 3586 
 				update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
2908 3587
2909 3588 
 			}
2910 3589 
 			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
2911 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3590 
+		} else {
3591 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3592 
+		}
2912 3593 
 		if ($error != '') {
2913 3594 
 			return $error;
2914 
-		} elseif ($globalDebug) echo "Done\n";
3595 
+		} elseif ($globalDebug) {
3596 
+			echo "Done\n";
3597 
+		}
2915 3598 
 		return '';
2916 3599 
 	}
2917 3600
2918 3601 
 	public static function update_vehicules_models() {
2919 3602 
 		global $tmp_dir, $globalDebug;
2920 3603 
 		$error = '';
2921 
-		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
3604 
+		if ($globalDebug) {
3605 
+			echo "Vehicules models from FlightAirMap website : Download...";
3606 
+		}
2922 3607 
 		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
2923 3608 
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
2924 
-			if ($globalDebug) echo "Check files...\n";
3609 
+			if ($globalDebug) {
3610 
+				echo "Check files...\n";
3611 
+			}
2925 3612 
 			$newmodelsdb = array();
2926 3613 
 			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
2927 3614 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2940,15 +3627,21 @@  discard block
 
 block discarded – undo
2940 3627 
 			}
2941 3628 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2942 3629 
 			foreach ($diff as $key => $value) {
2943 
-				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
3630 
+				if ($globalDebug) {
3631 
+					echo 'Downloading vehicules model '.$key.' ...'."\n";
3632 
+				}
2944 3633 
 				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
2945 3634
2946 3635 
 			}
2947 3636 
 			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
2948 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3637 
+		} else {
3638 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3639 
+		}
2949 3640 
 		if ($error != '') {
2950 3641 
 			return $error;
2951 
-		} elseif ($globalDebug) echo "Done\n";
3642 
+		} elseif ($globalDebug) {
3643 
+			echo "Done\n";
3644 
+		}
2952 3645 
 		return '';
2953 3646 
 	}
2954 3647 
 
@@ -3021,7 +3714,9 @@  discard block
 
 block discarded – undo
3021 3714 
                 }
3022 3715
3023 3716 
 		$error = '';
3024 
-		if ($globalDebug) echo "Notam : Download...";
3717 
+		if ($globalDebug) {
3718 
+			echo "Notam : Download...";
3719 
+		}
3025 3720 
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
3026 3721 
 		if (file_exists($tmp_dir.'notam.rss')) {
3027 3722 
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
 
@@ -3036,14 +3731,30 @@  discard block
 
 block discarded – undo
3036 3731 
 				$data['fir'] = $q[0];
3037 3732 
 				$data['code'] = $q[1];
3038 3733 
 				$ifrvfr = $q[2];
3039 
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
3040 
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
3041 
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
3042 
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
3043 
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
3044 
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
3045 
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
3046 
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
3734 
+				if ($ifrvfr == 'IV') {
3735 
+					$data['rules'] = 'IFR/VFR';
3736 
+				}
3737 
+				if ($ifrvfr == 'I') {
3738 
+					$data['rules'] = 'IFR';
3739 
+				}
3740 
+				if ($ifrvfr == 'V') {
3741 
+					$data['rules'] = 'VFR';
3742 
+				}
3743 
+				if ($q[4] == 'A') {
3744 
+					$data['scope'] = 'Airport warning';
3745 
+				}
3746 
+				if ($q[4] == 'E') {
3747 
+					$data['scope'] = 'Enroute warning';
3748 
+				}
3749 
+				if ($q[4] == 'W') {
3750 
+					$data['scope'] = 'Navigation warning';
3751 
+				}
3752 
+				if ($q[4] == 'AE') {
3753 
+					$data['scope'] = 'Airport/Enroute warning';
3754 
+				}
3755 
+				if ($q[4] == 'AW') {
3756 
+					$data['scope'] = 'Airport/Navigation warning';
3757 
+				}
3047 3758 
 				//$data['scope'] = $q[4];
3048 3759 
 				$data['lower_limit'] = $q[5];
3049 3760 
 				$data['upper_limit'] = $q[6];
 
@@ -3051,8 +3762,12 @@  discard block
 
 block discarded – undo
3051 3762 
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
3052 3763 
 				$latitude = $Common->convertDec($las,'latitude');
3053 3764 
 				$longitude = $Common->convertDec($lns,'longitude');
3054 
-				if ($lac == 'S') $latitude = '-'.$latitude;
3055 
-				if ($lnc == 'W') $longitude = '-'.$longitude;
3765 
+				if ($lac == 'S') {
3766 
+					$latitude = '-'.$latitude;
3767 
+				}
3768 
+				if ($lnc == 'W') {
3769 
+					$longitude = '-'.$longitude;
3770 
+				}
3056 3771 
 				$data['center_latitude'] = $latitude;
3057 3772 
 				$data['center_longitude'] = $longitude;
3058 3773 
 				$data['radius'] = intval($radius);
 
@@ -3082,10 +3797,14 @@  discard block
 
 block discarded – undo
3082 3797 
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
3083 3798 
 				unset($data);
3084 3799 
 			}
3085 
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
3800 
+		} else {
3801 
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
3802 
+		}
3086 3803 
 		if ($error != '') {
3087 3804 
 			return $error;
3088 
-		} elseif ($globalDebug) echo "Done\n";
3805 
+		} elseif ($globalDebug) {
3806 
+			echo "Done\n";
3807 
+		}
3089 3808 
 		return '';
3090 3809 
 	}
3091 3810 
 	
@@ -3110,7 +3829,9 @@  discard block
 
 block discarded – undo
3110 3829 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
3111 3830 
 		$airspace_json = json_decode($airspace_lst,true);
3112 3831 
 		foreach ($airspace_json['records'] as $airspace) {
3113 
-			if ($globalDebug) echo $airspace['name']."...\n";
3832 
+			if ($globalDebug) {
3833 
+				echo $airspace['name']."...\n";
3834 
+			}
3114 3835 
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
3115 3836 
 			if (file_exists($tmp_dir.$airspace['name'])) {
3116 3837 
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
 
@@ -3154,8 +3875,11 @@  discard block
 
 block discarded – undo
3154 3875 
                         return "error : ".$e->getMessage();
3155 3876 
                 }
3156 3877 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3157 
-                if ($row['nb'] > 0) return false;
3158 
-                else return true;
3878 
+                if ($row['nb'] > 0) {
3879 
+                	return false;
3880 
+                } else {
3881 
+                	return true;
3882 
+                }
3159 3883 
 	}
3160 3884
3161 3885 
 	public static function insert_last_update() {
 
@@ -3180,8 +3904,11 @@  discard block
 
 block discarded – undo
3180 3904 
                         return "error : ".$e->getMessage();
3181 3905 
                 }
3182 3906 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3183 
-                if ($row['nb'] > 0) return true;
3184 
-                else return false;
3907 
+                if ($row['nb'] > 0) {
3908 
+                	return true;
3909 
+                } else {
3910 
+                	return false;
3911 
+                }
3185 3912 
 	}
3186 3913
3187 3914 
 	public static function check_geoid_version($version) {
 
@@ -3194,8 +3921,11 @@  discard block
 
 block discarded – undo
3194 3921 
                         return "error : ".$e->getMessage();
3195 3922 
                 }
3196 3923 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3197 
-                if ($row['nb'] > 0) return true;
3198 
-                else return false;
3924 
+                if ($row['nb'] > 0) {
3925 
+                	return true;
3926 
+                } else {
3927 
+                	return false;
3928 
+                }
3199 3929 
 	}
3200 3930
3201 3931 
 	public static function check_marine_identity_version($version) {
 
@@ -3208,8 +3938,11 @@  discard block
 
 block discarded – undo
3208 3938 
 			return "error : ".$e->getMessage();
3209 3939 
 		}
3210 3940 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3211 
-		if ($row['nb'] > 0) return true;
3212 
-		else return false;
3941 
+		if ($row['nb'] > 0) {
3942 
+			return true;
3943 
+		} else {
3944 
+			return false;
3945 
+		}
3213 3946 
 	}
3214 3947
3215 3948 
 	public static function check_satellite_version($version) {
 
@@ -3222,8 +3955,11 @@  discard block
 
 block discarded – undo
3222 3955 
 			return "error : ".$e->getMessage();
3223 3956 
 		}
3224 3957 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3225 
-		if ($row['nb'] > 0) return true;
3226 
-		else return false;
3958 
+		if ($row['nb'] > 0) {
3959 
+			return true;
3960 
+		} else {
3961 
+			return false;
3962 
+		}
3227 3963 
 	}
3228 3964
3229 3965 
 	public static function check_airlines_version($version) {
 
@@ -3236,8 +3972,11 @@  discard block
 
 block discarded – undo
3236 3972 
 			return "error : ".$e->getMessage();
3237 3973 
 		}
3238 3974 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3239 
-		if ($row['nb'] > 0) return true;
3240 
-		else return false;
3975 
+		if ($row['nb'] > 0) {
3976 
+			return true;
3977 
+		} else {
3978 
+			return false;
3979 
+		}
3241 3980 
 	}
3242 3981
3243 3982 
 	public static function check_notam_version($version) {
 
@@ -3250,8 +3989,11 @@  discard block
 
 block discarded – undo
3250 3989 
 			return "error : ".$e->getMessage();
3251 3990 
 		}
3252 3991 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3253 
-		if ($row['nb'] > 0) return true;
3254 
-		else return false;
3992 
+		if ($row['nb'] > 0) {
3993 
+			return true;
3994 
+		} else {
3995 
+			return false;
3996 
+		}
3255 3997 
 	}
3256 3998
3257 3999 
 	public static function insert_airlines_version($version) {
 
@@ -3341,8 +4083,11 @@  discard block
 
 block discarded – undo
3341 4083 
                         return "error : ".$e->getMessage();
3342 4084 
                 }
3343 4085 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3344 
-                if ($row['nb'] > 0) return false;
3345 
-                else return true;
4086 
+                if ($row['nb'] > 0) {
4087 
+                	return false;
4088 
+                } else {
4089 
+                	return true;
4090 
+                }
3346 4091 
 	}
3347 4092
3348 4093 
 	public static function insert_last_notam_update() {
 
@@ -3372,8 +4117,11 @@  discard block
 
 block discarded – undo
3372 4117 
                         return "error : ".$e->getMessage();
3373 4118 
                 }
3374 4119 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3375 
-                if ($row['nb'] > 0) return false;
3376 
-                else return true;
4120 
+                if ($row['nb'] > 0) {
4121 
+                	return false;
4122 
+                } else {
4123 
+                	return true;
4124 
+                }
3377 4125 
 	}
3378 4126
3379 4127 
 	public static function insert_last_airspace_update() {
 
@@ -3403,8 +4151,11 @@  discard block
 
 block discarded – undo
3403 4151 
                         return "error : ".$e->getMessage();
3404 4152 
                 }
3405 4153 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3406 
-                if ($row['nb'] > 0) return false;
3407 
-                else return true;
4154 
+                if ($row['nb'] > 0) {
4155 
+                	return false;
4156 
+                } else {
4157 
+                	return true;
4158 
+                }
3408 4159 
 	}
3409 4160
3410 4161 
 	public static function insert_last_geoid_update() {
 
@@ -3434,8 +4185,11 @@  discard block
 
 block discarded – undo
3434 4185 
 			return "error : ".$e->getMessage();
3435 4186 
 		}
3436 4187 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3437 
-		if ($row['nb'] > 0) return false;
3438 
-		else return true;
4188 
+		if ($row['nb'] > 0) {
4189 
+			return false;
4190 
+		} else {
4191 
+			return true;
4192 
+		}
3439 4193 
 	}
3440 4194
3441 4195 
 	public static function insert_last_owner_update() {
 
@@ -3465,8 +4219,11 @@  discard block
 
 block discarded – undo
3465 4219 
 			return "error : ".$e->getMessage();
3466 4220 
 		}
3467 4221 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3468 
-		if ($row['nb'] > 0) return false;
3469 
-		else return true;
4222 
+		if ($row['nb'] > 0) {
4223 
+			return false;
4224 
+		} else {
4225 
+			return true;
4226 
+		}
3470 4227 
 	}
3471 4228
3472 4229 
 	public static function insert_last_fires_update() {
 
@@ -3496,8 +4253,11 @@  discard block
 
 block discarded – undo
3496 4253 
 			return "error : ".$e->getMessage();
3497 4254 
 		}
3498 4255 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3499 
-		if ($row['nb'] > 0) return false;
3500 
-		else return true;
4256 
+		if ($row['nb'] > 0) {
4257 
+			return false;
4258 
+		} else {
4259 
+			return true;
4260 
+		}
3501 4261 
 	}
3502 4262
3503 4263 
 	public static function insert_last_airlines_update() {
 
@@ -3527,8 +4287,11 @@  discard block
 
 block discarded – undo
3527 4287 
                         return "error : ".$e->getMessage();
3528 4288 
                 }
3529 4289 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3530 
-                if ($row['nb'] > 0) return false;
3531 
-                else return true;
4290 
+                if ($row['nb'] > 0) {
4291 
+                	return false;
4292 
+                } else {
4293 
+                	return true;
4294 
+                }
3532 4295 
 	}
3533 4296
3534 4297 
 	public static function insert_last_schedules_update() {
 
@@ -3558,8 +4321,11 @@  discard block
 
 block discarded – undo
3558 4321 
 			return "error : ".$e->getMessage();
3559 4322 
 		}
3560 4323 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3561 
-		if ($row['nb'] > 0) return false;
3562 
-		else return true;
4324 
+		if ($row['nb'] > 0) {
4325 
+			return false;
4326 
+		} else {
4327 
+			return true;
4328 
+		}
3563 4329 
 	}
3564 4330
3565 4331 
 	public static function insert_last_tle_update() {
 
@@ -3589,8 +4355,11 @@  discard block
 
 block discarded – undo
3589 4355 
 			return "error : ".$e->getMessage();
3590 4356 
 		}
3591 4357 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3592 
-		if ($row['nb'] > 0) return false;
3593 
-		else return true;
4358 
+		if ($row['nb'] > 0) {
4359 
+			return false;
4360 
+		} else {
4361 
+			return true;
4362 
+		}
3594 4363 
 	}
3595 4364
3596 4365 
 	public static function insert_last_ucsdb_update() {
 
@@ -3620,8 +4389,11 @@  discard block
 
 block discarded – undo
3620 4389 
 			return "error : ".$e->getMessage();
3621 4390 
 		}
3622 4391 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3623 
-		if ($row['nb'] > 0) return false;
3624 
-		else return true;
4392 
+		if ($row['nb'] > 0) {
4393 
+			return false;
4394 
+		} else {
4395 
+			return true;
4396 
+		}
3625 4397 
 	}
3626 4398
3627 4399 
 	public static function insert_last_celestrak_update() {
 
@@ -3651,8 +4423,11 @@  discard block
 
 block discarded – undo
3651 4423 
 			return "error : ".$e->getMessage();
3652 4424 
 		}
3653 4425 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3654 
-		if ($row['nb'] > 0) return false;
3655 
-		else return true;
4426 
+		if ($row['nb'] > 0) {
4427 
+			return false;
4428 
+		} else {
4429 
+			return true;
4430 
+		}
3656 4431 
 	}
3657 4432
3658 4433 
 	public static function check_last_satellite_update() {
 
@@ -3670,8 +4445,11 @@  discard block
 
 block discarded – undo
3670 4445 
 			return "error : ".$e->getMessage();
3671 4446 
 		}
3672 4447 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3673 
-		if ($row['nb'] > 0) return false;
3674 
-		else return true;
4448 
+		if ($row['nb'] > 0) {
4449 
+			return false;
4450 
+		} else {
4451 
+			return true;
4452 
+		}
3675 4453 
 	}
3676 4454
3677 4455 
 	public static function insert_last_marine_identity_update() {
Please login to merge, or discard this patch.
Spacing   +409 added lines, -409 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 		$ch = curl_init();
17 17 
 		curl_setopt($ch, CURLOPT_URL, $url);
18 18 
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
19 
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
19 
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
20 20 
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
21 21 
 			}
22 22 
 		}
 
@@ -34,20 +34,20 @@  discard block
 
 block discarded – undo
34 34 
 		fclose($fp);
35 35 
 	}
36 36
37 
-	public static function gunzip($in_file,$out_file_name = '') {
37 
+	public static function gunzip($in_file, $out_file_name = '') {
38 38 
 		//echo $in_file.' -> '.$out_file_name."\n";
39 39 
 		$buffer_size = 4096; // read 4kb at a time
40 40 
 		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file);
41 41 
 		if ($in_file != '' && file_exists($in_file)) {
42 42 
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
43 
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
44 
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
43 
+			if (function_exists('gzopen')) $file = gzopen($in_file, 'rb');
44 
+			elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb');
45 45 
 			else {
46 46 
 				echo 'gzopen not available';
47 47 
 				die;
48 48 
 			}
49 49 
 			$out_file = fopen($out_file_name, 'wb');
50 
-			while(!gzeof($file)) {
50 
+			while (!gzeof($file)) {
51 51 
 				fwrite($out_file, gzread($file, $buffer_size));
52 52 
 			}
53 53 
 			fclose($out_file);
 
@@ -71,7 +71,7 @@  discard block
 
 block discarded – undo
71 71 
 		try {
72 72 
 			self::$db_sqlite = new PDO('sqlite:'.$database);
73 73 
 			self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
74 
-		} catch(PDOException $e) {
74 
+		} catch (PDOException $e) {
75 75 
 			return "error : ".$e->getMessage();
76 76 
 		}
77 77 
 	}
 
@@ -86,7 +86,7 @@  discard block
 
 block discarded – undo
86 86 
 			//$Connection = new Connection();
87 87 
 			$sth = $Connection->db->prepare($query);
88 88 
                         $sth->execute(array(':source' => $database_file));
89 
-                } catch(PDOException $e) {
89 
+                } catch (PDOException $e) {
90 90 
                         return "error : ".$e->getMessage();
91 91 
                 }
92 92 
 
@@ -97,7 +97,7 @@  discard block
 
 block discarded – undo
97 97 
 		try {
98 98 
                         $sth = update_db::$db_sqlite->prepare($query);
99 99 
                         $sth->execute();
100 
-                } catch(PDOException $e) {
100 
+                } catch (PDOException $e) {
101 101 
                         return "error : ".$e->getMessage();
102 102 
                 }
103 103 
 		//$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 
@@ -108,11 +108,11 @@  discard block
 
 block discarded – undo
108 108 
 			if ($globalTransaction) $Connection->db->beginTransaction();
109 109 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
110 110 
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
111 
-				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
111 
+				$query_dest_values = array(':CallSign' => $values['Callsign'], ':Operator_ICAO' => $values['operator_icao'], ':FromAirport_ICAO' => $values['FromAirportIcao'], ':ToAirport_ICAO' => $values['ToAirportIcao'], ':routestop' => $values['AllStop'], ':source' => $database_file);
112 112 
 				$sth_dest->execute($query_dest_values);
113 113 
             		}
114 114 
 			if ($globalTransaction) $Connection->db->commit();
115 
-		} catch(PDOException $e) {
115 
+		} catch (PDOException $e) {
116 116 
 			if ($globalTransaction) $Connection->db->rollBack();
117 117 
 			return "error : ".$e->getMessage();
118 118 
 		}
 
@@ -128,26 +128,26 @@  discard block
 
 block discarded – undo
128 128 
 			//$Connection = new Connection();
129 129 
 			$sth = $Connection->db->prepare($query);
130 130 
                         $sth->execute(array(':source' => 'oneworld'));
131 
-                } catch(PDOException $e) {
131 
+                } catch (PDOException $e) {
132 132 
                         return "error : ".$e->getMessage();
133 133 
                 }
134 134
135 135 
     		if ($globalDebug) echo " - Add routes to DB -";
136 136 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
137 137 
 		$Spotter = new Spotter();
138 
-		if ($fh = fopen($database_file,"r")) {
138 
+		if ($fh = fopen($database_file, "r")) {
139 139 
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
140 140 
 			$Connection = new Connection();
141 141 
 			$sth_dest = $Connection->db->prepare($query_dest);
142 142 
 			if ($globalTransaction) $Connection->db->beginTransaction();
143 143 
 			while (!feof($fh)) {
144 
-				$line = fgetcsv($fh,9999,',');
144 
+				$line = fgetcsv($fh, 9999, ',');
145 145 
 				if ($line[0] != '') {
146 146 
 					if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) {
147 147 
 						try {
148 
-							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
148 
+							$query_dest_values = array(':CallSign' => str_replace('*', '', $line[7]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[5], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[6], ':routestop' => '', ':source' => 'oneworld');
149 149 
 							$sth_dest->execute($query_dest_values);
150 
-						} catch(PDOException $e) {
150 
+						} catch (PDOException $e) {
151 151 
 							if ($globalTransaction) $Connection->db->rollBack();
152 152 
 							return "error : ".$e->getMessage();
153 153 
 						}
 
@@ -169,7 +169,7 @@  discard block
 
 block discarded – undo
169 169 
 			//$Connection = new Connection();
170 170 
 			$sth = $Connection->db->prepare($query);
171 171 
                         $sth->execute(array(':source' => 'skyteam'));
172 
-                } catch(PDOException $e) {
172 
+                } catch (PDOException $e) {
173 173 
                         return "error : ".$e->getMessage();
174 174 
                 }
175 175 
 
@@ -177,24 +177,24 @@  discard block
 
 block discarded – undo
177 177
178 178 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
179 179 
 		$Spotter = new Spotter();
180 
-		if ($fh = fopen($database_file,"r")) {
180 
+		if ($fh = fopen($database_file, "r")) {
181 181 
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
182 182 
 			$Connection = new Connection();
183 183 
 			$sth_dest = $Connection->db->prepare($query_dest);
184 184 
 			try {
185 185 
 				if ($globalTransaction) $Connection->db->beginTransaction();
186 186 
 				while (!feof($fh)) {
187 
-					$line = fgetcsv($fh,9999,',');
187 
+					$line = fgetcsv($fh, 9999, ',');
188 188 
 					if ($line[0] != '') {
189 
-						$datebe = explode('  -  ',$line[2]);
189 
+						$datebe = explode('  -  ', $line[2]);
190 190 
 						if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) {
191 
-							$query_dest_values = array(':CallSign' => str_replace('*','',$line[6]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[4],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[5],':routestop' => '',':source' => 'skyteam');
191 
+							$query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam');
192 192 
 							$sth_dest->execute($query_dest_values);
193 193 
 						}
194 194 
 					}
195 195 
 				}
196 196 
 				if ($globalTransaction) $Connection->db->commit();
197 
-			} catch(PDOException $e) {
197 
+			} catch (PDOException $e) {
198 198 
 				if ($globalTransaction) $Connection->db->rollBack();
199 199 
 				return "error : ".$e->getMessage();
200 200 
 			}
 
@@ -209,7 +209,7 @@  discard block
 
 block discarded – undo
209 209 
 			$Connection = new Connection();
210 210 
 			$sth = $Connection->db->prepare($query);
211 211 
                         $sth->execute(array(':source' => $database_file));
212 
-                } catch(PDOException $e) {
212 
+                } catch (PDOException $e) {
213 213 
                         return "error : ".$e->getMessage();
214 214 
                 }
215 215 
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
 
@@ -217,7 +217,7 @@  discard block
 
 block discarded – undo
217 217 
 			$Connection = new Connection();
218 218 
 			$sth = $Connection->db->prepare($query);
219 219 
                         $sth->execute(array(':source' => $database_file));
220 
-                } catch(PDOException $e) {
220 
+                } catch (PDOException $e) {
221 221 
                         return "error : ".$e->getMessage();
222 222 
                 }
223 223 
 
@@ -226,7 +226,7 @@  discard block
 
 block discarded – undo
226 226 
 		try {
227 227 
                         $sth = update_db::$db_sqlite->prepare($query);
228 228 
                         $sth->execute();
229 
-                } catch(PDOException $e) {
229 
+                } catch (PDOException $e) {
230 230 
                         return "error : ".$e->getMessage();
231 231 
                 }
232 232 
 		//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 
@@ -243,15 +243,15 @@  discard block
 
 block discarded – undo
243 243 
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
244 244 
 				if ($values['UserString4'] == 'M') $type = 'military';
245 245 
 				else $type = null;
246 
-				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
246 
+				$query_dest_values = array(':LastModified' => $values['LastModified'], ':ModeS' => $values['ModeS'], ':ModeSCountry' => $values['ModeSCountry'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':type' => $type);
247 247 
 				$sth_dest->execute($query_dest_values);
248 248 
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
249 
-				    $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
249 
+				    $query_dest_owner_values = array(':registration' => $values['Registration'], ':source' => $database_file, ':owner' => $values['RegisteredOwners']);
250 250 
 				    $sth_dest_owner->execute($query_dest_owner_values);
251 251 
 				}
252 252 
             		}
253 253 
 			if ($globalTransaction) $Connection->db->commit();
254 
-		} catch(PDOException $e) {
254 
+		} catch (PDOException $e) {
255 255 
 			return "error : ".$e->getMessage();
256 256 
 		}
257 257 
 
@@ -261,7 +261,7 @@  discard block
 
 block discarded – undo
261 261 
 			$Connection = new Connection();
262 262 
 			$sth = $Connection->db->prepare($query);
263 263 
                         $sth->execute(array(':source' => $database_file));
264 
-                } catch(PDOException $e) {
264 
+                } catch (PDOException $e) {
265 265 
                         return "error : ".$e->getMessage();
266 266 
                 }
267 267 
 		return '';
 
@@ -276,11 +276,11 @@  discard block
 
 block discarded – undo
276 276 
 			$Connection = new Connection();
277 277 
 			$sth = $Connection->db->prepare($query);
278 278 
                         $sth->execute(array(':source' => $database_file));
279 
-                } catch(PDOException $e) {
279 
+                } catch (PDOException $e) {
280 280 
                         return "error : ".$e->getMessage();
281 281 
                 }
282 282
283 
-		if ($fh = fopen($database_file,"r")) {
283 
+		if ($fh = fopen($database_file, "r")) {
284 284 
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
285 285 
 			$query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)';
286 286 
 		
@@ -290,13 +290,13 @@  discard block
 
 block discarded – undo
290 290 
 				if ($globalTransaction) $Connection->db->beginTransaction();
291 291 
             			while (!feof($fh)) {
292 292 
             				$values = array();
293 
-            				$line = $Common->hex2str(fgets($fh,9999));
293 
+            				$line = $Common->hex2str(fgets($fh, 9999));
294 294 
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
295 
-            				$values['ModeS'] = substr($line,0,6);
296 
-            				$values['Registration'] = trim(substr($line,69,6));
297 
-            				$aircraft_name = trim(substr($line,48,6));
295 
+            				$values['ModeS'] = substr($line, 0, 6);
296 
+            				$values['Registration'] = trim(substr($line, 69, 6));
297 
+            				$aircraft_name = trim(substr($line, 48, 6));
298 298 
             				// Check if we can find ICAO, else set it to GLID
299 
-            				$aircraft_name_split = explode(' ',$aircraft_name);
299 
+            				$aircraft_name_split = explode(' ', $aircraft_name);
300 300 
             				$search_more = '';
301 301 
             				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
302 302 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
 
@@ -308,20 +308,20 @@  discard block
 
 block discarded – undo
308 308 
 	            				if (isset($result['icao']) && $result['icao'] != '') {
309 309 
 	            				    $values['ICAOTypeCode'] = $result['icao'];
310 310 
 	            				}
311 
-					} catch(PDOException $e) {
311 
+					} catch (PDOException $e) {
312 312 
 						return "error : ".$e->getMessage();
313 313 
 					}
314 314 
 					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
315 315 
 					// Add data to db
316 316 
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
317 317 
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
318 
-						$query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm');
318 
+						$query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm');
319 319 
 						//print_r($query_dest_values);
320 320 
 						$sth_dest->execute($query_dest_values);
321 321 
 					}
322 322 
 				}
323 323 
 				if ($globalTransaction) $Connection->db->commit();
324 
-			} catch(PDOException $e) {
324 
+			} catch (PDOException $e) {
325 325 
 				return "error : ".$e->getMessage();
326 326 
 			}
327 327 
 		}
 
@@ -331,7 +331,7 @@  discard block
 
 block discarded – undo
331 331 
 			$Connection = new Connection();
332 332 
 			$sth = $Connection->db->prepare($query);
333 333 
                         $sth->execute(array(':source' => $database_file));
334 
-                } catch(PDOException $e) {
334 
+                } catch (PDOException $e) {
335 335 
                         return "error : ".$e->getMessage();
336 336 
                 }
337 337 
 		return '';
 
@@ -345,11 +345,11 @@  discard block
 
 block discarded – undo
345 345 
 			$Connection = new Connection();
346 346 
 			$sth = $Connection->db->prepare($query);
347 347 
                         $sth->execute(array(':source' => $database_file));
348 
-                } catch(PDOException $e) {
348 
+                } catch (PDOException $e) {
349 349 
                         return "error : ".$e->getMessage();
350 350 
                 }
351 351
352 
-		if ($fh = fopen($database_file,"r")) {
352 
+		if ($fh = fopen($database_file, "r")) {
353 353 
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
354 354 
 			$query_dest = 'INSERT INTO aircraft_modes (LastModified,ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:lastmodified,:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)';
355 355 
 		
@@ -357,9 +357,9 @@  discard block
 
 block discarded – undo
357 357 
 			$sth_dest = $Connection->db->prepare($query_dest);
358 358 
 			try {
359 359 
 				if ($globalTransaction) $Connection->db->beginTransaction();
360 
-				$tmp = fgetcsv($fh,9999,',',"'");
360 
+				$tmp = fgetcsv($fh, 9999, ',', "'");
361 361 
             			while (!feof($fh)) {
362 
-            				$line = fgetcsv($fh,9999,',',"'");
362 
+            				$line = fgetcsv($fh, 9999, ',', "'");
363 363
364 364 
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
365 365 
 					//print_r($line);
 
@@ -368,7 +368,7 @@  discard block
 
 block discarded – undo
368 368 
             				$values['ICAOTypeCode'] = '';
369 369 
             				$aircraft_name = $line[2];
370 370 
             				// Check if we can find ICAO, else set it to GLID
371 
-            				$aircraft_name_split = explode(' ',$aircraft_name);
371 
+            				$aircraft_name_split = explode(' ', $aircraft_name);
372 372 
             				$search_more = '';
373 373 
             				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
374 374 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
 
@@ -377,20 +377,20 @@  discard block
 
 block discarded – undo
377 377 
                                     		$sth_search->execute();
378 378 
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
379 379 
 	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
380 
-					} catch(PDOException $e) {
380 
+					} catch (PDOException $e) {
381 381 
 						return "error : ".$e->getMessage();
382 382 
 					}
383 383 
 					//if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
384 384 
 					// Add data to db
385 385 
 					if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') {
386 386 
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
387 
-						$query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'),':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm');
387 
+						$query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'), ':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm');
388 388 
 						//print_r($query_dest_values);
389 389 
 						$sth_dest->execute($query_dest_values);
390 390 
 					}
391 391 
 				}
392 392 
 				if ($globalTransaction) $Connection->db->commit();
393 
-			} catch(PDOException $e) {
393 
+			} catch (PDOException $e) {
394 394 
 				return "error : ".$e->getMessage();
395 395 
 			}
396 396 
 		}
 
@@ -400,13 +400,13 @@  discard block
 
 block discarded – undo
400 400 
 			$Connection = new Connection();
401 401 
 			$sth = $Connection->db->prepare($query);
402 402 
                         $sth->execute(array(':source' => $database_file));
403 
-                } catch(PDOException $e) {
403 
+                } catch (PDOException $e) {
404 404 
                         return "error : ".$e->getMessage();
405 405 
                 }
406 406 
 		return '';
407 407 
 	}
408 408
409 
-	public static function retrieve_owner($database_file,$country = 'F') {
409 
+	public static function retrieve_owner($database_file, $country = 'F') {
410 410 
 		global $globalTransaction, $globalMasterSource;
411 411 
 		//$query = 'TRUNCATE TABLE aircraft_modes';
412 412 
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source; DELETE FROM aircraft_modes WHERE Source = :source;";
 
@@ -414,12 +414,12 @@  discard block
 
 block discarded – undo
414 414 
 			$Connection = new Connection();
415 415 
 			$sth = $Connection->db->prepare($query);
416 416 
                         $sth->execute(array(':source' => $database_file));
417 
-                } catch(PDOException $e) {
417 
+                } catch (PDOException $e) {
418 418 
                         return "error : ".$e->getMessage();
419 419 
                 }
420 420 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
421 421 
 		$Spotter = new Spotter();
422 
-		if ($fh = fopen($database_file,"r")) {
422 
+		if ($fh = fopen($database_file, "r")) {
423 423 
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
424 424 
 			$query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
425 425 
 		        $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)';
 
@@ -429,9 +429,9 @@  discard block
 
 block discarded – undo
429 429 
 			$sth_modes = $Connection->db->prepare($query_modes);
430 430 
 			try {
431 431 
 				if ($globalTransaction) $Connection->db->beginTransaction();
432 
-				$tmp = fgetcsv($fh,9999,',','"');
432 
+				$tmp = fgetcsv($fh, 9999, ',', '"');
433 433 
             			while (!feof($fh)) {
434 
-            				$line = fgetcsv($fh,9999,',','"');
434 
+            				$line = fgetcsv($fh, 9999, ',', '"');
435 435 
             				$values = array();
436 436 
             				//print_r($line);
437 437 
             				if ($country == 'F') {
 
@@ -439,7 +439,7 @@  discard block
 
 block discarded – undo
439 439 
             				    $values['base'] = $line[4];
440 440 
             				    $values['owner'] = $line[5];
441 441 
             				    if ($line[6] == '') $values['date_first_reg'] = null;
442 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
442 
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6]));
443 443 
 					    $values['cancel'] = $line[7];
444 444 
 					} elseif ($country == 'EI') {
445 445 
 					    // TODO : add modeS & reg to aircraft_modes
 
@@ -447,7 +447,7 @@  discard block
 
 block discarded – undo
447 447 
             				    $values['base'] = $line[3];
448 448 
             				    $values['owner'] = $line[2];
449 449 
             				    if ($line[1] == '') $values['date_first_reg'] = null;
450 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
450 
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1]));
451 451 
 					    $values['cancel'] = '';
452 452 
 					    $values['modes'] = $line[7];
453 453 
 					    $values['icao'] = $line[8];
 
@@ -467,7 +467,7 @@  discard block
 
 block discarded – undo
467 467 
             				    $values['base'] = null;
468 468 
             				    $values['owner'] = $line[5];
469 469 
             				    if ($line[18] == '') $values['date_first_reg'] = null;
470 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
470 
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18]));
471 471 
 					    $values['cancel'] = '';
472 472 
 					} elseif ($country == 'VH') {
473 473 
 					    // TODO : add modeS & reg to aircraft_modes
 
@@ -475,7 +475,7 @@  discard block
 
 block discarded – undo
475 475 
             				    $values['base'] = null;
476 476 
             				    $values['owner'] = $line[12];
477 477 
             				    if ($line[28] == '') $values['date_first_reg'] = null;
478 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
478 
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[28]));
479 479
480 480 
 					    $values['cancel'] = $line[39];
481 481 
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
 
@@ -495,28 +495,28 @@  discard block
 
 block discarded – undo
495 495 
             				    $values['base'] = null;
496 496 
             				    $values['owner'] = $line[8];
497 497 
             				    if ($line[7] == '') $values['date_first_reg'] = null;
498 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
498 
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7]));
499 499 
 					    $values['cancel'] = '';
500 500 
 					} elseif ($country == 'PP') {
501 501 
             				    $values['registration'] = $line[0];
502 502 
             				    $values['base'] = null;
503 503 
             				    $values['owner'] = $line[4];
504 504 
             				    if ($line[6] == '') $values['date_first_reg'] = null;
505 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
505 
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6]));
506 506 
 					    $values['cancel'] = $line[7];
507 507 
 					} elseif ($country == 'E7') {
508 508 
             				    $values['registration'] = $line[0];
509 509 
             				    $values['base'] = null;
510 510 
             				    $values['owner'] = $line[4];
511 511 
             				    if ($line[5] == '') $values['date_first_reg'] = null;
512 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
512 
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5]));
513 513 
 					    $values['cancel'] = '';
514 514 
 					} elseif ($country == '8Q') {
515 515 
             				    $values['registration'] = $line[0];
516 516 
             				    $values['base'] = null;
517 517 
             				    $values['owner'] = $line[3];
518 518 
             				    if ($line[7] == '') $values['date_first_reg'] = null;
519 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
519 
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7]));
520 520 
 					    $values['cancel'] = '';
521 521 
 					} elseif ($country == 'ZK') {
522 522 
             				    $values['registration'] = $line[0];
 
@@ -530,18 +530,18 @@  discard block
 
 block discarded – undo
530 530 
             				    $values['registration'] = $line[0];
531 531 
             				    $values['base'] = null;
532 532 
             				    $values['owner'] = $line[6];
533 
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
534 
-					    $values['cancel'] = date("Y-m-d",strtotime($line[8]));
533 
+            				    $values['date_first_reg'] = date("Y-m-d", strtotime($line[5]));
534 
+					    $values['cancel'] = date("Y-m-d", strtotime($line[8]));
535 535 
 					    $values['modes'] = $line[4];
536 536 
 					    $values['icao'] = $line[10];
537 537 
 					} elseif ($country == 'OY') {
538 538 
             				    $values['registration'] = $line[0];
539 
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[4]));
539 
+            				    $values['date_first_reg'] = date("Y-m-d", strtotime($line[4]));
540 540 
 					    $values['modes'] = $line[5];
541 541 
 					    $values['icao'] = $line[6];
542 542 
 					} elseif ($country == 'PH') {
543 543 
             				    $values['registration'] = $line[0];
544 
-            				    $values['date_first_reg'] = date("Y-m-d",strtotime($line[3]));
544 
+            				    $values['date_first_reg'] = date("Y-m-d", strtotime($line[3]));
545 545 
 					    $values['modes'] = $line[4];
546 546 
 					    $values['icao'] = $line[5];
547 547 
 					} elseif ($country == 'OM' || $country == 'TF') {
 
@@ -552,17 +552,17 @@  discard block
 
 block discarded – undo
552 552 
 					    $values['cancel'] = '';
553 553 
 					}
554 554 
 					if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) {
555 
-						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
555 
+						$query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file);
556 556 
 						$sth_dest->execute($query_dest_values);
557 557 
 					}
558 558 
 					if ($globalMasterSource && $values['registration'] != null && isset($values['modes']) && $values['modes'] != '') {
559 559 
 						$modescountry = $Spotter->countryFromAircraftRegistration($values['registration']);
560 
-						$query_modes_values = array(':registration' => $values['registration'],':modes' => $values['modes'],':modescountry' => $modescountry,':icaotypecode' => $values['icao'],':source' => $database_file);
560 
+						$query_modes_values = array(':registration' => $values['registration'], ':modes' => $values['modes'], ':modescountry' => $modescountry, ':icaotypecode' => $values['icao'], ':source' => $database_file);
561 561 
 						$sth_modes->execute($query_modes_values);
562 562 
 					}
563 563 
 				}
564 564 
 				if ($globalTransaction) $Connection->db->commit();
565 
-			} catch(PDOException $e) {
565 
+			} catch (PDOException $e) {
566 566 
 				return "error : ".$e->getMessage();
567 567 
 			}
568 568 
 		}
 
@@ -700,7 +700,7 @@  discard block
 
 block discarded – undo
700 700 
 		if ($globalTransaction) $Connection->db->beginTransaction();
701 701
702 702 
 		$i = 0;
703 
-		while($row = sparql_fetch_array($result))
703 
+		while ($row = sparql_fetch_array($result))
704 704 
 		{
705 705 
 			if ($i >= 1) {
706 706 
 			//print_r($row);
 
@@ -720,33 +720,33 @@  discard block
 
 block discarded – undo
720 720 
 				$row['image'] = '';
721 721 
 				$row['image_thumb'] = '';
722 722 
 			} else {
723 
-				$image = str_replace(' ','_',$row['image']);
723 
+				$image = str_replace(' ', '_', $row['image']);
724 724 
 				$digest = md5($image);
725 
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image;
726 
-				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder;
727 
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image;
728 
-				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder;
725 
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image;
726 
+				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder;
727 
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image;
728 
+				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder;
729 729 
 			}
730 730
731 
-			$country = explode('-',$row['country']);
731 
+			$country = explode('-', $row['country']);
732 732 
 			$row['country'] = $country[0];
733 733
734 734 
 			$row['type'] = trim($row['type']);
735 
-			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i',$row['name'])) {
735 
+			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i', $row['name'])) {
736 736 
 				$row['type'] = 'military';
737 737 
 			} elseif ($row['type'] == 'http://dbpedia.org/resource/Airport' || $row['type'] == 'Civil' || $row['type'] == 'Public use' || $row['type'] == 'Public' || $row['type'] == 'http://dbpedia.org/resource/Civilian' || $row['type'] == 'Public, Civilian' || $row['type'] == 'Public / Military' || $row['type'] == 'Private & Civilian' || $row['type'] == 'Civilian and Military' || $row['type'] == 'Public/military' || $row['type'] == 'Active With Few Facilities' || $row['type'] == '?ivilian' || $row['type'] == 'Civil/Military' || $row['type'] == 'NA' || $row['type'] == 'Public/Military') {
738 738 
 				$row['type'] = 'small_airport';
739 739 
 			}
740 740
741 
-			$row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city'])));
742 
-			$query_dest_values = array(':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => round($row['altitude']),':type' => $row['type'],':city' => $row['city'],':country' => $row['country'],':home_link' => $row['homepage'],':wikipedia_link' => $row['wikipedia_page'],':image' => $row['image'],':image_thumb' => $row['image_thumb']);
741 
+			$row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city'])));
742 
+			$query_dest_values = array(':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => round($row['altitude']), ':type' => $row['type'], ':city' => $row['city'], ':country' => $row['country'], ':home_link' => $row['homepage'], ':wikipedia_link' => $row['wikipedia_page'], ':image' => $row['image'], ':image_thumb' => $row['image_thumb']);
743 743 
 			//print_r($query_dest_values);
744 744
745 745 
 			if ($row['icao'] != '') {
746 746 
 				try {
747 747 
 					$sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao');
748 748 
 					$sth->execute(array(':icao' => $row['icao']));
749 
-				} catch(PDOException $e) {
749 
+				} catch (PDOException $e) {
750 750 
 					return "error : ".$e->getMessage();
751 751 
 				}
752 752 
 					if ($sth->fetchColumn() > 0) {
 
@@ -754,15 +754,15 @@  discard block
 
 block discarded – undo
754 754 
 						$query = 'UPDATE airport SET type = :type WHERE icao = :icao';
755 755 
 						try {
756 756 
 							$sth = $Connection->db->prepare($query);
757 
-							$sth->execute(array(':icao' => $row['icao'],':type' => $row['type']));
758 
-						} catch(PDOException $e) {
757 
+							$sth->execute(array(':icao' => $row['icao'], ':type' => $row['type']));
758 
+						} catch (PDOException $e) {
759 759 
 							return "error : ".$e->getMessage();
760 760 
 						}
761 761 
 						echo $row['icao'].' : '.$row['type']."\n";
762 762 
 					} else {
763 763 
 						try {
764 764 
 							$sth_dest->execute($query_dest_values);
765 
-						} catch(PDOException $e) {
765 
+						} catch (PDOException $e) {
766 766 
 							return "error : ".$e->getMessage();
767 767 
 						}
768 768 
 					}
 
@@ -813,7 +813,7 @@  discard block
 
 block discarded – undo
813 813 
 		echo "Download data from ourairports.com...\n";
814 814 
 		$delimiter = ',';
815 815 
 		$out_file = $tmp_dir.'airports.csv';
816 
-		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
816 
+		update_db::download('http://ourairports.com/data/airports.csv', $out_file);
817 817 
 		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
818 818 
 		echo "Add data from ourairports.com...\n";
819 819 
 
@@ -824,33 +824,33 @@  discard block
 
 block discarded – undo
824 824 
 			//$Connection->db->beginTransaction();
825 825 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
826 826 
 			{
827 
-				if(!$header) $header = $row;
827 
+				if (!$header) $header = $row;
828 828 
 				else {
829 829 
 					$data = array();
830 830 
 					$data = array_combine($header, $row);
831 831 
 					try {
832 832 
 						$sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao');
833 833 
 						$sth->execute(array(':icao' => $data['ident']));
834 
-					} catch(PDOException $e) {
834 
+					} catch (PDOException $e) {
835 835 
 						return "error : ".$e->getMessage();
836 836 
 					}
837 837 
 					if ($sth->fetchColumn() > 0) {
838 838 
 						$query = 'UPDATE airport SET type = :type WHERE icao = :icao';
839 839 
 						try {
840 840 
 							$sth = $Connection->db->prepare($query);
841 
-							$sth->execute(array(':icao' => $data['ident'],':type' => $data['type']));
842 
-						} catch(PDOException $e) {
841 
+							$sth->execute(array(':icao' => $data['ident'], ':type' => $data['type']));
842 
+						} catch (PDOException $e) {
843 843 
 							return "error : ".$e->getMessage();
844 844 
 						}
845 845 
 					} else {
846 846 
 						if ($data['gps_code'] == $data['ident']) {
847 847 
 						$query = "INSERT INTO airport (name,city,country,iata,icao,latitude,longitude,altitude,type,home_link,wikipedia_link)
848 848 
 						    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)";
849 
-						$query_values = array(':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => round($data['elevation_ft']),':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']);
849 
+						$query_values = array(':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => round($data['elevation_ft']), ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']);
850 850 
 						try {
851 851 
 							$sth = $Connection->db->prepare($query);
852 852 
 							$sth->execute($query_values);
853 
-						} catch(PDOException $e) {
853 
+						} catch (PDOException $e) {
854 854 
 							return "error : ".$e->getMessage();
855 855 
 						}
856 856 
 						$i++;
 
@@ -865,7 +865,7 @@  discard block
 
 block discarded – undo
865 865
866 866 
 		echo "Download data from another free database...\n";
867 867 
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
868 
-		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
868 
+		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file);
869 869 
 		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
870 870 
 		update_db::unzip($out_file);
871 871 
 		$header = NULL;
 
@@ -877,15 +877,15 @@  discard block
 
 block discarded – undo
877 877 
 			//$Connection->db->beginTransaction();
878 878 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
879 879 
 			{
880 
-				if(!$header) $header = $row;
880 
+				if (!$header) $header = $row;
881 881 
 				else {
882 882 
 					$data = $row;
883 883
884 884 
 					$query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao';
885 885 
 					try {
886 886 
 						$sth = $Connection->db->prepare($query);
887 
-						$sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4]))));
888 
-					} catch(PDOException $e) {
887 
+						$sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4]))));
888 
+					} catch (PDOException $e) {
889 889 
 						return "error : ".$e->getMessage();
890 890 
 					}
891 891 
 				}
 
@@ -899,15 +899,15 @@  discard block
 
 block discarded – undo
899 899 
 		try {
900 900 
 			$sth = $Connection->db->prepare("SELECT icao FROM airport WHERE name LIKE '%Air Base%'");
901 901 
 			$sth->execute();
902 
-		} catch(PDOException $e) {
902 
+		} catch (PDOException $e) {
903 903 
 			return "error : ".$e->getMessage();
904 904 
 		}
905 905 
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
906 906 
 			$query2 = 'UPDATE airport SET type = :type WHERE icao = :icao';
907 907 
 			try {
908 908 
 				$sth2 = $Connection->db->prepare($query2);
909 
-				$sth2->execute(array(':icao' => $row['icao'],':type' => 'military'));
910 
-			} catch(PDOException $e) {
909 
+				$sth2->execute(array(':icao' => $row['icao'], ':type' => 'military'));
910 
+			} catch (PDOException $e) {
911 911 
 				return "error : ".$e->getMessage();
912 912 
 			}
913 913 
 		}
 
@@ -928,7 +928,7 @@  discard block
 
 block discarded – undo
928 928 
 			$Connection = new Connection();
929 929 
 			$sth = $Connection->db->prepare($query);
930 930 
                         $sth->execute(array(':source' => 'translation.csv'));
931 
-                } catch(PDOException $e) {
931 
+                } catch (PDOException $e) {
932 932 
                         return "error : ".$e->getMessage();
933 933 
                 }
934 934 
 
@@ -945,7 +945,7 @@  discard block
 
 block discarded – undo
945 945 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
946 946 
 			{
947 947 
 				$i++;
948 
-				if($i > 12) {
948 
+				if ($i > 12) {
949 949 
 					$data = $row;
950 950 
 					$operator = $data[2];
951 951 
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
 
@@ -953,7 +953,7 @@  discard block
 
 block discarded – undo
953 953 
                                                 //echo substr($operator, 0, 2)."\n";;
954 954 
                                                 if (count($airline_array) > 0) {
955 955 
 							//print_r($airline_array);
956 
-							$operator = $airline_array[0]['icao'].substr($operator,2);
956 
+							$operator = $airline_array[0]['icao'].substr($operator, 2);
957 957 
                                                 }
958 958 
                                         }
959 959 
 					
@@ -961,14 +961,14 @@  discard block
 
 block discarded – undo
961 961 
 					if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) {
962 962 
                                                 $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
963 963 
                                                 if (count($airline_array) > 0) {
964 
-                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
964 
+                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct, 2);
965 965 
                                             	}
966 966 
                                         }
967 967 
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
968 968 
 					try {
969 969 
 						$sth = $Connection->db->prepare($query);
970 
-						$sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv'));
971 
-					} catch(PDOException $e) {
970 
+						$sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv'));
971 
+					} catch (PDOException $e) {
972 972 
 						return "error : ".$e->getMessage();
973 973 
 					}
974 974 
 				}
 
@@ -986,7 +986,7 @@  discard block
 
 block discarded – undo
986 986 
 			$Connection = new Connection();
987 987 
 			$sth = $Connection->db->prepare($query);
988 988 
 			$sth->execute(array(':source' => 'website_fam'));
989 
-		} catch(PDOException $e) {
989 
+		} catch (PDOException $e) {
990 990 
 			return "error : ".$e->getMessage();
991 991 
 		}
992 992 
 		//update_db::unzip($out_file);
 
@@ -1004,8 +1004,8 @@  discard block
 
 block discarded – undo
1004 1004 
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
1005 1005 
 					try {
1006 1006 
 						$sth = $Connection->db->prepare($query);
1007 
-						$sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam'));
1008 
-					} catch(PDOException $e) {
1007 
+						$sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam'));
1008 
+					} catch (PDOException $e) {
1009 1009 
 						return "error : ".$e->getMessage();
1010 1010 
 					}
1011 1011 
 				}
 
@@ -1028,7 +1028,7 @@  discard block
 
 block discarded – undo
1028 1028 
 			$Connection = new Connection();
1029 1029 
 			$sth = $Connection->db->prepare($query);
1030 1030 
                         $sth->execute(array(':source' => 'website_faa'));
1031 
-                } catch(PDOException $e) {
1031 
+                } catch (PDOException $e) {
1032 1032 
                         return "error : ".$e->getMessage();
1033 1033 
                 }
1034 1034 
 
@@ -1037,7 +1037,7 @@  discard block
 
 block discarded – undo
1037 1037 
 			$Connection = new Connection();
1038 1038 
 			$sth = $Connection->db->prepare($query);
1039 1039 
                         $sth->execute(array(':source' => 'website_faa'));
1040 
-                } catch(PDOException $e) {
1040 
+                } catch (PDOException $e) {
1041 1041 
                         return "error : ".$e->getMessage();
1042 1042 
                 }
1043 1043 
 
@@ -1054,8 +1054,8 @@  discard block
 
 block discarded – undo
1054 1054 
 					$query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1';
1055 1055 
 					try {
1056 1056 
 						$sths = $Connection->db->prepare($query_search);
1057 
-						$sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa'));
1058 
-					} catch(PDOException $e) {
1057 
+						$sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa'));
1058 
+					} catch (PDOException $e) {
1059 1059 
 						return "error s : ".$e->getMessage();
1060 1060 
 					}
1061 1061 
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1068,8 +1068,8 @@  discard block
 
 block discarded – undo
1068 1068 
 							//}
1069 1069 
 						try {
1070 1070 
 							$sthi = $Connection->db->prepare($queryi);
1071 
-							$sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode']));
1072 
-						} catch(PDOException $e) {
1071 
+							$sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode']));
1072 
+						} catch (PDOException $e) {
1073 1073 
 							return "error u : ".$e->getMessage();
1074 1074 
 						}
1075 1075 
 					} else {
 
@@ -1077,7 +1077,7 @@  discard block
 
 block discarded – undo
1077 1077 
 						try {
1078 1078 
 							$sthsm = $Connection->db->prepare($query_search_mfr);
1079 1079 
 							$sthsm->execute(array(':mfr' => $data[2]));
1080 
-						} catch(PDOException $e) {
1080 
+						} catch (PDOException $e) {
1081 1081 
 							return "error mfr : ".$e->getMessage();
1082 1082 
 						}
1083 1083 
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1087,8 +1087,8 @@  discard block
 
 block discarded – undo
1087 1087 
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
1088 1088 
 							try {
1089 1089 
 								$sthf = $Connection->db->prepare($queryf);
1090 
-								$sthf->execute(array(':FirstCreated' => $data[16],':LastModified' => $data[15],':ModeS' => $data[33],':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0],':ICAOTypeCode' => $result_search_mfr[0]['icao'],':source' => 'website_faa'));
1091 
-							} catch(PDOException $e) {
1090 
+								$sthf->execute(array(':FirstCreated' => $data[16], ':LastModified' => $data[15], ':ModeS' => $data[33], ':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0], ':ICAOTypeCode' => $result_search_mfr[0]['icao'], ':source' => 'website_faa'));
1091 
+							} catch (PDOException $e) {
1092 1092 
 								return "error f : ".$e->getMessage();
1093 1093 
 							}
1094 1094 
 						}
 
@@ -1098,13 +1098,13 @@  discard block
 
 block discarded – undo
1098 1098 
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
1099 1099 
 						try {
1100 1100 
 							$sth = $Connection->db->prepare($query);
1101 
-							$sth->execute(array(':registration' => 'N'.$data[0],':base' => $data[9],':owner' => ucwords(strtolower($data[6])),':date_first_reg' => date('Y-m-d',strtotime($data[23])), ':source' => 'website_faa'));
1102 
-						} catch(PDOException $e) {
1101 
+							$sth->execute(array(':registration' => 'N'.$data[0], ':base' => $data[9], ':owner' => ucwords(strtolower($data[6])), ':date_first_reg' => date('Y-m-d', strtotime($data[23])), ':source' => 'website_faa'));
1102 
+						} catch (PDOException $e) {
1103 1103 
 							return "error i : ".$e->getMessage();
1104 1104 
 						}
1105 1105 
 					}
1106 1106 
 				}
1107 
-				if ($i % 90 == 0) {
1107 
+				if ($i%90 == 0) {
1108 1108 
 					if ($globalTransaction) $Connection->db->commit();
1109 1109 
 					if ($globalTransaction) $Connection->db->beginTransaction();
1110 1110 
 				}
 
@@ -1123,7 +1123,7 @@  discard block
 
 block discarded – undo
1123 1123 
 			$Connection = new Connection();
1124 1124 
 			$sth = $Connection->db->prepare($query);
1125 1125 
 			$sth->execute(array(':source' => 'website_fam'));
1126 
-		} catch(PDOException $e) {
1126 
+		} catch (PDOException $e) {
1127 1127 
 			return "error : ".$e->getMessage();
1128 1128 
 		}
1129 1129 
 		$delimiter = "\t";
 
@@ -1139,8 +1139,8 @@  discard block
 
 block discarded – undo
1139 1139 
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
1140 1140 
 					try {
1141 1141 
 						$sth = $Connection->db->prepare($query);
1142 
-						$sth->execute(array(':FirstCreated' => $data[0],':LastModified' => $data[1],':ModeS' => $data[2],':ModeSCountry' => $data[3], ':Registration' => $data[4],':ICAOTypeCode' => $data[5],':type_flight' => $data[6],':source' => 'website_fam'));
1143 
-					} catch(PDOException $e) {
1142 
+						$sth->execute(array(':FirstCreated' => $data[0], ':LastModified' => $data[1], ':ModeS' => $data[2], ':ModeSCountry' => $data[3], ':Registration' => $data[4], ':ICAOTypeCode' => $data[5], ':type_flight' => $data[6], ':source' => 'website_fam'));
1143 
+					} catch (PDOException $e) {
1144 1144 
 						return "error : ".$e->getMessage();
1145 1145 
 					}
1146 1146 
 				}
 
@@ -1172,7 +1172,7 @@  discard block
 
 block discarded – undo
1172 1172 
 		try {
1173 1173 
 			$sth = $Connection->db->prepare($query);
1174 1174 
 			$sth->execute();
1175 
-		} catch(PDOException $e) {
1175 
+		} catch (PDOException $e) {
1176 1176 
 			return "error : ".$e->getMessage();
1177 1177 
 		}
1178 1178 
 		$delimiter = "\t";
 
@@ -1187,8 +1187,8 @@  discard block
 
 block discarded – undo
1187 1187 
 					$query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)';
1188 1188 
 					try {
1189 1189 
 						$sth = $Connection->db->prepare($query);
1190 
-						$sth->execute(array(':name' => $data[0],':alias' => $data[1],':iata' => $data[2],':icao' => $data[3], ':callsign' => $data[4],':country' => $data[5],':active' => $data[6],':type' => $data[7],':home' => $data[8],':wikipedia_link' => $data[9],':alliance' => $data[10],':ban_eu' => $data[11]));
1191 
-					} catch(PDOException $e) {
1190 
+						$sth->execute(array(':name' => $data[0], ':alias' => $data[1], ':iata' => $data[2], ':icao' => $data[3], ':callsign' => $data[4], ':country' => $data[5], ':active' => $data[6], ':type' => $data[7], ':home' => $data[8], ':wikipedia_link' => $data[9], ':alliance' => $data[10], ':ban_eu' => $data[11]));
1191 
+					} catch (PDOException $e) {
1192 1192 
 						return "error : ".$e->getMessage();
1193 1193 
 					}
1194 1194 
 				}
 
@@ -1216,7 +1216,7 @@  discard block
 
 block discarded – undo
1216 1216 
 			$Connection = new Connection();
1217 1217 
 			$sth = $Connection->db->prepare($query);
1218 1218 
                         $sth->execute(array(':source' => 'website_fam'));
1219 
-                } catch(PDOException $e) {
1219 
+                } catch (PDOException $e) {
1220 1220 
                         return "error : ".$e->getMessage();
1221 1221 
                 }
1222 1222 
 
@@ -1232,8 +1232,8 @@  discard block
 
 block discarded – undo
1232 1232 
 					$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)';
1233 1233 
 					try {
1234 1234 
 						$sth = $Connection->db->prepare($query);
1235 
-						$sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam'));
1236 
-					} catch(PDOException $e) {
1235 
+						$sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam'));
1236 
+					} catch (PDOException $e) {
1237 1237 
 						//print_r($data);
1238 1238 
 						return "error : ".$e->getMessage();
1239 1239 
 					}
 
@@ -1253,7 +1253,7 @@  discard block
 
 block discarded – undo
1253 1253 
 			$Connection = new Connection();
1254 1254 
 			$sth = $Connection->db->prepare($query);
1255 1255 
 			$sth->execute(array(':source' => 'website_fam'));
1256 
-		} catch(PDOException $e) {
1256 
+		} catch (PDOException $e) {
1257 1257 
 			return "error : ".$e->getMessage();
1258 1258 
 		}
1259 1259 
 		$delimiter = "\t";
 
@@ -1269,13 +1269,13 @@  discard block
 
 block discarded – undo
1269 1269 
 					$query = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign,:Operator_ICAO,:FromAirport_ICAO,:FromAirport_Time,:ToAirport_ICAO,:ToAirport_Time,:RouteStop,:source)';
1270 1270 
 					try {
1271 1271 
 						$sth = $Connection->db->prepare($query);
1272 
-						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
1273 
-					} catch(PDOException $e) {
1274 
-						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
1272 
+						$sth->execute(array(':CallSign' => $data[0], ':Operator_ICAO' => $data[1], ':FromAirport_ICAO' => $data[2], ':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4], ':ToAirport_Time' => $data[5], ':RouteStop' => $data[6], ':source' => 'website_fam'));
1273 
+					} catch (PDOException $e) {
1274 
+						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',', $data);
1275 1275 
 						die();
1276 1276 
 					}
1277 1277 
 				}
1278 
-				if ($globalTransaction && $i % 2000 == 0) {
1278 
+				if ($globalTransaction && $i%2000 == 0) {
1279 1279 
 					$Connection->db->commit();
1280 1280 
 					if ($globalDebug) echo '.';
1281 1281 
 					$Connection->db->beginTransaction();
 
@@ -1295,7 +1295,7 @@  discard block
 
 block discarded – undo
1295 1295 
 			$Connection = new Connection();
1296 1296 
 			$sth = $Connection->db->prepare($query);
1297 1297 
 			$sth->execute(array(':source' => 'website_fam'));
1298 
-		} catch(PDOException $e) {
1298 
+		} catch (PDOException $e) {
1299 1299 
 			return "error : ".$e->getMessage();
1300 1300 
 		}
1301 1301 
 		$Connection = new Connection();
 
@@ -1308,12 +1308,12 @@  discard block
 
 block discarded – undo
1308 1308 
 				$query = 'INSERT INTO aircraft_block (callSign,Source) VALUES (:callSign,:source)';
1309 1309 
 				try {
1310 1310 
 					$sth = $Connection->db->prepare($query);
1311 
-					$sth->execute(array(':callSign' => trim($data),':source' => 'website_fam'));
1312 
-				} catch(PDOException $e) {
1311 
+					$sth->execute(array(':callSign' => trim($data), ':source' => 'website_fam'));
1312 
+				} catch (PDOException $e) {
1313 1313 
 					if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".$data;
1314 1314 
 					die();
1315 1315 
 				}
1316 
-				if ($globalTransaction && $i % 2000 == 0) {
1316 
+				if ($globalTransaction && $i%2000 == 0) {
1317 1317 
 					$Connection->db->commit();
1318 1318 
 					if ($globalDebug) echo '.';
1319 1319 
 					$Connection->db->beginTransaction();
 
@@ -1333,7 +1333,7 @@  discard block
 
 block discarded – undo
1333 1333 
 			$Connection = new Connection();
1334 1334 
 			$sth = $Connection->db->prepare($query);
1335 1335 
                         $sth->execute();
1336 
-                } catch(PDOException $e) {
1336 
+                } catch (PDOException $e) {
1337 1337 
                         return "error : ".$e->getMessage();
1338 1338 
                 }
1339 1339 
 
@@ -1354,8 +1354,8 @@  discard block
 
 block discarded – undo
1354 1354 
 					$query = 'INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,length,gross_tonnage,dead_weight,width,country,engine_power,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:length,:gross_tonnage,:dead_weight,:width,:country,:engine_power,:type)';
1355 1355 
 					try {
1356 1356 
 						$sth = $Connection->db->prepare($query);
1357 
-						$sth->execute(array(':mmsi' => $data[0],':imo' => $data[1],':call_sign' => $data[2],':ship_name' => $data[3], ':length' => $data[4],':gross_tonnage' => $data[5],':dead_weight' => $data[6],':width' => $data[7],':country' => $data[8],':engine_power' => $data[9],':type' => $data[10]));
1358 
-					} catch(PDOException $e) {
1357 
+						$sth->execute(array(':mmsi' => $data[0], ':imo' => $data[1], ':call_sign' => $data[2], ':ship_name' => $data[3], ':length' => $data[4], ':gross_tonnage' => $data[5], ':dead_weight' => $data[6], ':width' => $data[7], ':country' => $data[8], ':engine_power' => $data[9], ':type' => $data[10]));
1358 
+					} catch (PDOException $e) {
1359 1359 
 						return "error : ".$e->getMessage();
1360 1360 
 					}
1361 1361 
 				}
 
@@ -1374,7 +1374,7 @@  discard block
 
 block discarded – undo
1374 1374 
 			$Connection = new Connection();
1375 1375 
 			$sth = $Connection->db->prepare($query);
1376 1376 
 			$sth->execute();
1377 
-		} catch(PDOException $e) {
1377 
+		} catch (PDOException $e) {
1378 1378 
 			return "error : ".$e->getMessage();
1379 1379 
 		}
1380 1380 
 		$delimiter = "\t";
 
@@ -1391,8 +1391,8 @@  discard block
 
 block discarded – undo
1391 1391 
 					    VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)';
1392 1392 
 					try {
1393 1393 
 						$sth = $Connection->db->prepare($query);
1394 
-						$sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21],':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29]));
1395 
-					} catch(PDOException $e) {
1394 
+						$sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21], ':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29]));
1395 
+					} catch (PDOException $e) {
1396 1396 
 						return "error : ".$e->getMessage();
1397 1397 
 					}
1398 1398 
 				}
 
@@ -1411,7 +1411,7 @@  discard block
 
 block discarded – undo
1411 1411 
 			$Connection = new Connection();
1412 1412 
 			$sth = $Connection->db->prepare($query);
1413 1413 
 			$sth->execute();
1414 
-		} catch(PDOException $e) {
1414 
+		} catch (PDOException $e) {
1415 1415 
 			return "error : ".$e->getMessage();
1416 1416 
 		}
1417 1417 
 
@@ -1427,7 +1427,7 @@  discard block
 
 block discarded – undo
1427 1427 
 					try {
1428 1428 
 						$sth = $Connection->db->prepare($query);
1429 1429 
 						$sth->execute(array(':icao' => $icao));
1430 
-					} catch(PDOException $e) {
1430 
+					} catch (PDOException $e) {
1431 1431 
 						return "error : ".$e->getMessage();
1432 1432 
 					}
1433 1433 
 				}
 
@@ -1438,7 +1438,7 @@  discard block
 
 block discarded – undo
1438 1438 
 		return '';
1439 1439 
         }
1440 1440
1441 
-	public static function tle($filename,$tletype) {
1441 
+	public static function tle($filename, $tletype) {
1442 1442 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
1443 1443 
 		global $tmp_dir, $globalTransaction;
1444 1444 
 		//$Spotter = new Spotter();
 
@@ -1448,7 +1448,7 @@  discard block
 
 block discarded – undo
1448 1448 
 			$Connection = new Connection();
1449 1449 
 			$sth = $Connection->db->prepare($query);
1450 1450 
                         $sth->execute(array(':source' => $filename));
1451 
-                } catch(PDOException $e) {
1451 
+                } catch (PDOException $e) {
1452 1452 
                         return "error : ".$e->getMessage();
1453 1453 
                 }
1454 1454 
 		
@@ -1473,8 +1473,8 @@  discard block
 
 block discarded – undo
1473 1473 
 					$query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)';
1474 1474 
 					try {
1475 1475 
 						$sth = $Connection->db->prepare($query);
1476 
-						$sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename));
1477 
-					} catch(PDOException $e) {
1476 
+						$sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename));
1477 
+					} catch (PDOException $e) {
1478 1478 
 						return "error : ".$e->getMessage();
1479 1479 
 					}
1480 1480 
 
@@ -1494,7 +1494,7 @@  discard block
 
 block discarded – undo
1494 1494 
 			$Connection = new Connection();
1495 1495 
 			$sth = $Connection->db->prepare($query);
1496 1496 
 			$sth->execute(array(':source' => $filename));
1497 
-		} catch(PDOException $e) {
1497 
+		} catch (PDOException $e) {
1498 1498 
 			return "error : ".$e->getMessage();
1499 1499 
 		}
1500 1500 
 		
@@ -1504,13 +1504,13 @@  discard block
 
 block discarded – undo
1504 1504 
 			$i = 0;
1505 1505 
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1506 1506 
 			//$Connection->db->beginTransaction();
1507 
-			while (($data = fgetcsv($handle, 1000,"\t")) !== FALSE)
1507 
+			while (($data = fgetcsv($handle, 1000, "\t")) !== FALSE)
1508 1508 
 			{
1509 1509 
 				if ($i > 0 && $data[0] != '') {
1510 1510 
 					$sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]);
1511 
-					$period = str_replace(',','',$data[14]);
1512 
-					if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60;
1513 
-					if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18]));
1511 
+					$period = str_replace(',', '', $data[14]);
1512 
+					if (!empty($period) && strpos($period, 'days')) $period = str_replace(' days', '', $period)*24*60;
1513 
+					if ($data[18] != '') $launch_date = date('Y-m-d', strtotime($data[18]));
1514 1514 
 					else $launch_date = NULL;
1515 1515 
 					$data = array_map(function($value) {
1516 1516 
 						return trim($value) === '' ? null : $value;
 
@@ -1520,8 +1520,8 @@  discard block
 
 block discarded – undo
1520 1520 
 					    VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)';
1521 1521 
 					try {
1522 1522 
 						$sth = $Connection->db->prepare($query);
1523 
-						$sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',','',$data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',','',$data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+',','),'',$data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',','-1900',' (BOL)',' (EOL)'),'',$data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',',' (BOL)',' (EOL)'),'',$data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20],':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources));
1524 
-					} catch(PDOException $e) {
1523 
+						$sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',', '', $data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',', '', $data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+', ','), '', $data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',', '-1900', ' (BOL)', ' (EOL)'), '', $data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',', ' (BOL)', ' (EOL)'), '', $data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20], ':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources));
1524 
+					} catch (PDOException $e) {
1525 1525 
 						return "error : ".$e->getMessage();
1526 1526 
 					}
1527 1527 
 				}
 
@@ -1561,7 +1561,7 @@  discard block
 
 block discarded – undo
1561 1561 
 			'EGYP' => array('country' => 'Egypt', 'owner' => ''),
1562 1562 
 			'ESA' => array('country' => 'Multinational', 'owner' => 'European Space Agency'),
1563 1563 
 			'ESRO' => array('country' => 'Multinational', 'owner' => 'European Space Research Organization'),
1564 
-			'EST' => array('country' => 'Estonia','owner' => ''),
1564 
+			'EST' => array('country' => 'Estonia', 'owner' => ''),
1565 1565 
 			'EUME' => array('country' => 'Multinational', 'owner' => 'EUMETSAT (European Organization for the Exploitation of Meteorological Satellites)'),
1566 1566 
 			'EUTE' => array('country' => 'Multinational', 'owner' => 'European Telecommunications Satellite Consortium (EUTELSAT)'),
1567 1567 
 			'FGER' => array('country' => 'France/Germany', 'owner' => ''),
 
@@ -1685,10 +1685,10 @@  discard block
 
 block discarded – undo
1685 1685 
 			{
1686 1686 
 				if ($data != '') {
1687 1687 
 				$result = array();
1688 
-				$result['cospar'] = trim(substr($data,0,11));
1689 
-				$result['norad'] = trim(substr($data,13,6));
1690 
-				$result['operational'] = trim(substr($data,21,1));
1691 
-				$result['name'] = trim(substr($data,23,24));
1688 
+				$result['cospar'] = trim(substr($data, 0, 11));
1689 
+				$result['norad'] = trim(substr($data, 13, 6));
1690 
+				$result['operational'] = trim(substr($data, 21, 1));
1691 
+				$result['name'] = trim(substr($data, 23, 24));
1692 1692 
 				/*
1693 1693 
 				    * R/B(1) = Rocket body, first stage
1694 1694 
 				    * R/B(2) = Rocket body, second stage
 
@@ -1700,29 +1700,29 @@  discard block
 
 block discarded – undo
1700 1700 
 				    * An ampersand (&) indicates two or more objects are attached
1701 1701 
 				*/
1702 1702
1703 
-				$owner_code = trim(substr($data,49,5));
1703 
+				$owner_code = trim(substr($data, 49, 5));
1704 1704
1705 1705 
 				if (!isset($satcat_sources[$owner_code])) {
1706 1706 
 					echo $data;
1707 1707 
 					echo 'owner_code: '.$owner_code."\n";
1708 1708 
 				}
1709 
-				if (!isset($satcat_launch_site[trim(substr($data,68,5))])) {
1710 
-					echo 'launch_site_code: '.trim(substr($data,68,5))."\n";
1709 
+				if (!isset($satcat_launch_site[trim(substr($data, 68, 5))])) {
1710 
+					echo 'launch_site_code: '.trim(substr($data, 68, 5))."\n";
1711 1711 
 				}
1712 1712
1713 
-				if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data,68,5))])) {
1713 
+				if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data, 68, 5))])) {
1714 1714 
 					$result['country_owner'] = $satcat_sources[$owner_code]['country'];
1715 1715 
 					$result['owner'] = $satcat_sources[$owner_code]['owner'];
1716 
-					$result['launch_date'] = trim(substr($data,56,10));
1717 
-					$launch_site_code = trim(substr($data,68,5));
1716 
+					$result['launch_date'] = trim(substr($data, 56, 10));
1717 
+					$launch_site_code = trim(substr($data, 68, 5));
1718 1718 
 					$result['launch_site'] = $satcat_launch_site[$launch_site_code];
1719 
-					$result['lifetime'] = trim(substr($data,75,10));
1720 
-					$result['period'] = trim(substr($data,87,7));
1721 
-					$result['inclination'] = trim(substr($data,96,5));
1722 
-					$result['apogee'] = trim(substr($data,103,6));
1723 
-					$result['perigee'] = trim(substr($data,111,6));
1719 
+					$result['lifetime'] = trim(substr($data, 75, 10));
1720 
+					$result['period'] = trim(substr($data, 87, 7));
1721 
+					$result['inclination'] = trim(substr($data, 96, 5));
1722 
+					$result['apogee'] = trim(substr($data, 103, 6));
1723 
+					$result['perigee'] = trim(substr($data, 111, 6));
1724 1724 
 					//$result['radarcross'] = trim(substr($data,119,8));
1725 
-					$result['status'] = trim(substr($data,129,3));
1725 
+					$result['status'] = trim(substr($data, 129, 3));
1726 1726 
 					//print_r($result);
1727 1727 
 					$result = array_map(function($value) {
1728 1728 
 						return trim($value) === '' ? null : $value;
 
@@ -1735,7 +1735,7 @@  discard block
 
 block discarded – undo
1735 1735 
 							$sth = $Connection->db->prepare($query);
1736 1736 
 							$sth->execute(array(':cospar' => $result['cospar']));
1737 1737 
 							$exist = $sth->fetchAll(PDO::FETCH_ASSOC);
1738 
-						} catch(PDOException $e) {
1738 
+						} catch (PDOException $e) {
1739 1739 
 							return "error : ".$e->getMessage();
1740 1740 
 						}
1741 1741 
 						if (empty($exist)) {
 
@@ -1747,10 +1747,10 @@  discard block
 
 block discarded – undo
1747 1747 
 								    ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'],
1748 1748 
 								    ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'],
1749 1749 
 								    ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'],
1750 
-								    ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => ''
1750 
+								    ':contractor' => '', ':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => ''
1751 1751 
 								    )
1752 1752 
 								);
1753 
-							} catch(PDOException $e) {
1753 
+							} catch (PDOException $e) {
1754 1754 
 								return "error : ".$e->getMessage();
1755 1755 
 							}
1756 1756 
 						} elseif ($exist[0]['name'] != $result['name'] && $exist[0]['name_alternate'] != $result['name']) {
 
@@ -1758,8 +1758,8 @@  discard block
 
 block discarded – undo
1758 1758 
 							try {
1759 1759 
 								$Connection = new Connection();
1760 1760 
 								$sth = $Connection->db->prepare($query);
1761 
-								$sth->execute(array(':name_alternate' => $result['name'],':cospar' => $result['cospar']));
1762 
-							} catch(PDOException $e) {
1761 
+								$sth->execute(array(':name_alternate' => $result['name'], ':cospar' => $result['cospar']));
1762 
+							} catch (PDOException $e) {
1763 1763 
 								return "error : ".$e->getMessage();
1764 1764 
 							}
1765 1765 
 						}
 
@@ -1878,13 +1878,13 @@  discard block
 
 block discarded – undo
1878 1878 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1879 1879 
 			{
1880 1880 
 				$i++;
1881 
-				if($i > 3 && count($row) > 2) {
1881 
+				if ($i > 3 && count($row) > 2) {
1882 1882 
 					$data = array_values(array_filter($row));
1883 1883 
 					$cntdata = count($data);
1884 1884 
 					if ($cntdata > 10) {
1885 1885 
 						$value = $data[9];
1886 1886
1887 
-						for ($i =10;$i < $cntdata;$i++) {
1887 
+						for ($i = 10; $i < $cntdata; $i++) {
1888 1888 
 							$value .= ' '.$data[$i];
1889 1889 
 						}
1890 1890 
 						$data[9] = $value;
 
@@ -1894,8 +1894,8 @@  discard block
 
 block discarded – undo
1894 1894 
 						$query = 'INSERT INTO waypoints (name_begin,latitude_begin,longitude_begin,name_end,latitude_end,longitude_end,high,base,top,segment_name) VALUES (:name_begin, :latitude_begin, :longitude_begin, :name_end, :latitude_end, :longitude_end, :high, :base, :top, :segment_name)';
1895 1895 
 						try {
1896 1896 
 							$sth = $Connection->db->prepare($query);
1897 
-							$sth->execute(array(':name_begin' => $data[0],':latitude_begin' => $data[1],':longitude_begin' => $data[2],':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9]));
1898 
-						} catch(PDOException $e) {
1897 
+							$sth->execute(array(':name_begin' => $data[0], ':latitude_begin' => $data[1], ':longitude_begin' => $data[2], ':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9]));
1898 
+						} catch (PDOException $e) {
1899 1899 
 							return "error : ".$e->getMessage();
1900 1900 
 						}
1901 1901 
 					}
 
@@ -1912,16 +1912,16 @@  discard block
 
 block discarded – undo
1912 1912 
 		require_once(dirname(__FILE__).'/../require/class.Source.php');
1913 1913 
 		$delimiter = ',';
1914 1914 
 		$Common = new Common();
1915 
-		$Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv',$tmp_dir.'fires.csv');
1915 
+		$Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv', $tmp_dir.'fires.csv');
1916 1916 
 		$Connection = new Connection();
1917 1917 
 		$Source = new Source();
1918 1918 
 		$Source->deleteLocationByType('fires');
1919 1919 
 		$i = 0;
1920 
-		if (($handle = fopen($tmp_dir.'fires.csv','r')) !== false) {
1921 
-			while (($row = fgetcsv($handle,1000)) !== false) {
1920 
+		if (($handle = fopen($tmp_dir.'fires.csv', 'r')) !== false) {
1921 
+			while (($row = fgetcsv($handle, 1000)) !== false) {
1922 1922 
 				if ($i > 0 && $row[0] != '' && $row[8] != 'low') {
1923 
-					$description = array('bright_t14' => $row[2],'scan' => $row[3],'track' => $row[4],'sat' => $row[7],'confidence' => $row[8],'version' => $row[9],'bright_t15' => $row[10],'frp' => $row[11],'daynight' => $row[12]);
1924 
-					$Source->addLocation('',$row[0],$row[1],null,'','','fires','fire.png','fires',0,0,$row[5].' '.substr($row[6],0,2).':'.substr($row[6],2,2),json_encode($description));
1923 
+					$description = array('bright_t14' => $row[2], 'scan' => $row[3], 'track' => $row[4], 'sat' => $row[7], 'confidence' => $row[8], 'version' => $row[9], 'bright_t15' => $row[10], 'frp' => $row[11], 'daynight' => $row[12]);
1924 
+					$Source->addLocation('', $row[0], $row[1], null, '', '', 'fires', 'fire.png', 'fires', 0, 0, $row[5].' '.substr($row[6], 0, 2).':'.substr($row[6], 2, 2), json_encode($description));
1925 1925 
 				}
1926 1926 
 				$i++;
1927 1927 
 			}
 
@@ -1937,7 +1937,7 @@  discard block
 
 block discarded – undo
1937 1937 
 			$Connection = new Connection();
1938 1938 
 			$sth = $Connection->db->prepare($query);
1939 1939 
 			$sth->execute();
1940 
-		} catch(PDOException $e) {
1940 
+		} catch (PDOException $e) {
1941 1941 
 			return "error : ".$e->getMessage();
1942 1942 
 		}
1943 1943 
 		$header = NULL;
 
@@ -1948,12 +1948,12 @@  discard block
 
 block discarded – undo
1948 1948 
 			if ($globalTransaction) $Connection->db->beginTransaction();
1949 1949 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1950 1950 
 			{
1951 
-				if(count($row) > 1) {
1951 
+				if (count($row) > 1) {
1952 1952 
 					$query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')";
1953 1953 
 					try {
1954 1954 
 						$sth = $Connection->db->prepare($query);
1955 
-						$sth->execute(array(':name' => $row[1],':icao' => $row[0]));
1956 
-					} catch(PDOException $e) {
1955 
+						$sth->execute(array(':name' => $row[1], ':icao' => $row[0]));
1956 
+					} catch (PDOException $e) {
1957 1957 
 						return "error : ".$e->getMessage();
1958 1958 
 					}
1959 1959 
 				}
 
@@ -1973,21 +1973,21 @@  discard block
 
 block discarded – undo
1973 1973 
 			try {
1974 1974 
 				$sth = $Connection->db->prepare($query);
1975 1975 
                     		$sth->execute();
1976 
-	                } catch(PDOException $e) {
1976 
+	                } catch (PDOException $e) {
1977 1977 
 				return "error : ".$e->getMessage();
1978 1978 
 	                }
1979 1979 
 	        }
1980 1980
1981 1981
1982 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1982 
+		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql');
1983 1983 
 		else {
1984 
-			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
1984 
+			update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql');
1985 1985 
 			$query = "CREATE EXTENSION postgis";
1986 
-			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
1986 
+			$Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']);
1987 1987 
 			try {
1988 1988 
 				$sth = $Connection->db->prepare($query);
1989 1989 
 				$sth->execute();
1990 
-			} catch(PDOException $e) {
1990 
+			} catch (PDOException $e) {
1991 1991 
 				return "error : ".$e->getMessage();
1992 1992 
 			}
1993 1993 
 		}
 
@@ -2000,13 +2000,13 @@  discard block
 
 block discarded – undo
2000 2000 
 		include_once('class.create_db.php');
2001 2001 
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
2002 2002 
 		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
2003 
-		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5');
2003 
+		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5', $tmp_dir.'notam.txt.gz.md5');
2004 2004 
 		$error = '';
2005 2005 
 		if (file_exists($tmp_dir.'notam.txt.gz.md5')) {
2006 
-			$notam_md5_file = explode(' ',file_get_contents($tmp_dir.'notam.txt.gz.md5'));
2006 
+			$notam_md5_file = explode(' ', file_get_contents($tmp_dir.'notam.txt.gz.md5'));
2007 2007 
 			$notam_md5 = $notam_md5_file[0];
2008 2008 
 			if (!update_db::check_notam_version($notam_md5)) {
2009 
-				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
2009 
+				update_db::download('http://data.flightairmap.com/data/notam.txt.gz', $tmp_dir.'notam.txt.gz');
2010 2010 
 				if (file_exists($tmp_dir.'notam.txt.gz')) {
2011 2011 
 					if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) {
2012 2012 
 						if ($globalDebug) echo "Gunzip...";
 
@@ -2042,14 +2042,14 @@  discard block
 
 block discarded – undo
2042 2042 
 			try {
2043 2043 
 				$sth = $Connection->db->prepare($query);
2044 2044 
             	        	$sth->execute();
2045 
-	                } catch(PDOException $e) {
2045 
+	                } catch (PDOException $e) {
2046 2046 
     	                	echo "error : ".$e->getMessage();
2047 2047 
 	                }
2048 2048 
 		}
2049 2049 
 		if ($globalDBdriver == 'mysql') {
2050 
-			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
2050 
+			update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql');
2051 2051 
 		} else {
2052 
-			update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql');
2052 
+			update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql');
2053 2053 
 		}
2054 2054 
 		$error = create_db::import_file($tmp_dir.'countries.sql');
2055 2055 
 		return $error;
 
@@ -2062,7 +2062,7 @@  discard block
 
 block discarded – undo
2062 2062 
 //		update_db::unzip($tmp_dir.'AptNav.zip');
2063 2063 
 //		update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz');
2064 2064 
 //		update_db::download('http://sourceforge.net/p/flightgear/fgdata/ci/next/tree/Navaids/awy.dat.gz?format=raw',$tmp_dir.'awy.dat.gz','http://sourceforge.net');
2065 
-		update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz',$tmp_dir.'awy.dat.gz','http://sourceforge.net');
2065 
+		update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz', $tmp_dir.'awy.dat.gz', 'http://sourceforge.net');
2066 2066 
 		update_db::gunzip($tmp_dir.'awy.dat.gz');
2067 2067 
 		$error = update_db::waypoints($tmp_dir.'awy.dat');
2068 2068 
 		return $error;
 
@@ -2083,7 +2083,7 @@  discard block
 
 block discarded – undo
2083 2083 
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
2084 2084 
 				if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
2085 2085 
 				if (is_writable(dirname(__FILE__).'/../images/airlines')) {
2086 
-					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
2086 
+					if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
2087 2087 
 				} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
2088 2088 
 			} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
2089 2089 
 		} else $error = "ZIP module not loaded but required for IVAO.";
 
@@ -2097,7 +2097,7 @@  discard block
 
 block discarded – undo
2097 2097 
 		global $tmp_dir, $globalDebug;
2098 2098 
 		$error = '';
2099 2099 
 		if ($globalDebug) echo "Routes : Download...";
2100 
-		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
2100 
+		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz');
2101 2101 
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
2102 2102 
 			if ($globalDebug) echo "Gunzip...";
2103 2103 
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
 
@@ -2113,7 +2113,7 @@  discard block
 
 block discarded – undo
2113 2113 
 		global $tmp_dir, $globalDebug;
2114 2114 
 		$error = '';
2115 2115 
 		if ($globalDebug) echo "Schedules Oneworld : Download...";
2116 
-		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
2116 
+		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz');
2117 2117 
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
2118 2118 
 			if ($globalDebug) echo "Gunzip...";
2119 2119 
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
 
@@ -2129,7 +2129,7 @@  discard block
 
 block discarded – undo
2129 2129 
 		global $tmp_dir, $globalDebug;
2130 2130 
 		$error = '';
2131 2131 
 		if ($globalDebug) echo "Schedules Skyteam : Download...";
2132 
-		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
2132 
+		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz');
2133 2133 
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
2134 2134 
 			if ($globalDebug) echo "Gunzip...";
2135 2135 
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
 
@@ -2157,7 +2157,7 @@  discard block
 
 block discarded – undo
2157 2157 
 */
2158 2158 
 		if ($globalDebug) echo "Modes : Download...";
2159 2159 
 //		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
2160 
-		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
2160 
+		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz');
2161 2161
2162 2162 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
2163 2163 
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
 
@@ -2177,7 +2177,7 @@  discard block
 
 block discarded – undo
2177 2177 
 	public static function update_ModeS_faa() {
2178 2178 
 		global $tmp_dir, $globalDebug;
2179 2179 
 		if ($globalDebug) echo "Modes FAA: Download...";
2180 
-		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
2180 
+		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip');
2181 2181 
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
2182 2182 
 			if ($globalDebug) echo "Unzip...";
2183 2183 
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
 
@@ -2193,7 +2193,7 @@  discard block
 
 block discarded – undo
2193 2193 
 	public static function update_ModeS_flarm() {
2194 2194 
 		global $tmp_dir, $globalDebug;
2195 2195 
 		if ($globalDebug) echo "Modes Flarmnet: Download...";
2196 
-		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
2196 
+		update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln');
2197 2197 
 		if (file_exists($tmp_dir.'data.fln')) {
2198 2198 
 			if ($globalDebug) echo "Add to DB...";
2199 2199 
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
 
@@ -2207,7 +2207,7 @@  discard block
 
 block discarded – undo
2207 2207 
 	public static function update_ModeS_ogn() {
2208 2208 
 		global $tmp_dir, $globalDebug;
2209 2209 
 		if ($globalDebug) echo "Modes OGN: Download...";
2210 
-		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
2210 
+		update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv');
2211 2211 
 		if (file_exists($tmp_dir.'ogn.csv')) {
2212 2212 
 			if ($globalDebug) echo "Add to DB...";
2213 2213 
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
 
@@ -2222,201 +2222,201 @@  discard block
 
 block discarded – undo
2222 2222 
 		global $tmp_dir, $globalDebug, $globalMasterSource;
2223 2223
2224 2224 
 		if ($globalDebug) echo "Owner France: Download...";
2225 
-		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
2225 
+		update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv');
2226 2226 
 		if (file_exists($tmp_dir.'owner_f.csv')) {
2227 2227 
 			if ($globalDebug) echo "Add to DB...";
2228 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
2228 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F');
2229 2229 
 		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2230 2230 
 		if ($error != '') {
2231 2231 
 			return $error;
2232 2232 
 		} elseif ($globalDebug) echo "Done\n";
2233 2233
2234 2234 
 		if ($globalDebug) echo "Owner Ireland: Download...";
2235 
-		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
2235 
+		update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv');
2236 2236 
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
2237 2237 
 			if ($globalDebug) echo "Add to DB...";
2238 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
2238 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI');
2239 2239 
 		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2240 2240 
 		if ($error != '') {
2241 2241 
 			return $error;
2242 2242 
 		} elseif ($globalDebug) echo "Done\n";
2243 2243 
 		if ($globalDebug) echo "Owner Switzerland: Download...";
2244 
-		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
2244 
+		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv');
2245 2245 
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
2246 2246 
 			if ($globalDebug) echo "Add to DB...";
2247 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
2247 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB');
2248 2248 
 		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2249 2249 
 		if ($error != '') {
2250 2250 
 			return $error;
2251 2251 
 		} elseif ($globalDebug) echo "Done\n";
2252 2252 
 		if ($globalDebug) echo "Owner Czech Republic: Download...";
2253 
-		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
2253 
+		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv');
2254 2254 
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
2255 2255 
 			if ($globalDebug) echo "Add to DB...";
2256 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
2256 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK');
2257 2257 
 		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2258 2258 
 		if ($error != '') {
2259 2259 
 			return $error;
2260 2260 
 		} elseif ($globalDebug) echo "Done\n";
2261 2261 
 		if ($globalDebug) echo "Owner Australia: Download...";
2262 
-		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
2262 
+		update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv');
2263 2263 
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
2264 2264 
 			if ($globalDebug) echo "Add to DB...";
2265 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
2265 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH');
2266 2266 
 		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2267 2267 
 		if ($error != '') {
2268 2268 
 			return $error;
2269 2269 
 		} elseif ($globalDebug) echo "Done\n";
2270 2270 
 		if ($globalDebug) echo "Owner Austria: Download...";
2271 
-		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
2271 
+		update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv');
2272 2272 
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
2273 2273 
 			if ($globalDebug) echo "Add to DB...";
2274 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
2274 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE');
2275 2275 
 		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2276 2276 
 		if ($error != '') {
2277 2277 
 			return $error;
2278 2278 
 		} elseif ($globalDebug) echo "Done\n";
2279 2279 
 		if ($globalDebug) echo "Owner Chile: Download...";
2280 
-		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
2280 
+		update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv');
2281 2281 
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
2282 2282 
 			if ($globalDebug) echo "Add to DB...";
2283 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
2283 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC');
2284 2284 
 		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2285 2285 
 		if ($error != '') {
2286 2286 
 			return $error;
2287 2287 
 		} elseif ($globalDebug) echo "Done\n";
2288 2288 
 		if ($globalDebug) echo "Owner Colombia: Download...";
2289 
-		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
2289 
+		update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv');
2290 2290 
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
2291 2291 
 			if ($globalDebug) echo "Add to DB...";
2292 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
2292 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ');
2293 2293 
 		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2294 2294 
 		if ($error != '') {
2295 2295 
 			return $error;
2296 2296 
 		} elseif ($globalDebug) echo "Done\n";
2297 2297 
 		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
2298 
-		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
2298 
+		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv');
2299 2299 
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
2300 2300 
 			if ($globalDebug) echo "Add to DB...";
2301 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
2301 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7');
2302 2302 
 		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2303 2303 
 		if ($error != '') {
2304 2304 
 			return $error;
2305 2305 
 		} elseif ($globalDebug) echo "Done\n";
2306 2306 
 		if ($globalDebug) echo "Owner Brazil: Download...";
2307 
-		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
2307 
+		update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv');
2308 2308 
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
2309 2309 
 			if ($globalDebug) echo "Add to DB...";
2310 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
2310 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP');
2311 2311 
 		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2312 2312 
 		if ($error != '') {
2313 2313 
 			return $error;
2314 2314 
 		} elseif ($globalDebug) echo "Done\n";
2315 2315 
 		if ($globalDebug) echo "Owner Cayman Islands: Download...";
2316 
-		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
2316 
+		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv');
2317 2317 
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
2318 2318 
 			if ($globalDebug) echo "Add to DB...";
2319 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
2319 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP');
2320 2320 
 		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2321 2321 
 		if ($error != '') {
2322 2322 
 			return $error;
2323 2323 
 		} elseif ($globalDebug) echo "Done\n";
2324 2324 
 		if ($globalDebug) echo "Owner Croatia: Download...";
2325 
-		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
2325 
+		update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv');
2326 2326 
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
2327 2327 
 			if ($globalDebug) echo "Add to DB...";
2328 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
2328 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A');
2329 2329 
 		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2330 2330 
 		if ($error != '') {
2331 2331 
 			return $error;
2332 2332 
 		} elseif ($globalDebug) echo "Done\n";
2333 2333 
 		if ($globalDebug) echo "Owner Luxembourg: Download...";
2334 
-		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
2334 
+		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv');
2335 2335 
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
2336 2336 
 			if ($globalDebug) echo "Add to DB...";
2337 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
2337 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX');
2338 2338 
 		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2339 2339 
 		if ($error != '') {
2340 2340 
 			return $error;
2341 2341 
 		} elseif ($globalDebug) echo "Done\n";
2342 2342 
 		if ($globalDebug) echo "Owner Maldives: Download...";
2343 
-		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
2343 
+		update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv');
2344 2344 
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
2345 2345 
 			if ($globalDebug) echo "Add to DB...";
2346 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
2346 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q');
2347 2347 
 		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2348 2348 
 		if ($error != '') {
2349 2349 
 			return $error;
2350 2350 
 		} elseif ($globalDebug) echo "Done\n";
2351 2351 
 		if ($globalDebug) echo "Owner New Zealand: Download...";
2352 
-		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
2352 
+		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv');
2353 2353 
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
2354 2354 
 			if ($globalDebug) echo "Add to DB...";
2355 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
2355 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK');
2356 2356 
 		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2357 2357 
 		if ($error != '') {
2358 2358 
 			return $error;
2359 2359 
 		} elseif ($globalDebug) echo "Done\n";
2360 2360 
 		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
2361 
-		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
2361 
+		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv');
2362 2362 
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
2363 2363 
 			if ($globalDebug) echo "Add to DB...";
2364 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
2364 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2');
2365 2365 
 		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2366 2366 
 		if ($error != '') {
2367 2367 
 			return $error;
2368 2368 
 		} elseif ($globalDebug) echo "Done\n";
2369 2369 
 		if ($globalDebug) echo "Owner Slovakia: Download...";
2370 
-		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
2370 
+		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv');
2371 2371 
 		if (file_exists($tmp_dir.'owner_om.csv')) {
2372 2372 
 			if ($globalDebug) echo "Add to DB...";
2373 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
2373 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM');
2374 2374 
 		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2375 2375 
 		if ($error != '') {
2376 2376 
 			return $error;
2377 2377 
 		} elseif ($globalDebug) echo "Done\n";
2378 2378 
 		if ($globalDebug) echo "Owner Ecuador: Download...";
2379 
-		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
2379 
+		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv');
2380 2380 
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
2381 2381 
 			if ($globalDebug) echo "Add to DB...";
2382 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
2382 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC');
2383 2383 
 		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2384 2384 
 		if ($error != '') {
2385 2385 
 			return $error;
2386 2386 
 		} elseif ($globalDebug) echo "Done\n";
2387 2387 
 		if ($globalDebug) echo "Owner Iceland: Download...";
2388 
-		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
2388 
+		update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv');
2389 2389 
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
2390 2390 
 			if ($globalDebug) echo "Add to DB...";
2391 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
2391 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF');
2392 2392 
 		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2393 2393 
 		if ($error != '') {
2394 2394 
 			return $error;
2395 2395 
 		} elseif ($globalDebug) echo "Done\n";
2396 2396 
 		if ($globalDebug) echo "Owner Isle of Man: Download...";
2397 
-		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
2397 
+		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv');
2398 2398 
 		if (file_exists($tmp_dir.'owner_m.csv')) {
2399 2399 
 			if ($globalDebug) echo "Add to DB...";
2400 
-			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
2400 
+			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M');
2401 2401 
 		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2402 2402 
 		if ($error != '') {
2403 2403 
 			return $error;
2404 2404 
 		} elseif ($globalDebug) echo "Done\n";
2405 2405 
 		if ($globalMasterSource) {
2406 2406 
 			if ($globalDebug) echo "ModeS Netherlands: Download...";
2407 
-			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
2407 
+			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv');
2408 2408 
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
2409 2409 
 				if ($globalDebug) echo "Add to DB...";
2410 
-				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
2410 
+				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH');
2411 2411 
 			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2412 2412 
 			if ($error != '') {
2413 2413 
 				return $error;
2414 2414 
 			} elseif ($globalDebug) echo "Done\n";
2415 2415 
 			if ($globalDebug) echo "ModeS Denmark: Download...";
2416 
-			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
2416 
+			update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv');
2417 2417 
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
2418 2418 
 				if ($globalDebug) echo "Add to DB...";
2419 
-				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
2419 
+				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY');
2420 2420 
 			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2421 2421 
 			if ($error != '') {
2422 2422 
 				return $error;
 
@@ -2429,7 +2429,7 @@  discard block
 
 block discarded – undo
2429 2429 
 		global $tmp_dir, $globalDebug;
2430 2430 
 		$error = '';
2431 2431 
 		if ($globalDebug) echo "Translation : Download...";
2432 
-		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
2432 
+		update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip');
2433 2433 
 		if (file_exists($tmp_dir.'translation.zip')) {
2434 2434 
 			if ($globalDebug) echo "Unzip...";
2435 2435 
 			update_db::unzip($tmp_dir.'translation.zip');
 
@@ -2446,10 +2446,10 @@  discard block
 
 block discarded – undo
2446 2446 
 		global $tmp_dir, $globalDebug;
2447 2447 
 		$error = '';
2448 2448 
 		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
2449 
-		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
2450 
-		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5');
2449 
+		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz');
2450 
+		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5', $tmp_dir.'translation.tsv.gz.md5');
2451 2451 
 		if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) {
2452 
-			$translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
2452 
+			$translation_md5_file = explode(' ', file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
2453 2453 
 			$translation_md5 = $translation_md5_file[0];
2454 2454 
 			if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) {
2455 2455 
 				if ($globalDebug) echo "Gunzip...";
 
@@ -2467,10 +2467,10 @@  discard block
 
 block discarded – undo
2467 2467 
 		global $tmp_dir, $globalDebug;
2468 2468 
 		$error = '';
2469 2469 
 		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
2470 
-		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
2471 
-		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5');
2470 
+		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz');
2471 
+		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5', $tmp_dir.'modes.tsv.gz.md5');
2472 2472 
 		if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) {
2473 
-			$modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
2473 
+			$modes_md5_file = explode(' ', file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
2474 2474 
 			$modes_md5 = $modes_md5_file[0];
2475 2475 
 			if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) {
2476 2476 
 				if ($globalDebug) echo "Gunzip...";
 
@@ -2489,12 +2489,12 @@  discard block
 
 block discarded – undo
2489 2489 
 		global $tmp_dir, $globalDebug;
2490 2490 
 		$error = '';
2491 2491 
 		if ($globalDebug) echo "Airlines from FlightAirMap website : Download...";
2492 
-		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5');
2492 
+		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5', $tmp_dir.'airlines.tsv.gz.md5');
2493 2493 
 		if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) {
2494 
-			$airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
2494 
+			$airlines_md5_file = explode(' ', file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
2495 2495 
 			$airlines_md5 = $airlines_md5_file[0];
2496 2496 
 			if (!update_db::check_airlines_version($airlines_md5)) {
2497 
-				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
2497 
+				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz', $tmp_dir.'airlines.tsv.gz');
2498 2498 
 				if (file_exists($tmp_dir.'airlines.tsv.gz')) {
2499 2499 
 					if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) {
2500 2500 
 						if ($globalDebug) echo "Gunzip...";
 
@@ -2519,14 +2519,14 @@  discard block
 
 block discarded – undo
2519 2519 
 		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
2520 2520 
 		$error = '';
2521 2521 
 		if ($globalOwner === TRUE) {
2522 
-			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
2523 
-			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5');
2522 
+			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz');
2523 
+			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5');
2524 2524 
 		} else {
2525 
-			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz');
2526 
-			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5');
2525 
+			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz');
2526 
+			update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5');
2527 2527 
 		}
2528 2528 
 		if (file_exists($tmp_dir.'owners.tsv.gz') && file_exists($tmp_dir.'owners.tsv.gz.md5')) {
2529 
-			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
2529 
+			$owners_md5_file = explode(' ', file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
2530 2530 
 			$owners_md5 = $owners_md5_file[0];
2531 2531 
 			if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) {
2532 2532 
 				if ($globalDebug) echo "Gunzip...";
 
@@ -2543,10 +2543,10 @@  discard block
 
 block discarded – undo
2543 2543 
 	public static function update_routes_fam() {
2544 2544 
 		global $tmp_dir, $globalDebug;
2545 2545 
 		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
2546 
-		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
2547 
-		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5');
2546 
+		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz');
2547 
+		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5', $tmp_dir.'routes.tsv.gz.md5');
2548 2548 
 		if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) {
2549 
-			$routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
2549 
+			$routes_md5_file = explode(' ', file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
2550 2550 
 			$routes_md5 = $routes_md5_file[0];
2551 2551 
 			if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) {
2552 2552 
 				if ($globalDebug) echo "Gunzip...";
 
@@ -2563,10 +2563,10 @@  discard block
 
 block discarded – undo
2563 2563 
 	public static function update_block_fam() {
2564 2564 
 		global $tmp_dir, $globalDebug;
2565 2565 
 		if ($globalDebug) echo "Blocked aircraft from FlightAirMap website : Download...";
2566 
-		update_db::download('http://data.flightairmap.com/data/block.tsv.gz',$tmp_dir.'block.tsv.gz');
2567 
-		update_db::download('http://data.flightairmap.com/data/block.tsv.gz.md5',$tmp_dir.'block.tsv.gz.md5');
2566 
+		update_db::download('http://data.flightairmap.com/data/block.tsv.gz', $tmp_dir.'block.tsv.gz');
2567 
+		update_db::download('http://data.flightairmap.com/data/block.tsv.gz.md5', $tmp_dir.'block.tsv.gz.md5');
2568 2568 
 		if (file_exists($tmp_dir.'block.tsv.gz') && file_exists($tmp_dir.'block.tsv.gz.md5')) {
2569 
-			$block_md5_file = explode(' ',file_get_contents($tmp_dir.'block.tsv.gz.md5'));
2569 
+			$block_md5_file = explode(' ', file_get_contents($tmp_dir.'block.tsv.gz.md5'));
2570 2570 
 			$block_md5 = $block_md5_file[0];
2571 2571 
 			if (md5_file($tmp_dir.'block.tsv.gz') == $block_md5) {
2572 2572 
 				if ($globalDebug) echo "Gunzip...";
 
@@ -2582,13 +2582,13 @@  discard block
 
 block discarded – undo
2582 2582 
 	}
2583 2583 
 	public static function update_marine_identity_fam() {
2584 2584 
 		global $tmp_dir, $globalDebug;
2585 
-		update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5');
2585 
+		update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5');
2586 2586 
 		if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) {
2587 
-			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
2587 
+			$marine_identity_md5_file = explode(' ', file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
2588 2588 
 			$marine_identity_md5 = $marine_identity_md5_file[0];
2589 2589 
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
2590 2590 
 				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
2591 
-				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
2591 
+				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz', $tmp_dir.'marine_identity.tsv.gz');
2592 2592 
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
2593 2593 
 					if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) {
2594 2594 
 						if ($globalDebug) echo "Gunzip...";
 
@@ -2610,13 +2610,13 @@  discard block
 
 block discarded – undo
2610 2610
2611 2611 
 	public static function update_satellite_fam() {
2612 2612 
 		global $tmp_dir, $globalDebug;
2613 
-		update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5',$tmp_dir.'satellite.tsv.gz.md5');
2613 
+		update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5', $tmp_dir.'satellite.tsv.gz.md5');
2614 2614 
 		if (file_exists($tmp_dir.'satellite.tsv.gz.md5')) {
2615 
-			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
2615 
+			$satellite_md5_file = explode(' ', file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
2616 2616 
 			$satellite_md5 = $satellite_md5_file[0];
2617 2617 
 			if (!update_db::check_satellite_version($satellite_md5)) {
2618 2618 
 				if ($globalDebug) echo "Satellite from FlightAirMap website : Download...";
2619 
-				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
2619 
+				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz', $tmp_dir.'satellite.tsv.gz');
2620 2620 
 				if (file_exists($tmp_dir.'satellite.tsv.gz')) {
2621 2621 
 					if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) {
2622 2622 
 						if ($globalDebug) echo "Gunzip...";
 
@@ -2638,7 +2638,7 @@  discard block
 
 block discarded – undo
2638 2638 
 	public static function update_banned_fam() {
2639 2639 
 		global $tmp_dir, $globalDebug;
2640 2640 
 		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
2641 
-		update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
2641 
+		update_db::download('http://data.flightairmap.com/data/ban-eu.csv', $tmp_dir.'ban_eu.csv');
2642 2642 
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
2643 2643 
 			//if ($globalDebug) echo "Gunzip...";
2644 2644 
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
 
@@ -2657,18 +2657,18 @@  discard block
 
 block discarded – undo
2657 2657 
 		$error = '';
2658 2658 
 		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
2659 2659 
 		if ($globalDBdriver == 'mysql') {
2660 
-			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
2660 
+			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
2661 2661 
 		} else {
2662 
-			update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
2662 
+			update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
2663 2663 
 		}
2664 2664 
 		if (file_exists($tmp_dir.'airspace.sql.gz.md5')) {
2665 
-			$airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
2665 
+			$airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
2666 2666 
 			$airspace_md5 = $airspace_md5_file[0];
2667 2667 
 			if (!update_db::check_airspace_version($airspace_md5)) {
2668 2668 
 				if ($globalDBdriver == 'mysql') {
2669 
-					update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz');
2669 
+					update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz');
2670 2670 
 				} else {
2671 
-					update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
2671 
+					update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz');
2672 2672 
 				}
2673 2673 
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
2674 2674 
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
 
@@ -2681,7 +2681,7 @@  discard block
 
 block discarded – undo
2681 2681 
 							try {
2682 2682 
 								$sth = $Connection->db->prepare($query);
2683 2683 
 								$sth->execute();
2684 
-							} catch(PDOException $e) {
2684 
+							} catch (PDOException $e) {
2685 2685 
 								return "error : ".$e->getMessage();
2686 2686 
 							}
2687 2687 
 						}
 
@@ -2701,16 +2701,16 @@  discard block
 
 block discarded – undo
2701 2701 
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
2702 2702 
 		$error = '';
2703 2703 
 		if ($globalDebug) echo "Geoid from FlightAirMap website : Download...";
2704 
-		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
2704 
+		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5', $tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
2705 2705 
 		if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) {
2706 
-			$geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
2706 
+			$geoid_md5_file = explode(' ', file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
2707 2707 
 			$geoid_md5 = $geoid_md5_file[0];
2708 2708 
 			if (!update_db::check_geoid_version($geoid_md5)) {
2709 
-				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
2709 
+				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz', $tmp_dir.$globalGeoidSource.'.pgm.gz');
2710 2710 
 				if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) {
2711 2711 
 					if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) {
2712 2712 
 						if ($globalDebug) echo "Gunzip...";
2713 
-						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
2713 
+						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz', dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
2714 2714 
 						if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) {
2715 2715 
 							update_db::insert_geoid_version($geoid_md5);
2716 2716 
 						} else $error = "File data/".$globalGeoidSource.'.pgm'." doesn't exist. Gunzip failed.";
 
@@ -2727,15 +2727,15 @@  discard block
 
 block discarded – undo
2727 2727 
 	public static function update_tle() {
2728 2728 
 		global $tmp_dir, $globalDebug;
2729 2729 
 		if ($globalDebug) echo "Download TLE : Download...";
2730 
-		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
2731 
-		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
2732 
-		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt');
2730 
+		$alltle = array('stations.txt', 'gps-ops.txt', 'glo-ops.txt', 'galileo.txt', 'weather.txt', 'noaa.txt', 'goes.txt', 'resource.txt', 'dmc.txt', 'tdrss.txt', 'geo.txt', 'intelsat.txt', 'gorizont.txt',
2731 
+		'raduga.txt', 'molniya.txt', 'iridium.txt', 'orbcomm.txt', 'globalstar.txt', 'amateur.txt', 'x-comm.txt', 'other-comm.txt', 'sbas.txt', 'nnss.txt', 'musson.txt', 'science.txt', 'geodetic.txt',
2732 
+		'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt', 'visual.txt', 'sarsat.txt', 'argos.txt', 'ses.txt', 'iridium-NEXT.txt', 'beidou.txt');
2733 2733 
 		foreach ($alltle as $filename) {
2734 2734 
 			if ($globalDebug) echo "downloading ".$filename.'...';
2735 
-			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
2735 
+			update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename);
2736 2736 
 			if (file_exists($tmp_dir.$filename)) {
2737 2737 
 				if ($globalDebug) echo "Add to DB ".$filename."...";
2738 
-				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
2738 
+				$error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename));
2739 2739 
 			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
2740 2740 
 			if ($error != '') {
2741 2741 
 				echo $error."\n";
 
@@ -2747,7 +2747,7 @@  discard block
 
 block discarded – undo
2747 2747 
 	public static function update_ucsdb() {
2748 2748 
 		global $tmp_dir, $globalDebug;
2749 2749 
 		if ($globalDebug) echo "Download UCS DB : Download...";
2750 
-		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2750 
+		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt', $tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2751 2751 
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
2752 2752 
 			if ($globalDebug) echo "Add to DB...";
2753 2753 
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
 
@@ -2761,7 +2761,7 @@  discard block
 
 block discarded – undo
2761 2761 
 	public static function update_celestrak() {
2762 2762 
 		global $tmp_dir, $globalDebug;
2763 2763 
 		if ($globalDebug) echo "Download Celestrak DB : Download...";
2764 
-		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
2764 
+		update_db::download('http://celestrak.com/pub/satcat.txt', $tmp_dir.'satcat.txt');
2765 2765 
 		if (file_exists($tmp_dir.'satcat.txt')) {
2766 2766 
 			if ($globalDebug) echo "Add to DB...";
2767 2767 
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
 
@@ -2776,63 +2776,63 @@  discard block
 
 block discarded – undo
2776 2776 
 		global $tmp_dir, $globalDebug;
2777 2777 
 		$error = '';
2778 2778 
 		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
2779 
-		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
2779 
+		update_db::download('http://data.flightairmap.com/data/models/models.md5sum', $tmp_dir.'models.md5sum');
2780 2780 
 		if (file_exists($tmp_dir.'models.md5sum')) {
2781 2781 
 			if ($globalDebug) echo "Check files...\n";
2782 2782 
 			$newmodelsdb = array();
2783 
-			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
2784 
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2783 
+			if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) {
2784 
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2785 2785 
 					$model = trim($row[2]);
2786 2786 
 					$newmodelsdb[$model] = trim($row[0]);
2787 2787 
 				}
2788 2788 
 			}
2789 2789 
 			$modelsdb = array();
2790 2790 
 			if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) {
2791 
-				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) {
2792 
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2791 
+				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) {
2792 
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2793 2793 
 						$model = trim($row[2]);
2794 2794 
 						$modelsdb[$model] = trim($row[0]);
2795 2795 
 					}
2796 2796 
 				}
2797 2797 
 			}
2798 
-			$diff = array_diff($newmodelsdb,$modelsdb);
2798 
+			$diff = array_diff($newmodelsdb, $modelsdb);
2799 2799 
 			foreach ($diff as $key => $value) {
2800 2800 
 				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
2801 
-				update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
2801 
+				update_db::download('http://data.flightairmap.com/data/models/'.$key, dirname(__FILE__).'/../models/'.$key);
2802 2802
2803 2803 
 			}
2804 
-			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
2804 
+			update_db::download('http://data.flightairmap.com/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum');
2805 2805 
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2806 2806 
 		if ($error != '') {
2807 2807 
 			return $error;
2808 2808 
 		} elseif ($globalDebug) echo "Done\n";
2809 2809 
 		if ($globalDebug) echo "glTF 2.0 Models from FlightAirMap website : Download...";
2810 
-		update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',$tmp_dir.'modelsgltf2.md5sum');
2810 
+		update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum', $tmp_dir.'modelsgltf2.md5sum');
2811 2811 
 		if (file_exists($tmp_dir.'modelsgltf2.md5sum')) {
2812 2812 
 			if ($globalDebug) echo "Check files...\n";
2813 2813 
 			$newmodelsdb = array();
2814 
-			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) {
2815 
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2814 
+			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum', 'r')) !== FALSE) {
2815 
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2816 2816 
 					$model = trim($row[2]);
2817 2817 
 					$newmodelsdb[$model] = trim($row[0]);
2818 2818 
 				}
2819 2819 
 			}
2820 2820 
 			$modelsdb = array();
2821 2821 
 			if (file_exists(dirname(__FILE__).'/../models/gltf2/models.md5sum')) {
2822 
-				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/models.md5sum','r')) !== FALSE) {
2823 
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2822 
+				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/models.md5sum', 'r')) !== FALSE) {
2823 
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2824 2824 
 						$model = trim($row[2]);
2825 2825 
 						$modelsdb[$model] = trim($row[0]);
2826 2826 
 					}
2827 2827 
 				}
2828 2828 
 			}
2829 
-			$diff = array_diff($newmodelsdb,$modelsdb);
2829 
+			$diff = array_diff($newmodelsdb, $modelsdb);
2830 2830 
 			foreach ($diff as $key => $value) {
2831 2831 
 				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
2832 
-				update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key,dirname(__FILE__).'/../models/gltf2/'.$key);
2832 
+				update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key, dirname(__FILE__).'/../models/gltf2/'.$key);
2833 2833
2834 2834 
 			}
2835 
-			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum');
2835 
+			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum', dirname(__FILE__).'/../models/gltf2/models.md5sum');
2836 2836 
 		} else $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
2837 2837 
 		if ($error != '') {
2838 2838 
 			return $error;
 
@@ -2844,32 +2844,32 @@  discard block
 
 block discarded – undo
2844 2844 
 		global $tmp_dir, $globalDebug;
2845 2845 
 		$error = '';
2846 2846 
 		if ($globalDebug) echo "Liveries from FlightAirMap website : Download...";
2847 
-		update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',$tmp_dir.'liveries.md5sum');
2847 
+		update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum', $tmp_dir.'liveries.md5sum');
2848 2848 
 		if (file_exists($tmp_dir.'liveries.md5sum')) {
2849 2849 
 			if ($globalDebug) echo "Check files...\n";
2850 2850 
 			$newmodelsdb = array();
2851 
-			if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) {
2852 
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2851 
+			if (($handle = fopen($tmp_dir.'liveries.md5sum', 'r')) !== FALSE) {
2852 
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2853 2853 
 					$model = trim($row[2]);
2854 2854 
 					$newmodelsdb[$model] = trim($row[0]);
2855 2855 
 				}
2856 2856 
 			}
2857 2857 
 			$modelsdb = array();
2858 2858 
 			if (file_exists(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum')) {
2859 
-				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum','r')) !== FALSE) {
2860 
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2859 
+				if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum', 'r')) !== FALSE) {
2860 
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2861 2861 
 						$model = trim($row[2]);
2862 2862 
 						$modelsdb[$model] = trim($row[0]);
2863 2863 
 					}
2864 2864 
 				}
2865 2865 
 			}
2866 
-			$diff = array_diff($newmodelsdb,$modelsdb);
2866 
+			$diff = array_diff($newmodelsdb, $modelsdb);
2867 2867 
 			foreach ($diff as $key => $value) {
2868 2868 
 				if ($globalDebug) echo 'Downloading liveries '.$key.' ...'."\n";
2869 
-				update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key,dirname(__FILE__).'/../models/gltf2/liveries/'.$key);
2869 
+				update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key, dirname(__FILE__).'/../models/gltf2/liveries/'.$key);
2870 2870
2871 2871 
 			}
2872 
-			update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum');
2872 
+			update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum', dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum');
2873 2873 
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2874 2874 
 		if ($error != '') {
2875 2875 
 			return $error;
 
@@ -2881,32 +2881,32 @@  discard block
 
 block discarded – undo
2881 2881 
 		global $tmp_dir, $globalDebug;
2882 2882 
 		$error = '';
2883 2883 
 		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
2884 
-		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
2884 
+		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum');
2885 2885 
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
2886 2886 
 			if ($globalDebug) echo "Check files...\n";
2887 2887 
 			$newmodelsdb = array();
2888 
-			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
2889 
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2888 
+			if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) {
2889 
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2890 2890 
 					$model = trim($row[2]);
2891 2891 
 					$newmodelsdb[$model] = trim($row[0]);
2892 2892 
 				}
2893 2893 
 			}
2894 2894 
 			$modelsdb = array();
2895 2895 
 			if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) {
2896 
-				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) {
2897 
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2896 
+				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) {
2897 
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2898 2898 
 						$model = trim($row[2]);
2899 2899 
 						$modelsdb[$model] = trim($row[0]);
2900 2900 
 					}
2901 2901 
 				}
2902 2902 
 			}
2903 
-			$diff = array_diff($newmodelsdb,$modelsdb);
2903 
+			$diff = array_diff($newmodelsdb, $modelsdb);
2904 2904 
 			foreach ($diff as $key => $value) {
2905 2905 
 				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
2906 
-				update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
2906 
+				update_db::download('http://data.flightairmap.com/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key);
2907 2907
2908 2908 
 			}
2909 
-			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
2909 
+			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum');
2910 2910 
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2911 2911 
 		if ($error != '') {
2912 2912 
 			return $error;
 
@@ -2918,32 +2918,32 @@  discard block
 
 block discarded – undo
2918 2918 
 		global $tmp_dir, $globalDebug;
2919 2919 
 		$error = '';
2920 2920 
 		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
2921 
-		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
2921 
+		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum');
2922 2922 
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
2923 2923 
 			if ($globalDebug) echo "Check files...\n";
2924 2924 
 			$newmodelsdb = array();
2925 
-			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
2926 
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2925 
+			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) {
2926 
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2927 2927 
 					$model = trim($row[2]);
2928 2928 
 					$newmodelsdb[$model] = trim($row[0]);
2929 2929 
 				}
2930 2930 
 			}
2931 2931 
 			$modelsdb = array();
2932 2932 
 			if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) {
2933 
-				if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) {
2934 
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
2933 
+				if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) {
2934 
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
2935 2935 
 						$model = trim($row[2]);
2936 2936 
 						$modelsdb[$model] = trim($row[0]);
2937 2937 
 					}
2938 2938 
 				}
2939 2939 
 			}
2940 
-			$diff = array_diff($newmodelsdb,$modelsdb);
2940 
+			$diff = array_diff($newmodelsdb, $modelsdb);
2941 2941 
 			foreach ($diff as $key => $value) {
2942 2942 
 				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
2943 
-				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
2943 
+				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key);
2944 2944
2945 2945 
 			}
2946 
-			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
2946 
+			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
2947 2947 
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2948 2948 
 		if ($error != '') {
2949 2949 
 			return $error;
 
@@ -2955,8 +2955,8 @@  discard block
 
 block discarded – undo
2955 2955 
 		global $tmp_dir, $globalDebug;
2956 2956 
 		date_default_timezone_set('UTC');
2957 2957 
 		$Common = new Common();
2958 
-		$data = $Common->getData('https://www4.icao.int/doc8643/External/AircraftTypes','post',array('X-Requested-With: XMLHttpRequest','Accept: application/json, text/javascript, */*; q=0.01','Host: www4.icao.int','Origin: https://www.icao.int','Content-Length: 0'),'','','https://www.icao.int/publications/DOC8643/Pages/Search.aspx',60);
2959 
-		$all = json_decode($data,true);
2958 
+		$data = $Common->getData('https://www4.icao.int/doc8643/External/AircraftTypes', 'post', array('X-Requested-With: XMLHttpRequest', 'Accept: application/json, text/javascript, */*; q=0.01', 'Host: www4.icao.int', 'Origin: https://www.icao.int', 'Content-Length: 0'), '', '', 'https://www.icao.int/publications/DOC8643/Pages/Search.aspx', 60);
2959 
+		$all = json_decode($data, true);
2960 2960 
 		$Connection = new Connection();
2961 2961 
 		$querychk = "SELECT COUNT(1) as nb FROM aircraft WHERE icao = :icao";
2962 2962 
 		$sth = $Connection->db->prepare($querychk);
 
@@ -2968,8 +2968,8 @@  discard block
 
 block discarded – undo
2968 2968 
 		foreach ($all as $model) {
2969 2969 
 			$icao = $model['Designator'];
2970 2970 
 			if (!isset($allicao[$icao])) {
2971 
-				$aircraft_shadow = 'generic_'.substr($model['EngineType'],0,1).$model['EngineCount'].$model['WTC'].'.png';
2972 
-				$allicao[$icao] = array(':icao' => $icao,':type' => $model['ModelFullName'],':manufacturer' => $model['ManufacturerCode'],':aircraft_shadow' => $aircraft_shadow,':aircraft_description' => $model['AircraftDescription'],':engine_type' => $model['EngineType'],':engine_count' => $model['EngineCount'],':wake_category' => $model['WTC']);
2971 
+				$aircraft_shadow = 'generic_'.substr($model['EngineType'], 0, 1).$model['EngineCount'].$model['WTC'].'.png';
2972 
+				$allicao[$icao] = array(':icao' => $icao, ':type' => $model['ModelFullName'], ':manufacturer' => $model['ManufacturerCode'], ':aircraft_shadow' => $aircraft_shadow, ':aircraft_description' => $model['AircraftDescription'], ':engine_type' => $model['EngineType'], ':engine_count' => $model['EngineCount'], ':wake_category' => $model['WTC']);
2973 2973 
 			} else {
2974 2974 
 				$allicao[$icao][':type'] = $allicao[$icao][':type'].'/'.$model['ModelFullName'];
2975 2975 
 			}
 
@@ -2981,9 +2981,9 @@  discard block
 
 block discarded – undo
2981 2981 
 				if ($exist[0]['nb'] == 0) {
2982 2982 
 					$sthins->execute($airdata);
2983 2983 
 				} else {
2984 
-					$sthup->execute(array(':type' => $airdata[':type'],':icao' => $icao));
2984 
+					$sthup->execute(array(':type' => $airdata[':type'], ':icao' => $icao));
2985 2985 
 				}
2986 
-			} catch(PDOException $e) {
2986 
+			} catch (PDOException $e) {
2987 2987 
 				return "error : ".$e->getMessage();
2988 2988 
 			}
2989 2989 
 		}
 
@@ -3015,23 +3015,23 @@  discard block
 
 block discarded – undo
3015 3015 
 			$Connection = new Connection();
3016 3016 
 			$sth = $Connection->db->prepare($query);
3017 3017 
                         $sth->execute();
3018 
-                } catch(PDOException $e) {
3018 
+                } catch (PDOException $e) {
3019 3019 
                         return "error : ".$e->getMessage();
3020 3020 
                 }
3021 3021
3022 3022 
 		$error = '';
3023 3023 
 		if ($globalDebug) echo "Notam : Download...";
3024 
-		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
3024 
+		update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss');
3025 3025 
 		if (file_exists($tmp_dir.'notam.rss')) {
3026 
-			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
3026 
+			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true);
3027 3027 
 			foreach ($notams['channel']['item'] as $notam) {
3028 
-				$title = explode(':',$notam['title']);
3028 
+				$title = explode(':', $notam['title']);
3029 3029 
 				$data['ref'] = trim($title[0]);
3030 3030 
 				unset($title[0]);
3031 
-				$data['title'] = trim(implode(':',$title));
3032 
-				$description = strip_tags($notam['description'],'<pre>');
3033 
-				preg_match(':^(.*?)<pre>:',$description,$match);
3034 
-				$q = explode('/',$match[1]);
3031 
+				$data['title'] = trim(implode(':', $title));
3032 
+				$description = strip_tags($notam['description'], '<pre>');
3033 
+				preg_match(':^(.*?)<pre>:', $description, $match);
3034 
+				$q = explode('/', $match[1]);
3035 3035 
 				$data['fir'] = $q[0];
3036 3036 
 				$data['code'] = $q[1];
3037 3037 
 				$ifrvfr = $q[2];
 
@@ -3047,30 +3047,30 @@  discard block
 
 block discarded – undo
3047 3047 
 				$data['lower_limit'] = $q[5];
3048 3048 
 				$data['upper_limit'] = $q[6];
3049 3049 
 				$latlonrad = $q[7];
3050 
-				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
3051 
-				$latitude = $Common->convertDec($las,'latitude');
3052 
-				$longitude = $Common->convertDec($lns,'longitude');
3050 
+				sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius);
3051 
+				$latitude = $Common->convertDec($las, 'latitude');
3052 
+				$longitude = $Common->convertDec($lns, 'longitude');
3053 3053 
 				if ($lac == 'S') $latitude = '-'.$latitude;
3054 3054 
 				if ($lnc == 'W') $longitude = '-'.$longitude;
3055 3055 
 				$data['center_latitude'] = $latitude;
3056 3056 
 				$data['center_longitude'] = $longitude;
3057 3057 
 				$data['radius'] = intval($radius);
3058 3058
3059 
-				preg_match(':<pre>(.*?)</pre>:',$description,$match);
3059 
+				preg_match(':<pre>(.*?)</pre>:', $description, $match);
3060 3060 
 				$data['text'] = $match[1];
3061 
-				preg_match(':</pre>(.*?)$:',$description,$match);
3061 
+				preg_match(':</pre>(.*?)$:', $description, $match);
3062 3062 
 				$fromto = $match[1];
3063 
-				preg_match('#FROM:(.*?)TO:#',$fromto,$match);
3063 
+				preg_match('#FROM:(.*?)TO:#', $fromto, $match);
3064 3064 
 				$fromall = trim($match[1]);
3065 
-				preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match);
3065 
+				preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match);
3066 3066 
 				$from = trim($match[1]);
3067 
-				$data['date_begin'] = date("Y-m-d H:i:s",strtotime($from));
3068 
-				preg_match('#TO:(.*?)$#',$fromto,$match);
3067 
+				$data['date_begin'] = date("Y-m-d H:i:s", strtotime($from));
3068 
+				preg_match('#TO:(.*?)$#', $fromto, $match);
3069 3069 
 				$toall = trim($match[1]);
3070 
-				if (!preg_match(':Permanent:',$toall)) {
3071 
-					preg_match('#^(.*?) \((.*?)\)#',$toall,$match);
3070 
+				if (!preg_match(':Permanent:', $toall)) {
3071 
+					preg_match('#^(.*?) \((.*?)\)#', $toall, $match);
3072 3072 
 					$to = trim($match[1]);
3073 
-					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
3073 
+					$data['date_end'] = date("Y-m-d H:i:s", strtotime($to));
3074 3074 
 					$data['permanent'] = 0;
3075 3075 
 				} else {
3076 3076 
 				    $data['date_end'] = NULL;
 
@@ -3078,7 +3078,7 @@  discard block
 
 block discarded – undo
3078 3078 
 				}
3079 3079 
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
3080 3080 
 				$NOTAM = new NOTAM();
3081 
-				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
3081 
+				$NOTAM->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['center_latitude'], $data['center_longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
3082 3082 
 				unset($data);
3083 3083 
 			}
3084 3084 
 		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
 
@@ -3101,16 +3101,16 @@  discard block
 
 block discarded – undo
3101 3101 
 				$Connection = new Connection();
3102 3102 
 				$sth = $Connection->db->prepare($query);
3103 3103 
 				$sth->execute();
3104 
-			} catch(PDOException $e) {
3104 
+			} catch (PDOException $e) {
3105 3105 
 				return "error : ".$e->getMessage();
3106 3106 
 			}
3107 3107 
 		}
3108 3108 
 		$Common = new Common();
3109 3109 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
3110 
-		$airspace_json = json_decode($airspace_lst,true);
3110 
+		$airspace_json = json_decode($airspace_lst, true);
3111 3111 
 		foreach ($airspace_json['records'] as $airspace) {
3112 3112 
 			if ($globalDebug) echo $airspace['name']."...\n";
3113 
-			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
3113 
+			update_db::download($airspace['uri'], $tmp_dir.$airspace['name']);
3114 3114 
 			if (file_exists($tmp_dir.$airspace['name'])) {
3115 3115 
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
3116 3116 
 				//system('recode l9..utf8 '.$tmp_dir.$airspace['name']);
 
@@ -3132,7 +3132,7 @@  discard block
 
 block discarded – undo
3132 3132 
 				$Connection = new Connection();
3133 3133 
 				$sth = $Connection->db->prepare($query);
3134 3134 
 				$sth->execute(array(':new' => $new, ':old' => $old));
3135 
-			} catch(PDOException $e) {
3135 
+			} catch (PDOException $e) {
3136 3136 
 				return "error : ".$e->getMessage();
3137 3137 
 			}
3138 3138 
 		}
 
@@ -3149,7 +3149,7 @@  discard block
 
 block discarded – undo
3149 3149 
 			$Connection = new Connection();
3150 3150 
 			$sth = $Connection->db->prepare($query);
3151 3151 
                         $sth->execute();
3152 
-                } catch(PDOException $e) {
3152 
+                } catch (PDOException $e) {
3153 3153 
                         return "error : ".$e->getMessage();
3154 3154 
                 }
3155 3155 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3164,7 +3164,7 @@  discard block
 
 block discarded – undo
3164 3164 
 			$Connection = new Connection();
3165 3165 
 			$sth = $Connection->db->prepare($query);
3166 3166 
                         $sth->execute();
3167 
-                } catch(PDOException $e) {
3167 
+                } catch (PDOException $e) {
3168 3168 
                         return "error : ".$e->getMessage();
3169 3169 
                 }
3170 3170 
 	}
 
@@ -3175,7 +3175,7 @@  discard block
 
 block discarded – undo
3175 3175 
 			$Connection = new Connection();
3176 3176 
 			$sth = $Connection->db->prepare($query);
3177 3177 
                         $sth->execute(array(':version' => $version));
3178 
-                } catch(PDOException $e) {
3178 
+                } catch (PDOException $e) {
3179 3179 
                         return "error : ".$e->getMessage();
3180 3180 
                 }
3181 3181 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3189,7 +3189,7 @@  discard block
 
 block discarded – undo
3189 3189 
 			$Connection = new Connection();
3190 3190 
 			$sth = $Connection->db->prepare($query);
3191 3191 
                         $sth->execute(array(':version' => $version));
3192 
-                } catch(PDOException $e) {
3192 
+                } catch (PDOException $e) {
3193 3193 
                         return "error : ".$e->getMessage();
3194 3194 
                 }
3195 3195 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3203,7 +3203,7 @@  discard block
 
 block discarded – undo
3203 3203 
 			$Connection = new Connection();
3204 3204 
 			$sth = $Connection->db->prepare($query);
3205 3205 
 			$sth->execute(array(':version' => $version));
3206 
-		} catch(PDOException $e) {
3206 
+		} catch (PDOException $e) {
3207 3207 
 			return "error : ".$e->getMessage();
3208 3208 
 		}
3209 3209 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3217,7 +3217,7 @@  discard block
 
 block discarded – undo
3217 3217 
 			$Connection = new Connection();
3218 3218 
 			$sth = $Connection->db->prepare($query);
3219 3219 
 			$sth->execute(array(':version' => $version));
3220 
-		} catch(PDOException $e) {
3220 
+		} catch (PDOException $e) {
3221 3221 
 			return "error : ".$e->getMessage();
3222 3222 
 		}
3223 3223 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3231,7 +3231,7 @@  discard block
 
 block discarded – undo
3231 3231 
 			$Connection = new Connection();
3232 3232 
 			$sth = $Connection->db->prepare($query);
3233 3233 
 			$sth->execute(array(':version' => $version));
3234 
-		} catch(PDOException $e) {
3234 
+		} catch (PDOException $e) {
3235 3235 
 			return "error : ".$e->getMessage();
3236 3236 
 		}
3237 3237 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3245,7 +3245,7 @@  discard block
 
 block discarded – undo
3245 3245 
 			$Connection = new Connection();
3246 3246 
 			$sth = $Connection->db->prepare($query);
3247 3247 
 			$sth->execute(array(':version' => $version));
3248 
-		} catch(PDOException $e) {
3248 
+		} catch (PDOException $e) {
3249 3249 
 			return "error : ".$e->getMessage();
3250 3250 
 		}
3251 3251 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3260,7 +3260,7 @@  discard block
 
 block discarded – undo
3260 3260 
 			$Connection = new Connection();
3261 3261 
 			$sth = $Connection->db->prepare($query);
3262 3262 
 			$sth->execute(array(':version' => $version));
3263 
-		} catch(PDOException $e) {
3263 
+		} catch (PDOException $e) {
3264 3264 
 			return "error : ".$e->getMessage();
3265 3265 
 		}
3266 3266 
 	}
 
@@ -3272,7 +3272,7 @@  discard block
 
 block discarded – undo
3272 3272 
 			$Connection = new Connection();
3273 3273 
 			$sth = $Connection->db->prepare($query);
3274 3274 
 			$sth->execute(array(':version' => $version));
3275 
-		} catch(PDOException $e) {
3275 
+		} catch (PDOException $e) {
3276 3276 
 			return "error : ".$e->getMessage();
3277 3277 
 		}
3278 3278 
 	}
 
@@ -3284,7 +3284,7 @@  discard block
 
 block discarded – undo
3284 3284 
 			$Connection = new Connection();
3285 3285 
 			$sth = $Connection->db->prepare($query);
3286 3286 
 			$sth->execute(array(':version' => $version));
3287 
-		} catch(PDOException $e) {
3287 
+		} catch (PDOException $e) {
3288 3288 
 			return "error : ".$e->getMessage();
3289 3289 
 		}
3290 3290 
 	}
 
@@ -3296,7 +3296,7 @@  discard block
 
 block discarded – undo
3296 3296 
 			$Connection = new Connection();
3297 3297 
 			$sth = $Connection->db->prepare($query);
3298 3298 
                         $sth->execute(array(':version' => $version));
3299 
-                } catch(PDOException $e) {
3299 
+                } catch (PDOException $e) {
3300 3300 
                         return "error : ".$e->getMessage();
3301 3301 
                 }
3302 3302 
 	}
 
@@ -3308,7 +3308,7 @@  discard block
 
 block discarded – undo
3308 3308 
 			$Connection = new Connection();
3309 3309 
 			$sth = $Connection->db->prepare($query);
3310 3310 
 			$sth->execute(array(':version' => $version));
3311 
-		} catch(PDOException $e) {
3311 
+		} catch (PDOException $e) {
3312 3312 
 			return "error : ".$e->getMessage();
3313 3313 
 		}
3314 3314 
 	}
 
@@ -3320,7 +3320,7 @@  discard block
 
 block discarded – undo
3320 3320 
 			$Connection = new Connection();
3321 3321 
 			$sth = $Connection->db->prepare($query);
3322 3322 
 			$sth->execute(array(':version' => $version));
3323 
-		} catch(PDOException $e) {
3323 
+		} catch (PDOException $e) {
3324 3324 
 			return "error : ".$e->getMessage();
3325 3325 
 		}
3326 3326 
 	}
 
@@ -3336,7 +3336,7 @@  discard block
 
 block discarded – undo
3336 3336 
 			$Connection = new Connection();
3337 3337 
 			$sth = $Connection->db->prepare($query);
3338 3338 
                         $sth->execute();
3339 
-                } catch(PDOException $e) {
3339 
+                } catch (PDOException $e) {
3340 3340 
                         return "error : ".$e->getMessage();
3341 3341 
                 }
3342 3342 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3351,7 +3351,7 @@  discard block
 
 block discarded – undo
3351 3351 
 			$Connection = new Connection();
3352 3352 
 			$sth = $Connection->db->prepare($query);
3353 3353 
                         $sth->execute();
3354 
-                } catch(PDOException $e) {
3354 
+                } catch (PDOException $e) {
3355 3355 
                         return "error : ".$e->getMessage();
3356 3356 
                 }
3357 3357 
 	}
 
@@ -3367,7 +3367,7 @@  discard block
 
 block discarded – undo
3367 3367 
 			$Connection = new Connection();
3368 3368 
 			$sth = $Connection->db->prepare($query);
3369 3369 
                         $sth->execute();
3370 
-                } catch(PDOException $e) {
3370 
+                } catch (PDOException $e) {
3371 3371 
                         return "error : ".$e->getMessage();
3372 3372 
                 }
3373 3373 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3382,7 +3382,7 @@  discard block
 
 block discarded – undo
3382 3382 
 			$Connection = new Connection();
3383 3383 
 			$sth = $Connection->db->prepare($query);
3384 3384 
                         $sth->execute();
3385 
-                } catch(PDOException $e) {
3385 
+                } catch (PDOException $e) {
3386 3386 
                         return "error : ".$e->getMessage();
3387 3387 
                 }
3388 3388 
 	}
 
@@ -3398,7 +3398,7 @@  discard block
 
 block discarded – undo
3398 3398 
 			$Connection = new Connection();
3399 3399 
 			$sth = $Connection->db->prepare($query);
3400 3400 
                         $sth->execute();
3401 
-                } catch(PDOException $e) {
3401 
+                } catch (PDOException $e) {
3402 3402 
                         return "error : ".$e->getMessage();
3403 3403 
                 }
3404 3404 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3413,7 +3413,7 @@  discard block
 
 block discarded – undo
3413 3413 
 			$Connection = new Connection();
3414 3414 
 			$sth = $Connection->db->prepare($query);
3415 3415 
                         $sth->execute();
3416 
-                } catch(PDOException $e) {
3416 
+                } catch (PDOException $e) {
3417 3417 
                         return "error : ".$e->getMessage();
3418 3418 
                 }
3419 3419 
 	}
 
@@ -3429,7 +3429,7 @@  discard block
 
 block discarded – undo
3429 3429 
 			$Connection = new Connection();
3430 3430 
 			$sth = $Connection->db->prepare($query);
3431 3431 
 			$sth->execute();
3432 
-		} catch(PDOException $e) {
3432 
+		} catch (PDOException $e) {
3433 3433 
 			return "error : ".$e->getMessage();
3434 3434 
 		}
3435 3435 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3444,7 +3444,7 @@  discard block
 
 block discarded – undo
3444 3444 
 			$Connection = new Connection();
3445 3445 
 			$sth = $Connection->db->prepare($query);
3446 3446 
 			$sth->execute();
3447 
-		} catch(PDOException $e) {
3447 
+		} catch (PDOException $e) {
3448 3448 
 			return "error : ".$e->getMessage();
3449 3449 
 		}
3450 3450 
 	}
 
@@ -3460,7 +3460,7 @@  discard block
 
 block discarded – undo
3460 3460 
 			$Connection = new Connection();
3461 3461 
 			$sth = $Connection->db->prepare($query);
3462 3462 
 			$sth->execute();
3463 
-		} catch(PDOException $e) {
3463 
+		} catch (PDOException $e) {
3464 3464 
 			return "error : ".$e->getMessage();
3465 3465 
 		}
3466 3466 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3475,7 +3475,7 @@  discard block
 
 block discarded – undo
3475 3475 
 			$Connection = new Connection();
3476 3476 
 			$sth = $Connection->db->prepare($query);
3477 3477 
 			$sth->execute();
3478 
-		} catch(PDOException $e) {
3478 
+		} catch (PDOException $e) {
3479 3479 
 			return "error : ".$e->getMessage();
3480 3480 
 		}
3481 3481 
 	}
 
@@ -3491,7 +3491,7 @@  discard block
 
 block discarded – undo
3491 3491 
 			$Connection = new Connection();
3492 3492 
 			$sth = $Connection->db->prepare($query);
3493 3493 
 			$sth->execute();
3494 
-		} catch(PDOException $e) {
3494 
+		} catch (PDOException $e) {
3495 3495 
 			return "error : ".$e->getMessage();
3496 3496 
 		}
3497 3497 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3506,7 +3506,7 @@  discard block
 
 block discarded – undo
3506 3506 
 			$Connection = new Connection();
3507 3507 
 			$sth = $Connection->db->prepare($query);
3508 3508 
 			$sth->execute();
3509 
-		} catch(PDOException $e) {
3509 
+		} catch (PDOException $e) {
3510 3510 
 			return "error : ".$e->getMessage();
3511 3511 
 		}
3512 3512 
 	}
 
@@ -3522,7 +3522,7 @@  discard block
 
 block discarded – undo
3522 3522 
 			$Connection = new Connection();
3523 3523 
 			$sth = $Connection->db->prepare($query);
3524 3524 
                         $sth->execute();
3525 
-                } catch(PDOException $e) {
3525 
+                } catch (PDOException $e) {
3526 3526 
                         return "error : ".$e->getMessage();
3527 3527 
                 }
3528 3528 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3537,7 +3537,7 @@  discard block
 
 block discarded – undo
3537 3537 
 			$Connection = new Connection();
3538 3538 
 			$sth = $Connection->db->prepare($query);
3539 3539 
 			$sth->execute();
3540 
-		} catch(PDOException $e) {
3540 
+		} catch (PDOException $e) {
3541 3541 
 			return "error : ".$e->getMessage();
3542 3542 
 		}
3543 3543 
 	}
 
@@ -3553,7 +3553,7 @@  discard block
 
 block discarded – undo
3553 3553 
 			$Connection = new Connection();
3554 3554 
 			$sth = $Connection->db->prepare($query);
3555 3555 
 			$sth->execute();
3556 
-		} catch(PDOException $e) {
3556 
+		} catch (PDOException $e) {
3557 3557 
 			return "error : ".$e->getMessage();
3558 3558 
 		}
3559 3559 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3568,7 +3568,7 @@  discard block
 
 block discarded – undo
3568 3568 
 			$Connection = new Connection();
3569 3569 
 			$sth = $Connection->db->prepare($query);
3570 3570 
 			$sth->execute();
3571 
-		} catch(PDOException $e) {
3571 
+		} catch (PDOException $e) {
3572 3572 
 			return "error : ".$e->getMessage();
3573 3573 
 		}
3574 3574 
 	}
 
@@ -3584,7 +3584,7 @@  discard block
 
 block discarded – undo
3584 3584 
 			$Connection = new Connection();
3585 3585 
 			$sth = $Connection->db->prepare($query);
3586 3586 
 			$sth->execute();
3587 
-		} catch(PDOException $e) {
3587 
+		} catch (PDOException $e) {
3588 3588 
 			return "error : ".$e->getMessage();
3589 3589 
 		}
3590 3590 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3599,7 +3599,7 @@  discard block
 
 block discarded – undo
3599 3599 
 			$Connection = new Connection();
3600 3600 
 			$sth = $Connection->db->prepare($query);
3601 3601 
 			$sth->execute();
3602 
-		} catch(PDOException $e) {
3602 
+		} catch (PDOException $e) {
3603 3603 
 			return "error : ".$e->getMessage();
3604 3604 
 		}
3605 3605 
 	}
 
@@ -3615,7 +3615,7 @@  discard block
 
 block discarded – undo
3615 3615 
 			$Connection = new Connection();
3616 3616 
 			$sth = $Connection->db->prepare($query);
3617 3617 
 			$sth->execute();
3618 
-		} catch(PDOException $e) {
3618 
+		} catch (PDOException $e) {
3619 3619 
 			return "error : ".$e->getMessage();
3620 3620 
 		}
3621 3621 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3630,7 +3630,7 @@  discard block
 
 block discarded – undo
3630 3630 
 			$Connection = new Connection();
3631 3631 
 			$sth = $Connection->db->prepare($query);
3632 3632 
 			$sth->execute();
3633 
-		} catch(PDOException $e) {
3633 
+		} catch (PDOException $e) {
3634 3634 
 			return "error : ".$e->getMessage();
3635 3635 
 		}
3636 3636 
 	}
 
@@ -3646,7 +3646,7 @@  discard block
 
 block discarded – undo
3646 3646 
 			$Connection = new Connection();
3647 3647 
 			$sth = $Connection->db->prepare($query);
3648 3648 
 			$sth->execute();
3649 
-		} catch(PDOException $e) {
3649 
+		} catch (PDOException $e) {
3650 3650 
 			return "error : ".$e->getMessage();
3651 3651 
 		}
3652 3652 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3665,7 +3665,7 @@  discard block
 
 block discarded – undo
3665 3665 
 			$Connection = new Connection();
3666 3666 
 			$sth = $Connection->db->prepare($query);
3667 3667 
 			$sth->execute();
3668 
-		} catch(PDOException $e) {
3668 
+		} catch (PDOException $e) {
3669 3669 
 			return "error : ".$e->getMessage();
3670 3670 
 		}
3671 3671 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -3680,7 +3680,7 @@  discard block
 
 block discarded – undo
3680 3680 
 			$Connection = new Connection();
3681 3681 
 			$sth = $Connection->db->prepare($query);
3682 3682 
 			$sth->execute();
3683 
-		} catch(PDOException $e) {
3683 
+		} catch (PDOException $e) {
3684 3684 
 			return "error : ".$e->getMessage();
3685 3685 
 		}
3686 3686 
 	}
 
@@ -3692,7 +3692,7 @@  discard block
 
 block discarded – undo
3692 3692 
 			$Connection = new Connection();
3693 3693 
 			$sth = $Connection->db->prepare($query);
3694 3694 
 			$sth->execute();
3695 
-		} catch(PDOException $e) {
3695 
+		} catch (PDOException $e) {
3696 3696 
 			return "error : ".$e->getMessage();
3697 3697 
 		}
3698 3698 
 	}
 
@@ -3708,7 +3708,7 @@  discard block
 
 block discarded – undo
3708 3708 
 			$Connection = new Connection();
3709 3709 
 			$sth = $Connection->db->prepare($query);
3710 3710 
                         $sth->execute();
3711 
-                } catch(PDOException $e) {
3711 
+                } catch (PDOException $e) {
3712 3712 
                         return "error : ".$e->getMessage();
3713 3713 
                 }
3714 3714 
 	}
 
@@ -3723,7 +3723,7 @@  discard block
 
 block discarded – undo
3723 3723 
 			$Connection = new Connection();
3724 3724 
 			$sth = $Connection->db->prepare($query);
3725 3725 
                         $sth->execute();
3726 
-                } catch(PDOException $e) {
3726 
+                } catch (PDOException $e) {
3727 3727 
                         return "error : ".$e->getMessage();
3728 3728 
                 }
3729 3729 
 	}
Please login to merge, or discard this patch.
require/class.ACARS.php 3 patches
Braces   +415 added lines, -263 removed lines patch added patch discarded remove patch 
@@ -13,7 +13,9 @@  discard block
 
 block discarded – undo
13 13 
 	public function __construct($dbc = null,$fromACARSscript = false) {
14 14 
 		$Connection = new Connection($dbc);
15 15 
 		$this->db = $Connection->db();
16 
-		if ($this->db === null) die('Error: No DB connection. (ACARS)');
16 
+		if ($this->db === null) {
17 
+			die('Error: No DB connection. (ACARS)');
18 
+		}
17 19 
 		if ($fromACARSscript) {
18 20 
 			$this->fromACARSscript = true;
19 21 
 			$this->SI = new SpotterImport($this->db);
 
@@ -27,14 +29,19 @@  discard block
 
 block discarded – undo
27 29 
 	*/
28 30 
 	public function ident2icao($ident) {
29 31 
 		if (substr($ident,0,2) == 'AF') {
30 
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
31 
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
32 
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
33 
+				$icao = $ident;
34 
+			} else {
35 
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
36 
+			}
32 37 
 		} else {
33 38 
 			$Spotter = new Spotter($this->db);
34 39 
 			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
35 40 
 			if (isset($identicao[0])) {
36 41 
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
37 
-			} else $icao = $ident;
42 
+			} else {
43 
+				$icao = $ident;
44 
+			}
38 45 
 		}
39 46 
 		return $icao;
40 47 
 	}
 
@@ -107,14 +114,24 @@  discard block
 
 block discarded – undo
107 114 
 		$message = '';
108 115 
 		$result = array();
109 116 
 		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
110 
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
111 
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
112 
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
117 
+		if ($n == 0) {
118 
+			$n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
119 
+		}
120 
+		if ($n == 0) {
121 
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
122 
+		}
123 
+		if ($n == 0) {
124 
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
125 
+		}
113 126 
 		if ($n != 0) {
114 127 
 			$registration = str_replace('.','',$registration);
115 128 
 			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
116 
-			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
117 
-		} else $message = $data;
129 
+			if ($globalDebug) {
130 
+				echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
131 
+			}
132 
+		} else {
133 
+			$message = $data;
134 
+		}
118 135 
 		$decode = array();
119 136 
 		$found = false;
120 137 
 //		if ($registration != '' && $ident != '' && $registration != '!') {
 
@@ -134,12 +151,21 @@  discard block
 
 block discarded – undo
134 151 
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
135 152 
 					$latitude = $la / 10000.0;
136 153 
 					$longitude = $ln / 10000.0;
137 
-					if ($lac == 'S') $latitude = '-'.$latitude;
138 
-					if ($lnc == 'W') $longitude = '-'.$longitude;
154 
+					if ($lac == 'S') {
155 
+						$latitude = '-'.$latitude;
156 
+					}
157 
+					if ($lnc == 'W') {
158 
+						$longitude = '-'.$longitude;
159 
+					}
139 160 
 					// Temp not always available
140 
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
141 
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
142 
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
161 
+					if ($globalDebug) {
162 
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
163 
+					}
164 
+					if ($temp == '') {
165 
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
166 
+					} else {
167 
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
168 
+					}
143 169
144 170 
 					//$icao = $Translation->checkTranslation($ident);
145 171 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 
@@ -153,25 +179,35 @@  discard block
 
 block discarded – undo
153 179 
 				$ahour = '';
154 180 
 				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
155 181 
 				if ($n == 4 && strlen($darr) == 4) {
156 
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
157 
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
158 
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
182 
+					if ($dhour != '') {
183 
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
184 
+					}
185 
+					if ($ahour != '') {
186 
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
187 
+					}
188 
+					if ($globalDebug) {
189 
+						echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
190 
+					}
159 191 
 					//$icao = ACARS->ident2icao($ident);
160 192 
 					//$icao = $Translation->checkTranslation($ident);
161 193 
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
162 194 
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
163 195 
 					$found = true;
164 
-				}
165 
-				elseif ($n == 2 || $n  == 4) {
166 
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
167 
-					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
196 
+				} elseif ($n == 2 || $n  == 4) {
197 
+					if ($dhour != '') {
198 
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
199 
+					}
200 
+					if ($globalDebug) {
201 
+						echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
202 
+					}
168 203 
 					//$icao = ACARS->ident2icao($ident);
169 204 
 					//$icao = $Translation->checkTranslation($ident);
170 205 
 					$decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour);
171 206 
 					$found = true;
172 
-				}
173 
-				elseif ($n == 1) {
174 
-					if ($globalDebug) echo 'airport arrival : '.$darr."\n";
207 
+				} elseif ($n == 1) {
208 
+					if ($globalDebug) {
209 
+						echo 'airport arrival : '.$darr."\n";
210 
+					}
175 211 
 					//$icao = ACARS->ident2icao($ident);
176 212 
 					//$icao = $Translation->checkTranslation($ident);
177 213 
 					$decode = array('Arrival airport' => $darr);
 
@@ -189,7 +225,9 @@  discard block
 
 block discarded – undo
189 225 
 				$darr = '';
190 226 
 				$n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr);
191 227 
 				if ($n == 4) {
192 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
228 
+					if ($globalDebug) {
229 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
230 
+					}
193 231 
 					//$icao = ACARS->ident2icao($ident);
194 232 
 					//$icao = $Translation->checkTranslation($ident);
195 233 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 
@@ -223,14 +261,23 @@  discard block
 
 block discarded – undo
223 261 
 				$apiste = '';
224 262 
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
225 263 
 				if ($n > 8) {
226 
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
227 
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
228 
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
264 
+					if ($globalDebug) {
265 
+						echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
266 
+					}
267 
+					if ($dhour != '') {
268 
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
269 
+					}
270 
+					if ($ahour != '') {
271 
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
272 
+					}
229 273 
 					$icao = trim($aident);
230 274
231 275 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
232 
-					if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
233 
-					else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
276 
+					if ($ahour == '') {
277 
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
278 
+					} else {
279 
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
280 
+					}
234 281 
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
235 282 
 					$decode['icao'] = $icao;
236 283 
 					$found = true;
 
@@ -252,9 +299,15 @@  discard block
 
 block discarded – undo
252 299 
 					$lns = $lns.'.'.$lns;
253 300 
 					$latitude = $las / 1000.0;
254 301 
 					$longitude = $lns / 1000.0;
255 
-					if ($lac == 'S') $latitude = '-'.$latitude;
256 
-					if ($lnc == 'W') $longitude = '-'.$longitude;
257 
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
302 
+					if ($lac == 'S') {
303 
+						$latitude = '-'.$latitude;
304 
+					}
305 
+					if ($lnc == 'W') {
306 
+						$longitude = '-'.$longitude;
307 
+					}
308 
+					if ($globalDebug) {
309 
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
310 
+					}
258 311 
 					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
259 312 
 					$found = true;
260 313 
 				}
 
@@ -272,7 +325,9 @@  discard block
 
 block discarded – undo
272 325 
 				$darr = '';
273 326 
 				$n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr);
274 327 
 				if ($n == 4) {
275 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
328 
+					if ($globalDebug) {
329 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
330 
+					}
276 331 
 					//$icao = $Translation->checkTranslation($ident);
277 332 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
278 333 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -285,7 +340,9 @@  discard block
 
 block discarded – undo
285 340 
 				$darr = '';
286 341 
 				$n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr);
287 342 
 				if ($n == 4) {
288 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
343 
+					if ($globalDebug) {
344 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
345 
+					}
289 346 
 					//$icao = $Translation->checkTranslation($ident);
290 347 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
291 348 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -298,7 +355,9 @@  discard block
 
 block discarded – undo
298 355 
 				$darr = '';
299 356 
 				$n = sscanf($message, "002AF %4c %4c ", $dair, $darr);
300 357 
 				if ($n == 2) {
301 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
358 
+					if ($globalDebug) {
359 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
360 
+					}
302 361 
 					//$icao = $Translation->checkTranslation($ident);
303 362 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
304 363 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 
@@ -312,7 +371,9 @@  discard block
 
 block discarded – undo
312 371 
 				$darr = '';
313 372 
 				$n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
314 373 
 				if ($n == 6) {
315 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
374 
+					if ($globalDebug) {
375 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
376 
+					}
316 377 
 					//$icao = $Translation->checkTranslation($ident);
317 378 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
318 379 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -325,7 +386,9 @@  discard block
 
 block discarded – undo
325 386 
 				$darr = '';
326 387 
 				$n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
327 388 
 				if ($n == 7) {
328 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
389 
+					if ($globalDebug) {
390 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
391 
+					}
329 392 
 					//$icao = $Translation->checkTranslation($ident);
330 393 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
331 394 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -353,8 +416,12 @@  discard block
 
 block discarded – undo
353 416 
 					$decode['icao'] = $icao;
354 417 
 					$latitude = $las / 100.0;
355 418 
 					$longitude = $lns / 100.0;
356 
-					if ($lac == 'S') $latitude = '-'.$latitude;
357 
-					if ($lnc == 'W') $longitude = '-'.$longitude;
419 
+					if ($lac == 'S') {
420 
+						$latitude = '-'.$latitude;
421 
+					}
422 
+					if ($lnc == 'W') {
423 
+						$longitude = '-'.$longitude;
424 
+					}
358 425
359 426 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
360 427 
 					$found = true;
 
@@ -372,8 +439,12 @@  discard block
 
 block discarded – undo
372 439 
 				if ($n == 4) {
373 440 
 					$latitude = $las;
374 441 
 					$longitude = $lns;
375 
-					if ($lac == 'S') $latitude = '-'.$latitude;
376 
-					if ($lnc == 'W') $longitude = '-'.$longitude;
442 
+					if ($lac == 'S') {
443 
+						$latitude = '-'.$latitude;
444 
+					}
445 
+					if ($lnc == 'W') {
446 
+						$longitude = '-'.$longitude;
447 
+					}
377 448
378 449 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
379 450 
 					$found = true;
 
@@ -389,7 +460,9 @@  discard block
 
 block discarded – undo
389 460 
 				$darr = '';
390 461 
 				$n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr);
391 462 
 				if ($n == 5) {
392 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
463 
+					if ($globalDebug) {
464 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
465 
+					}
393 466 
 					//$icao = $Translation->checkTranslation($ident);
394 467 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
395 468 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -410,7 +483,9 @@  discard block
 
 block discarded – undo
410 483 
 				$aident = '';
411 484 
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
412 485 
 				if ($n == 8) {
413 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
486 
+					if ($globalDebug) {
487 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
488 
+					}
414 489 
 					$icao = trim($aident);
415 490 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
416 491 
 					$decode['icao'] = $icao;
 
@@ -427,7 +502,9 @@  discard block
 
 block discarded – undo
427 502 
 				$darr = '';
428 503 
 				$n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr);
429 504 
 				if ($n == 5) {
430 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
505 
+					if ($globalDebug) {
506 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
507 
+					}
431 508 
 					//$icao = $Translation->checkTranslation($ident);
432 509 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
433 510 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -442,7 +519,9 @@  discard block
 
 block discarded – undo
442 519 
 				$darr = '';
443 520 
 				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
444 521 
 				if ($n == 3) {
445 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
522 
+					if ($globalDebug) {
523 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
524 
+					}
446 525 
 					//$icao = $Translation->checkTranslation($ident);
447 526 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
448 527 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -457,7 +536,9 @@  discard block
 
 block discarded – undo
457 536 
 				$darr = '';
458 537 
 				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
459 538 
 				if ($n == 3) {
460 
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
539 
+					if ($globalDebug) {
540 
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
541 
+					}
461 542 
 					//$icao = $Translation->checkTranslation($ident);
462 543 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
463 544 
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 
@@ -467,7 +548,9 @@  discard block
 
 block discarded – undo
467 548 
 			if (!$found) {
468 549 
 				$n = sscanf($message,'MET01%4c',$airport);
469 550 
 				if ($n == 1) {
470 
-					if ($globalDebug) echo 'airport name : '.$airport;
551 
+					if ($globalDebug) {
552 
+						echo 'airport name : '.$airport;
553 
+					}
471 554 
 					$decode = array('Airport/Waypoint name' => $airport);
472 555 
 					$found = true;
473 556 
 				}
 
@@ -475,184 +558,126 @@  discard block
 
 block discarded – undo
475 558 
 			if ($label == 'H1') {
476 559 
 				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
477 560 
 					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
478 
-				}
479 
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
561 
+				} elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
480 562 
 					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
481 
-				}
482 
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
563 
+				} elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
483 564 
 					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
484 
-				}
485 
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
565 
+				} elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
486 566 
 					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
487 
-				}
488 
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
567 
+				} elseif (preg_match(':^#DFB/PIREP:',$message)) {
489 568 
 					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
490 
-				}
491 
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
569 
+				} elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
492 570 
 					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
493 
-				}
494 
-				elseif (preg_match(':^#M1AAEP:',$message)) {
571 
+				} elseif (preg_match(':^#M1AAEP:',$message)) {
495 572 
 					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
496 
-				}
497 
-				elseif (preg_match(':^#M2APWD:',$message)) {
573 
+				} elseif (preg_match(':^#M2APWD:',$message)) {
498 574 
 					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
499 
-				}
500 
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
575 
+				} elseif (preg_match(':^#M1BREQPWI:',$message)) {
501 576 
 					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
502 
-				}
503 
-				elseif (preg_match(':^#CF:',$message)) {
577 
+				} elseif (preg_match(':^#CF:',$message)) {
504 578 
 					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
505 
-				}
506 
-				elseif (preg_match(':^#DF:',$message)) {
579 
+				} elseif (preg_match(':^#DF:',$message)) {
507 580 
 					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
508 
-				}
509 
-				elseif (preg_match(':^#EC:',$message)) {
581 
+				} elseif (preg_match(':^#EC:',$message)) {
510 582 
 					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
511 
-				}
512 
-				elseif (preg_match(':^#EI:',$message)) {
583 
+				} elseif (preg_match(':^#EI:',$message)) {
513 584 
 					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
514 
-				}
515 
-				elseif (preg_match(':^#H1:',$message)) {
585 
+				} elseif (preg_match(':^#H1:',$message)) {
516 586 
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
517 
-				}
518 
-				elseif (preg_match(':^#H2:',$message)) {
587 
+				} elseif (preg_match(':^#H2:',$message)) {
519 588 
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
520 
-				}
521 
-				elseif (preg_match(':^#HD:',$message)) {
589 
+				} elseif (preg_match(':^#HD:',$message)) {
522 590 
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
523 
-				}
524 
-				elseif (preg_match(':^#M1:',$message)) {
591 
+				} elseif (preg_match(':^#M1:',$message)) {
525 592 
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
526 
-				}
527 
-				elseif (preg_match(':^#M2:',$message)) {
593 
+				} elseif (preg_match(':^#M2:',$message)) {
528 594 
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
529 
-				}
530 
-				elseif (preg_match(':^#M3:',$message)) {
595 
+				} elseif (preg_match(':^#M3:',$message)) {
531 596 
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
532 
-				}
533 
-				elseif (preg_match(':^#MD:',$message)) {
597 
+				} elseif (preg_match(':^#MD:',$message)) {
534 598 
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
535 
-				}
536 
-				elseif (preg_match(':^#PS:',$message)) {
599 
+				} elseif (preg_match(':^#PS:',$message)) {
537 600 
 					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
538 
-				}
539 
-				elseif (preg_match(':^#S1:',$message)) {
601 
+				} elseif (preg_match(':^#S1:',$message)) {
540 602 
 					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
541 
-				}
542 
-				elseif (preg_match(':^#S2:',$message)) {
603 
+				} elseif (preg_match(':^#S2:',$message)) {
543 604 
 					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
544 
-				}
545 
-				elseif (preg_match(':^#SD:',$message)) {
605 
+				} elseif (preg_match(':^#SD:',$message)) {
546 606 
 					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
547 
-				}
548 
-				elseif (preg_match(':^#T[0-8]:',$message)) {
607 
+				} elseif (preg_match(':^#T[0-8]:',$message)) {
549 608 
 					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
550 
-				}
551 
-				elseif (preg_match(':^#WO:',$message)) {
609 
+				} elseif (preg_match(':^#WO:',$message)) {
552 610 
 					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
553 
-				}
554 
-				elseif (preg_match(':^#A1:',$message)) {
611 
+				} elseif (preg_match(':^#A1:',$message)) {
555 612 
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
556 
-				}
557 
-				elseif (preg_match(':^#A3:',$message)) {
613 
+				} elseif (preg_match(':^#A3:',$message)) {
558 614 
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
559 
-				}
560 
-				elseif (preg_match(':^#A4:',$message)) {
615 
+				} elseif (preg_match(':^#A4:',$message)) {
561 616 
 					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
562 
-				}
563 
-				elseif (preg_match(':^#A6:',$message)) {
617 
+				} elseif (preg_match(':^#A6:',$message)) {
564 618 
 					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
565 
-				}
566 
-				elseif (preg_match(':^#A8:',$message)) {
619 
+				} elseif (preg_match(':^#A8:',$message)) {
567 620 
 					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
568 
-				}
569 
-				elseif (preg_match(':^#A9:',$message)) {
621 
+				} elseif (preg_match(':^#A9:',$message)) {
570 622 
 					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
571 
-				}
572 
-				elseif (preg_match(':^#A0:',$message)) {
623 
+				} elseif (preg_match(':^#A0:',$message)) {
573 624 
 					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
574 
-				}
575 
-				elseif (preg_match(':^#AA:',$message)) {
625 
+				} elseif (preg_match(':^#AA:',$message)) {
576 626 
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
577 
-				}
578 
-				elseif (preg_match(':^#AB:',$message)) {
627 
+				} elseif (preg_match(':^#AB:',$message)) {
579 628 
 					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
580 
-				}
581 
-				elseif (preg_match(':^#AC:',$message)) {
629 
+				} elseif (preg_match(':^#AC:',$message)) {
582 630 
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
583 
-				}
584 
-				elseif (preg_match(':^#AD:',$message)) {
631 
+				} elseif (preg_match(':^#AD:',$message)) {
585 632 
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
586 
-				}
587 
-				elseif (preg_match(':^#AF:',$message)) {
633 
+				} elseif (preg_match(':^#AF:',$message)) {
588 634 
 					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
589 
-				}
590 
-				elseif (preg_match(':^#B1:',$message)) {
635 
+				} elseif (preg_match(':^#B1:',$message)) {
591 636 
 					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
592 
-				}
593 
-				elseif (preg_match(':^#B2:',$message)) {
637 
+				} elseif (preg_match(':^#B2:',$message)) {
594 638 
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
595 
-				}
596 
-				elseif (preg_match(':^#B3:',$message)) {
639 
+				} elseif (preg_match(':^#B3:',$message)) {
597 640 
 					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
598 
-				}
599 
-				elseif (preg_match(':^#B4:',$message)) {
641 
+				} elseif (preg_match(':^#B4:',$message)) {
600 642 
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
601 
-				}
602 
-				elseif (preg_match(':^#B6:',$message)) {
643 
+				} elseif (preg_match(':^#B6:',$message)) {
603 644 
 					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
604 
-				}
605 
-				elseif (preg_match(':^#B8:',$message)) {
645 
+				} elseif (preg_match(':^#B8:',$message)) {
606 646 
 					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
607 
-				}
608 
-				elseif (preg_match(':^#B9:',$message)) {
647 
+				} elseif (preg_match(':^#B9:',$message)) {
609 648 
 					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
610 
-				}
611 
-				elseif (preg_match(':^#B0:',$message)) {
649 
+				} elseif (preg_match(':^#B0:',$message)) {
612 650 
 					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
613 
-				}
614 
-				elseif (preg_match(':^#BA:',$message)) {
651 
+				} elseif (preg_match(':^#BA:',$message)) {
615 652 
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
616 
-				}
617 
-				elseif (preg_match(':^#BB:',$message)) {
653 
+				} elseif (preg_match(':^#BB:',$message)) {
618 654 
 					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
619 
-				}
620 
-				elseif (preg_match(':^#BC:',$message)) {
655 
+				} elseif (preg_match(':^#BC:',$message)) {
621 656 
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
622 
-				}
623 
-				elseif (preg_match(':^#BD:',$message)) {
657 
+				} elseif (preg_match(':^#BD:',$message)) {
624 658 
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
625 
-				}
626 
-				elseif (preg_match(':^#BE:',$message)) {
659 
+				} elseif (preg_match(':^#BE:',$message)) {
627 660 
 					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
628 
-				}
629 
-				elseif (preg_match(':^#BF:',$message)) {
661 
+				} elseif (preg_match(':^#BF:',$message)) {
630 662 
 					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
631 
-				}
632 
-				elseif (preg_match(':^#H3:',$message)) {
663 
+				} elseif (preg_match(':^#H3:',$message)) {
633 664 
 					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
634 665 
 				}
635 666 
 			}
636 667 
 			if ($label == '10') {
637 668 
 				if (preg_match(':^DTO01:',$message)) {
638 669 
 					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
639 
-				}
640 
-				elseif (preg_match(':^AIS01:',$message)) {
670 
+				} elseif (preg_match(':^AIS01:',$message)) {
641 671 
 					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
642 
-				}
643 
-				elseif (preg_match(':^FTX01:',$message)) {
672 
+				} elseif (preg_match(':^FTX01:',$message)) {
644 673 
 					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
645 
-				}
646 
-				elseif (preg_match(':^FPL01:',$message)) {
674 
+				} elseif (preg_match(':^FPL01:',$message)) {
647 675 
 					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
648 
-				}
649 
-				elseif (preg_match(':^WAB01:',$message)) {
676 
+				} elseif (preg_match(':^WAB01:',$message)) {
650 677 
 					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
651 
-				}
652 
-				elseif (preg_match(':^MET01:',$message)) {
678 
+				} elseif (preg_match(':^MET01:',$message)) {
653 679 
 					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
654 
-				}
655 
-				elseif (preg_match(':^WAB02:',$message)) {
680 
+				} elseif (preg_match(':^WAB02:',$message)) {
656 681 
 					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
657 682 
 				}
658 683 
 			}
 
@@ -667,38 +692,28 @@  discard block
 
 block discarded – undo
667 692 
 					$vsta = array('Version' => $version);
668 693 
 					if ($state == 'E') {
669 694 
 						$vsta = array_merge($vsta,array('Link state' => 'Established'));
670 
-					}
671 
-					elseif ($state == 'L') {
695 
+					} elseif ($state == 'L') {
672 696 
 						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
673 
-					}
674 
-					else {
697 
+					} else {
675 698 
 						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
676 699 
 					}
677 700 
 					if ($type == 'V') {
678 701 
 						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
679 
-					}
680 
-					elseif ($type == 'S') {
702 
+					} elseif ($type == 'S') {
681 703 
 						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
682 
-					}
683 
-					elseif ($type == 'H') {
704 
+					} elseif ($type == 'H') {
684 705 
 						$vsta = array_merge($vsta,array('Link type' => 'HF'));
685 
-					}
686 
-					elseif ($type == 'G') {
706 
+					} elseif ($type == 'G') {
687 707 
 						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
688 
-					}
689 
-					elseif ($type == 'C') {
708 
+					} elseif ($type == 'C') {
690 709 
 						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
691 
-					}
692 
-					elseif ($type == '2') {
710 
+					} elseif ($type == '2') {
693 711 
 						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
694 
-					}
695 
-					elseif ($type == 'X') {
712 
+					} elseif ($type == 'X') {
696 713 
 						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
697 
-					}
698 
-					elseif ($type == 'I') {
714 
+					} elseif ($type == 'I') {
699 715 
 						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
700 
-					}
701 
-					else {
716 
+					} else {
702 717 
 						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
703 718 
 					}
704 719 
 					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
 
@@ -707,7 +722,9 @@  discard block
 
 block discarded – undo
707 722 
 			}
708 723
709 724 
 			$title = $this->getTitlefromLabel($label);
710 
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
725 
+			if ($title != '') {
726 
+				$decode = array_merge(array('Message title' => $title),$decode);
727 
+			}
711 728 
 			/*
712 729 
 			// Business jets always use GS0001
713 730 
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
 
@@ -742,31 +759,54 @@  discard block
 
 block discarded – undo
742 759 
 			$msg = $message['message'];
743 760 
 			$decode = $message['decode'];
744 761 
 			$registration = (string)$message['registration'];
745 
-			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
746 
-			else $latitude = '';
747 
-			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
748 
-			else $longitude = '';
749 
-			if (isset($decode['airicao'])) $airicao = $decode['airicao'];
750 
-			else $airicao = '';
751 
-			if (isset($decode['icao'])) $icao = $decode['icao'];
752 
-			else $icao = $Translation->checkTranslation($ident);
762 
+			if (isset($decode['latitude'])) {
763 
+				$latitude = $decode['latitude'];
764 
+			} else {
765 
+				$latitude = '';
766 
+			}
767 
+			if (isset($decode['longitude'])) {
768 
+				$longitude = $decode['longitude'];
769 
+			} else {
770 
+				$longitude = '';
771 
+			}
772 
+			if (isset($decode['airicao'])) {
773 
+				$airicao = $decode['airicao'];
774 
+			} else {
775 
+				$airicao = '';
776 
+			}
777 
+			if (isset($decode['icao'])) {
778 
+				$icao = $decode['icao'];
779 
+			} else {
780 
+				$icao = $Translation->checkTranslation($ident);
781 
+			}
753 782 
 			$image_array = $Image->getSpotterImage($registration);
754 783 
 			if (!isset($image_array[0]['registration'])) {
755 784 
 				$Image->addSpotterImage($registration);
756 785 
 			}
757 786 
 			// Business jets always use GS0001
758 
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
759 
-			if ($globalDebug && isset($info) && $info != '') echo $info;
760 
-			if (count($decode) > 0) $decode_json = json_encode($decode);
761 
-			else $decode_json = '';
787 
+			if ($ident != 'GS0001') {
788 
+				$info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
789 
+			}
790 
+			if ($globalDebug && isset($info) && $info != '') {
791 
+				echo $info;
792 
+			}
793 
+			if (count($decode) > 0) {
794 
+				$decode_json = json_encode($decode);
795 
+			} else {
796 
+				$decode_json = '';
797 
+			}
762 798 
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
763 799 
 				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
764 800 
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
765 801 
 				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
766 802 
 			}
767 803 
 			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
768 
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
769 
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
804 
+			if (!isset($globalACARSArchive)) {
805 
+				$globalACARSArchive = array('10','80','81','82','3F');
806 
+			}
807 
+			if ($result && in_array($label,$globalACARSArchive)) {
808 
+				$this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
809 
+			}
770 810 
 			if ($globalDebug && count($decode) > 0) {
771 811 
 				echo "Human readable data : ".implode(' - ',$decode)."\n";
772 812 
 			}
 
@@ -789,7 +829,9 @@  discard block
 
 block discarded – undo
789 829 
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
790 830 
 			$Connection = new Connection($this->db);
791 831 
 			$this->db = $Connection->db;
792 
-			if ($globalDebug) echo "Test if not already in Live ACARS table...";
832 
+			if ($globalDebug) {
833 
+				echo "Test if not already in Live ACARS table...";
834 
+			}
793 835 
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
794 836 
 			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
795 837 
 			try {
 
@@ -799,7 +841,9 @@  discard block
 
 block discarded – undo
799 841 
 				return "error : ".$e->getMessage();
800 842 
 			}
801 843 
 			if ($stht->fetchColumn() == 0) {
802 
-				if ($globalDebug) echo "Add Live ACARS data...";
844 
+				if ($globalDebug) {
845 
+					echo "Add Live ACARS data...";
846 
+				}
803 847 
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
804 848 
 				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
805 849 
 				try {
 
@@ -809,10 +853,14 @@  discard block
 
 block discarded – undo
809 853 
 					return "error : ".$e->getMessage();
810 854 
 				}
811 855 
 			} else {
812 
-				if ($globalDebug) echo "Data already in DB...\n";
856 
+				if ($globalDebug) {
857 
+					echo "Data already in DB...\n";
858 
+				}
813 859 
 				return false;
814 860 
 			}
815 
-			if ($globalDebug) echo "Done\n";
861 
+			if ($globalDebug) {
862 
+				echo "Done\n";
863 
+			}
816 864 
 			return true;
817 865 
 		}
818 866 
 	}
 
@@ -843,7 +891,9 @@  discard block
 
 block discarded – undo
843 891 
 			    	    }
844 892 
 				    if ($stht->fetchColumn() == 0) {
845 893 
 			*/
846 
-			if ($globalDebug) echo "Add Live ACARS data...";
894 
+			if ($globalDebug) {
895 
+				echo "Add Live ACARS data...";
896 
+			}
847 897 
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
848 898 
 			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
849 899 
 			try {
 
@@ -852,7 +902,9 @@  discard block
 
 block discarded – undo
852 902 
 			} catch(PDOException $e) {
853 903 
 				return "error : ".$e->getMessage();
854 904 
 			}
855 
-			if ($globalDebug) echo "Done\n";
905 
+			if ($globalDebug) {
906 
+				echo "Done\n";
907 
+			}
856 908 
 		}
857 909 
 	}
858 910 
 
@@ -875,8 +927,11 @@  discard block
 
 block discarded – undo
875 927 
 			return '';
876 928 
 		}
877 929 
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
878 
-		if (count($row) > 0) return $row[0]['title'];
879 
-		else return '';
930 
+		if (count($row) > 0) {
931 
+			return $row[0]['title'];
932 
+		} else {
933 
+			return '';
934 
+		}
880 935 
 	}
881 936
882 937 
 	/**
 
@@ -895,8 +950,11 @@  discard block
 
 block discarded – undo
895 950 
 			return array();
896 951 
 		}
897 952 
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
898 
-		if (count($row) > 0) return $row;
899 
-		else return array();
953 
+		if (count($row) > 0) {
954 
+			return $row;
955 
+		} else {
956 
+			return array();
957 
+		}
900 958 
 	}
901 959
902 960 
 	/**
 
@@ -916,8 +974,11 @@  discard block
 
 block discarded – undo
916 974 
 			return array();
917 975 
 		}
918 976 
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
919 
-		if (count($row) > 0) return $row[0];
920 
-		else return array();
977 
+		if (count($row) > 0) {
978 
+			return $row[0];
979 
+		} else {
980 
+			return array();
981 
+		}
921 982 
 	}
922 983
923 984 
 	/**
 
@@ -962,19 +1023,35 @@  discard block
 
 block discarded – undo
962 1023 
 			if ($row['registration'] != '') {
963 1024 
 				$row['registration'] = str_replace('.','',$row['registration']);
964 1025 
 				$image_array = $Image->getSpotterImage($row['registration']);
965 
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
966 
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
967 
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
968 
-			if ($row['registration'] == '') $row['registration'] = 'NA';
969 
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1026 
+				if (count($image_array) > 0) {
1027 
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1028 
+				} else {
1029 
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1030 
+				}
1031 
+			} else {
1032 
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1033 
+			}
1034 
+			if ($row['registration'] == '') {
1035 
+				$row['registration'] = 'NA';
1036 
+			}
1037 
+			if ($row['ident'] == '') {
1038 
+				$row['ident'] = 'NA';
1039 
+			}
970 1040 
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
971 1041 
 			if (isset($identicao[0])) {
972 1042 
 				if (substr($row['ident'],0,2) == 'AF') {
973 
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
974 
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
975 
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1043 
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1044 
+						$icao = $row['ident'];
1045 
+					} else {
1046 
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1047 
+					}
1048 
+				} else {
1049 
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1050 
+				}
976 1051 
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
977 
-			} else $icao = $row['ident'];
1052 
+			} else {
1053 
+				$icao = $row['ident'];
1054 
+			}
978 1055 
 			$icao = $Translation->checkTranslation($icao,false);
979 1056 
 			$decode = json_decode($row['decode'],true);
980 1057 
 			$found = false;
 
@@ -999,7 +1076,9 @@  discard block
 
 block discarded – undo
999 1076 
 					$found = true;
1000 1077 
 				}
1001 1078 
 			}
1002 
-			if ($found) $row['decode'] = json_encode($decode);
1079 
+			if ($found) {
1080 
+				$row['decode'] = json_encode($decode);
1081 
+			}
1003 1082 
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1004 1083 
 			$result[] = $data;
1005 1084 
 			$i++;
 
@@ -1007,8 +1086,9 @@  discard block
 
 block discarded – undo
1007 1086 
 		if (isset($result)) {
1008 1087 
 			$result[0]['query_number_rows'] = $i;
1009 1088 
 			return $result;
1089 
+		} else {
1090 
+			return array();
1010 1091 
 		}
1011 
-		else return array();
1012 1092 
 	}
1013 1093
1014 1094 
 	/**
 
@@ -1057,31 +1137,51 @@  discard block
 
 block discarded – undo
1057 1137 
 			if ($row['registration'] != '') {
1058 1138 
 				$row['registration'] = str_replace('.','',$row['registration']);
1059 1139 
 				$image_array = $Image->getSpotterImage($row['registration']);
1060 
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1061 
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1062 
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1140 
+				if (count($image_array) > 0) {
1141 
+					$data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1142 
+				} else {
1143 
+					$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1144 
+				}
1145 
+			} else {
1146 
+				$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1147 
+			}
1063 1148 
 			$icao = '';
1064 
-			if ($row['registration'] == '') $row['registration'] = 'NA';
1065 
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1149 
+			if ($row['registration'] == '') {
1150 
+				$row['registration'] = 'NA';
1151 
+			}
1152 
+			if ($row['ident'] == '') {
1153 
+				$row['ident'] = 'NA';
1154 
+			}
1066 1155 
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1067 1156 
 			if (isset($identicao[0])) {
1068 1157 
 				if (substr($row['ident'],0,2) == 'AF') {
1069 
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1070 
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1071 
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1158 
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1159 
+						$icao = $row['ident'];
1160 
+					} else {
1161 
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1162 
+					}
1163 
+				} else {
1164 
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1165 
+				}
1072 1166 
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1073 
-			} else $icao = $row['ident'];
1167 
+			} else {
1168 
+				$icao = $row['ident'];
1169 
+			}
1074 1170 
 			$icao = $Translation->checkTranslation($icao);
1075 1171 
 			$decode = json_decode($row['decode'],true);
1076 1172 
 			$found = false;
1077 1173 
 			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1078 1174 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1079 
-				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1175 
+				if (isset($airport_info[0]['icao'])) {
1176 
+					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1177 
+				}
1080 1178 
 				$found = true;
1081 1179 
 			}
1082 1180 
 			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1083 1181 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1084 
-				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1182 
+				if (isset($airport_info[0]['icao'])) {
1183 
+					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1184 
+				}
1085 1185 
 				$found = true;
1086 1186 
 			}
1087 1187 
 			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
 
@@ -1091,7 +1191,9 @@  discard block
 
 block discarded – undo
1091 1191 
 					$found = true;
1092 1192 
 				}
1093 1193 
 			}
1094 
-			if ($found) $row['decode'] = json_encode($decode);
1194 
+			if ($found) {
1195 
+				$row['decode'] = json_encode($decode);
1196 
+			}
1095 1197 
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1096 1198 
 			$result[] = $data;
1097 1199 
 			$i++;
 
@@ -1099,7 +1201,9 @@  discard block
 
 block discarded – undo
1099 1201 
 		if (isset($result)) {
1100 1202 
 			$result[0]['query_number_rows'] = $i;
1101 1203 
 			return $result;
1102 
-		} else return array();
1204 
+		} else {
1205 
+			return array();
1206 
+		}
1103 1207 
 	}
1104 1208
1105 1209 
 	/**
 
@@ -1115,25 +1219,37 @@  discard block
 
 block discarded – undo
1115 1219 
 		$ident = trim($ident);
1116 1220 
 		$Translation = new Translation($this->db);
1117 1221 
 		$Spotter = new Spotter($this->db);
1118 
-		if ($globalDebug) echo "Test if we add ModeS data...";
1222 
+		if ($globalDebug) {
1223 
+			echo "Test if we add ModeS data...";
1224 
+		}
1119 1225 
 		//if ($icao == '') $icao = ACARS->ident2icao($ident);
1120 
-		if ($icao == '') $icao = $Translation->checkTranslation($ident);
1121 
-		if ($globalDebug) echo '- Ident : '.$icao.' - ';
1226 
+		if ($icao == '') {
1227 
+			$icao = $Translation->checkTranslation($ident);
1228 
+		}
1229 
+		if ($globalDebug) {
1230 
+			echo '- Ident : '.$icao.' - ';
1231 
+		}
1122 1232 
 		if ($ident == '' || $registration == '') {
1123 
-			if ($globalDebug) echo "Ident or registration null, exit\n";
1233 
+			if ($globalDebug) {
1234 
+				echo "Ident or registration null, exit\n";
1235 
+			}
1124 1236 
 			return '';
1125 1237 
 		}
1126 1238 
 		$registration = str_replace('.','',$registration);
1127 1239 
 		$ident = $Translation->ident2icao($ident);
1128 1240 
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1129 
-		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
1241 
+		if ($globalDebug) {
1242 
+			echo "Check if needed to add translation ".$ident.'... ';
1243 
+		}
1130 1244 
 		$querysi = "SELECT ident FROM spotter_live s,aircraft_modes a WHERE a.ModeS = s.ModeS AND a.Registration = :registration AND s.format_source <> 'ACARS' LIMIT 1";
1131 1245 
 		$querysi_values = array(':registration' => $registration);
1132 1246 
 		try {
1133 1247 
 			$sthsi = $this->db->prepare($querysi);
1134 1248 
 			$sthsi->execute($querysi_values);
1135 1249 
 		} catch(PDOException $e) {
1136 
-			if ($globalDebug) echo $e->getMessage();
1250 
+			if ($globalDebug) {
1251 
+				echo $e->getMessage();
1252 
+			}
1137 1253 
 			return "error : ".$e->getMessage();
1138 1254 
 		}
1139 1255 
 		$resultsi = $sthsi->fetch(PDO::FETCH_ASSOC);
 
@@ -1141,9 +1257,14 @@  discard block
 
 block discarded – undo
1141 1257 
 		if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') {
1142 1258 
 			$Translation = new Translation($this->db);
1143 1259 
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1144 
-			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1145 
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1146 
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1260 
+			if ($globalDebug) {
1261 
+				echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1262 
+			}
1263 
+			if ($ident != $trans_ident) {
1264 
+				$Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1265 
+			} elseif ($trans_ident == $ident) {
1266 
+				$Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1267 
+			}
1147 1268 
 		} else {
1148 1269 
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1149 1270 
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
 
@@ -1152,32 +1273,46 @@  discard block
 
 block discarded – undo
1152 1273 
 					$sth = $this->db->prepare($query);
1153 1274 
 					$sth->execute($query_values);
1154 1275 
 				} catch(PDOException $e) {
1155 
-					if ($globalDebug) echo $e->getMessage();
1276 
+					if ($globalDebug) {
1277 
+						echo $e->getMessage();
1278 
+					}
1156 1279 
 					return "error : ".$e->getMessage();
1157 1280 
 				}
1158 1281 
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
1159 1282 
 				$sth->closeCursor();
1160 
-				if (isset($result['modes'])) $hex = $result['modes'];
1161 
-				else $hex = '';
1283 
+				if (isset($result['modes'])) {
1284 
+					$hex = $result['modes'];
1285 
+				} else {
1286 
+					$hex = '';
1287 
+				}
1162 1288 
 				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1163 
-				if ($this->fromACARSscript) $this->SI->add($SI_data);
1289 
+				if ($this->fromACARSscript) {
1290 
+					$this->SI->add($SI_data);
1291 
+				}
1164 1292 
 			}
1165 1293 
 		}
1166 
-		if ($globalDebug) echo 'Done'."\n";
1294 
+		if ($globalDebug) {
1295 
+			echo 'Done'."\n";
1296 
+		}
1167 1297 
 		$query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1";
1168 1298 
 		$query_values = array(':ident' => $icao);
1169 1299 
 		try {
1170 1300 
 			$sth = $this->db->prepare($query);
1171 1301 
 			$sth->execute($query_values);
1172 1302 
 		} catch(PDOException $e) {
1173 
-			if ($globalDebug) echo $e->getMessage();
1303 
+			if ($globalDebug) {
1304 
+				echo $e->getMessage();
1305 
+			}
1174 1306 
 			return "error : ".$e->getMessage();
1175 1307 
 		}
1176 1308 
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
1177 1309 
 		$sth->closeCursor();
1178 1310 
 		if (isset($result['flightaware_id'])) {
1179 
-			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1180 
-			else $ModeS = '';
1311 
+			if (isset($result['ModeS'])) {
1312 
+				$ModeS = $result['ModeS'];
1313 
+			} else {
1314 
+				$ModeS = '';
1315 
+			}
1181 1316 
 			if ($ModeS == '') {
1182 1317 
 				$id = explode('-',$result['flightaware_id']);
1183 1318 
 				$ModeS = $id[0];
 
@@ -1190,24 +1325,32 @@  discard block
 
 block discarded – undo
1190 1325 
 					$sthc = $this->db->prepare($queryc);
1191 1326 
 					$sthc->execute($queryc_values);
1192 1327 
 				} catch(PDOException $e) {
1193 
-					if ($globalDebug) echo $e->getMessage();
1328 
+					if ($globalDebug) {
1329 
+						echo $e->getMessage();
1330 
+					}
1194 1331 
 					return "error : ".$e->getMessage();
1195 1332 
 				}
1196 1333 
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1197 1334 
 				$sthc->closeCursor();
1198 1335 
 				if (count($row) ==  0) {
1199 
-					if ($globalDebug) echo " Add to ModeS table - ";
1336 
+					if ($globalDebug) {
1337 
+						echo " Add to ModeS table - ";
1338 
+					}
1200 1339 
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1201 1340 
 					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1202 1341 
 					try {
1203 1342 
 						$sthi = $this->db->prepare($queryi);
1204 1343 
 						$sthi->execute($queryi_values);
1205 1344 
 					} catch(PDOException $e) {
1206 
-						if ($globalDebug) echo $e->getMessage();
1345 
+						if ($globalDebug) {
1346 
+							echo $e->getMessage();
1347 
+						}
1207 1348 
 						return "error : ".$e->getMessage();
1208 1349 
 					}
1209 1350 
 				} else {
1210 
-					if ($globalDebug) echo " Update ModeS table - ";
1351 
+					if ($globalDebug) {
1352 
+						echo " Update ModeS table - ";
1353 
+					}
1211 1354 
 					if ($ICAOTypeCode != '') {
1212 1355 
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1213 1356 
 						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 
@@ -1219,7 +1362,9 @@  discard block
 
 block discarded – undo
1219 1362 
 						$sthi = $this->db->prepare($queryi);
1220 1363 
 						$sthi->execute($queryi_values);
1221 1364 
 					} catch(PDOException $e) {
1222 
-						if ($globalDebug) echo $e->getMessage();
1365 
+						if ($globalDebug) {
1366 
+							echo $e->getMessage();
1367 
+						}
1223 1368 
 						return "error : ".$e->getMessage();
1224 1369 
 					}
1225 1370 
 				}
 
@@ -1240,7 +1385,9 @@  discard block
 
 block discarded – undo
1240 1385 
 					    return "error : ".$e->getMessage();
1241 1386 
 				}
1242 1387 
 				*/
1243 
-				if ($globalDebug) echo " Update Spotter_output table - ";
1388 
+				if ($globalDebug) {
1389 
+					echo " Update Spotter_output table - ";
1390 
+				}
1244 1391 
 				if ($ICAOTypeCode != '') {
1245 1392 
 					if ($globalDBdriver == 'mysql') {
1246 1393 
 						$queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
 
@@ -1251,8 +1398,7 @@  discard block
 
 block discarded – undo
1251 1398 
 				} else {
1252 1399 
 					if ($globalDBdriver == 'mysql') {
1253 1400 
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
1254 
-					}
1255 
-					elseif ($globalDBdriver == 'pgsql') {
1401 
+					} elseif ($globalDBdriver == 'pgsql') {
1256 1402 
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1257 1403 
 					}
1258 1404 
 					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
 
@@ -1261,14 +1407,20 @@  discard block
 
 block discarded – undo
1261 1407 
 					$sthi = $this->db->prepare($queryi);
1262 1408 
 					$sthi->execute($queryi_values);
1263 1409 
 				} catch(PDOException $e) {
1264 
-					if ($globalDebug) echo $e->getMessage();
1410 
+					if ($globalDebug) {
1411 
+						echo $e->getMessage();
1412 
+					}
1265 1413 
 					return "error : ".$e->getMessage();
1266 1414 
 				}
1267 1415 
 			}
1268 1416 
 		} else {
1269 
-			if ($globalDebug) echo " Can't find ModeS in spotter_output - ";
1417 
+			if ($globalDebug) {
1418 
+				echo " Can't find ModeS in spotter_output - ";
1419 
+			}
1420 
+		}
1421 
+		if ($globalDebug) {
1422 
+			echo "Done\n";
1270 1423 
 		}
1271 
-		if ($globalDebug) echo "Done\n";
1272 1424 
 	}
1273 1425 
 }
1274 1426 
 ?>
Please login to merge, or discard this patch.
Indentation   +72 added lines, -72 removed lines patch added patch discarded remove patch 
@@ -32,11 +32,11 @@  discard block
 
 block discarded – undo
32 32 
 	}
33 33
34 34 
 	/**
35 
-	* Change IATA to ICAO value for ident
36 
-	*
37 
-	* @param String $ident ident
38 
-	* @return String the icao
39 
-	*/
35 
+	 * Change IATA to ICAO value for ident
36 
+	 *
37 
+	 * @param String $ident ident
38 
+	 * @return String the icao
39 
+	 */
40 40 
 	public function ident2icao($ident) {
41 41 
 		if (substr($ident,0,2) == 'AF') {
42 42 
 			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
 
@@ -52,11 +52,11 @@  discard block
 
 block discarded – undo
52 52 
 	}
53 53
54 54 
 	/**
55 
-	* Deletes all info in the live table
56 
-	*
57 
-	* @return String success or false
58 
-	*
59 
-	*/
55 
+	 * Deletes all info in the live table
56 
+	 *
57 
+	 * @return String success or false
58 
+	 *
59 
+	 */
60 60 
 	public function deleteLiveAcarsData()
61 61 
 	{
62 62 
 		global $globalDBdriver;
 
@@ -76,11 +76,11 @@  discard block
 
 block discarded – undo
76 76 
 	}
77 77
78 78 
 	/**
79 
-	* Deletes all info in the archive table
80 
-	*
81 
-	* @return String success or false
82 
-	*
83 
-	*/
79 
+	 * Deletes all info in the archive table
80 
+	 *
81 
+	 * @return String success or false
82 
+	 *
83 
+	 */
84 84 
 	public function deleteArchiveAcarsData()
85 85 
 	{
86 86 
 		global $globalACARSArchiveKeepMonths, $globalDBdriver;
 
@@ -101,11 +101,11 @@  discard block
 
 block discarded – undo
101 101
102 102
103 103 
 	/**
104 
-	* Parse ACARS data
105 
-	*
106 
-	* @param String ACARS data in acarsdec data
107 
-	*
108 
-	*/
104 
+	 * Parse ACARS data
105 
+	 *
106 
+	 * @param String ACARS data in acarsdec data
107 
+	 *
108 
+	 */
109 109 
 	public function parse($data) {
110 110 
 		global $globalDebug, $globalACARSArchive;
111 111 
 		//$Image = new Image($this->db);
 
@@ -735,11 +735,11 @@  discard block
 
 block discarded – undo
735 735 
 	}
736 736
737 737 
 	/**
738 
-	* Add ACARS data
739 
-	*
740 
-	* @param String ACARS data in acarsdec data
741 
-	*
742 
-	*/
738 
+	 * Add ACARS data
739 
+	 *
740 
+	 * @param String ACARS data in acarsdec data
741 
+	 *
742 
+	 */
743 743 
 	function add($data) {
744 744 
 		global $globalDebug, $globalACARSArchive;
745 745 
 		$Image = new Image($this->db);
 
@@ -786,15 +786,15 @@  discard block
 
 block discarded – undo
786 786 
 	}
787 787
788 788 
 	/**
789 
-	* Add Live ACARS data in DB
790 
-	*
791 
-	* @param String $ident ident
792 
-	* @param String $registration Registration of the aircraft
793 
-	* @param String $label Label of the ACARS message
794 
-	* @param String $block_id Block id of the ACARS message
795 
-	* @param String $msg_no Number of the ACARS message
796 
-	* @param String $message ACARS message
797 
-	*/
789 
+	 * Add Live ACARS data in DB
790 
+	 *
791 
+	 * @param String $ident ident
792 
+	 * @param String $registration Registration of the aircraft
793 
+	 * @param String $label Label of the ACARS message
794 
+	 * @param String $block_id Block id of the ACARS message
795 
+	 * @param String $msg_no Number of the ACARS message
796 
+	 * @param String $message ACARS message
797 
+	 */
798 798 
 	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
799 799 
 		global $globalDebug;
800 800 
 		date_default_timezone_set('UTC');
 
@@ -830,15 +830,15 @@  discard block
 
 block discarded – undo
830 830 
 	}
831 831
832 832 
 	/**
833 
-	* Add Archive ACARS data in DB
834 
-	*
835 
-	* @param String $ident ident
836 
-	* @param String $registration Registration of the aircraft
837 
-	* @param String $label Label of the ACARS message
838 
-	* @param String $block_id Block id of the ACARS message
839 
-	* @param String $msg_no Number of the ACARS message
840 
-	* @param String $message ACARS message
841 
-	*/
833 
+	 * Add Archive ACARS data in DB
834 
+	 *
835 
+	 * @param String $ident ident
836 
+	 * @param String $registration Registration of the aircraft
837 
+	 * @param String $label Label of the ACARS message
838 
+	 * @param String $block_id Block id of the ACARS message
839 
+	 * @param String $msg_no Number of the ACARS message
840 
+	 * @param String $message ACARS message
841 
+	 */
842 842 
 	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
843 843 
 		global $globalDebug;
844 844 
 		date_default_timezone_set('UTC');
 
@@ -869,11 +869,11 @@  discard block
 
 block discarded – undo
869 869 
 	}
870 870
871 871 
 	/**
872 
-	* Get Message title from label from DB
873 
-	*
874 
-	* @param String $label
875 
-	* @return String Return ACARS title
876 
-	*/
872 
+	 * Get Message title from label from DB
873 
+	 *
874 
+	 * @param String $label
875 
+	 * @return String Return ACARS title
876 
+	 */
877 877 
 	public function getTitlefromLabel($label) {
878 878 
 		$Connection = new Connection($this->db);
879 879 
 		$this->db = $Connection->db;
 
@@ -892,10 +892,10 @@  discard block
 
 block discarded – undo
892 892 
 	}
893 893
894 894 
 	/**
895 
-	* List all Message title & label from DB
896 
-	*
897 
-	* @return Array Return ACARS data in array
898 
-	*/
895 
+	 * List all Message title & label from DB
896 
+	 *
897 
+	 * @return Array Return ACARS data in array
898 
+	 */
899 899 
 	public function getAllTitleLabel() {
900 900 
 		$query = "SELECT * FROM acars_label ORDER BY title";
901 901 
 		$query_values = array();
 
@@ -912,11 +912,11 @@  discard block
 
 block discarded – undo
912 912 
 	}
913 913
914 914 
 	/**
915 
-	* Get Live ACARS data from DB
916 
-	*
917 
-	* @param String $ident
918 
-	* @return Array Return ACARS data in array
919 
-	*/
915 
+	 * Get Live ACARS data from DB
916 
+	 *
917 
+	 * @param String $ident
918 
+	 * @return Array Return ACARS data in array
919 
+	 */
920 920 
 	public function getLiveAcarsData($ident) {
921 921 
 		$query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC";
922 922 
 		$query_values = array(':ident' => $ident);
 
@@ -933,10 +933,10 @@  discard block
 
 block discarded – undo
933 933 
 	}
934 934
935 935 
 	/**
936 
-	* Get Latest ACARS data from DB
937 
-	*
938 
-	* @return Array Return ACARS data in array
939 
-	*/
936 
+	 * Get Latest ACARS data from DB
937 
+	 *
938 
+	 * @return Array Return ACARS data in array
939 
+	 */
940 940 
 	public function getLatestAcarsData($limit = '',$label = '') {
941 941 
 		global $globalURL, $globalDBdriver;
942 942 
 		$Image = new Image($this->db);
 
@@ -1024,10 +1024,10 @@  discard block
 
 block discarded – undo
1024 1024 
 	}
1025 1025
1026 1026 
 	/**
1027 
-	* Get Archive ACARS data from DB
1028 
-	*
1029 
-	* @return Array Return ACARS data in array
1030 
-	*/
1027 
+	 * Get Archive ACARS data from DB
1028 
+	 *
1029 
+	 * @return Array Return ACARS data in array
1030 
+	 */
1031 1031 
 	public function getArchiveAcarsData($limit = '',$label = '') {
1032 1032 
 		global $globalURL, $globalDBdriver;
1033 1033 
 		$Image = new Image($this->db);
 
@@ -1115,13 +1115,13 @@  discard block
 
 block discarded – undo
1115 1115 
 	}
1116 1116
1117 1117 
 	/**
1118 
-	* Add ModeS data to DB
1119 
-	*
1120 
-	* @param String $ident ident
1121 
-	* @param String $registration Registration of the aircraft
1122 
-	* @param String $icao
1123 
-	* @param String $ICAOTypeCode
1124 
-	*/
1118 
+	 * Add ModeS data to DB
1119 
+	 *
1120 
+	 * @param String $ident ident
1121 
+	 * @param String $registration Registration of the aircraft
1122 
+	 * @param String $icao
1123 
+	 * @param String $ICAOTypeCode
1124 
+	 */
1125 1125 
 	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
1126 1126 
 		global $globalDebug, $globalDBdriver;
1127 1127 
 		$ident = trim($ident);
Please login to merge, or discard this patch.
Spacing   +256 added lines, -256 removed lines patch added patch discarded remove patch 
@@ -21,7 +21,7 @@  discard block
 
 block discarded – undo
21 21 
 	/*
22 22 
 	 * Initialize DB connection
23 23 
 	*/
24 
-	public function __construct($dbc = null,$fromACARSscript = false) {
24 
+	public function __construct($dbc = null, $fromACARSscript = false) {
25 25 
 		$Connection = new Connection($dbc);
26 26 
 		$this->db = $Connection->db();
27 27 
 		if ($this->db === null) die('Error: No DB connection. (ACARS)');
 
@@ -38,14 +38,14 @@  discard block
 
 block discarded – undo
38 38 
 	* @return String the icao
39 39 
 	*/
40 40 
 	public function ident2icao($ident) {
41 
-		if (substr($ident,0,2) == 'AF') {
42 
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
43 
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
41 
+		if (substr($ident, 0, 2) == 'AF') {
42 
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
43 
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
44 44 
 		} else {
45 45 
 			$Spotter = new Spotter($this->db);
46 
-			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
46 
+			$identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2));
47 47 
 			if (isset($identicao[0])) {
48 
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
48 
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
49 49 
 			} else $icao = $ident;
50 50 
 		}
51 51 
 		return $icao;
 
@@ -69,7 +69,7 @@  discard block
 
 block discarded – undo
69 69
70 70 
 			$sth = $this->db->prepare($query);
71 71 
 			$sth->execute();
72 
-		} catch(PDOException $e) {
72 
+		} catch (PDOException $e) {
73 73 
 			return "error";
74 74 
 		}
75 75 
 		return "success";
 
@@ -93,7 +93,7 @@  discard block
 
 block discarded – undo
93 93
94 94 
 			$sth = $this->db->prepare($query);
95 95 
 			$sth->execute();
96 
-		} catch(PDOException $e) {
96 
+		} catch (PDOException $e) {
97 97 
 			return "error";
98 98 
 		}
99 99 
 		return "success";
 
@@ -118,13 +118,13 @@  discard block
 
 block discarded – undo
118 118 
 		$ident = '';
119 119 
 		$message = '';
120 120 
 		$result = array();
121 
-		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
122 
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
123 
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
124 
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
121 
+		$n = sscanf($data, '(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
122 
+		if ($n == 0) $n = sscanf($data, 'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
123 
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
124 
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
125 125 
 		if ($n != 0) {
126 
-			$registration = str_replace('.','',$registration);
127 
-			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
126 
+			$registration = str_replace('.', '', $registration);
127 
+			$result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message);
128 128 
 			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
129 129 
 		} else $message = $data;
130 130 
 		$decode = array();
 
@@ -144,14 +144,14 @@  discard block
 
 block discarded – undo
144 144 
 				$temp = '';
145 145 
 				$n = sscanf($message, "FST01%4c%4c%c%06d%c%07d%03d%*8[0-9a-zA-Z ]-%02dC", $dair, $darr, $lac, $la, $lnc, $ln, $alt, $temp);
146 146 
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
147 
-					$latitude = $la / 10000.0;
148 
-					$longitude = $ln / 10000.0;
147 
+					$latitude = $la/10000.0;
148 
+					$longitude = $ln/10000.0;
149 149 
 					if ($lac == 'S') $latitude = '-'.$latitude;
150 150 
 					if ($lnc == 'W') $longitude = '-'.$longitude;
151 151 
 					// Temp not always available
152 152 
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
153 
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
154 
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
153 
+					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt);
154 
+					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C');
155 155
156 156 
 					//$icao = $Translation->checkTranslation($ident);
157 157 
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 
@@ -163,19 +163,19 @@  discard block
 
 block discarded – undo
163 163 
 				$dhour = '';
164 164 
 				$darr = '';
165 165 
 				$ahour = '';
166 
-				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
166 
+				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour);
167 167 
 				if ($n == 4 && strlen($darr) == 4) {
168 
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
169 
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
170 
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
168 
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
169 
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
170 
+					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n";
171 171 
 					//$icao = ACARS->ident2icao($ident);
172 172 
 					//$icao = $Translation->checkTranslation($ident);
173 173 
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
174 174 
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
175 175 
 					$found = true;
176 176 
 				}
177 
-				elseif ($n == 2 || $n  == 4) {
178 
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
177 
+				elseif ($n == 2 || $n == 4) {
178 
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
179 179 
 					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
180 180 
 					//$icao = ACARS->ident2icao($ident);
181 181 
 					//$icao = $Translation->checkTranslation($ident);
 
@@ -233,11 +233,11 @@  discard block
 
 block discarded – undo
233 233 
 				$ahour = '';
234 234 
 				$aair = '';
235 235 
 				$apiste = '';
236 
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
236 
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao, $aident, $dair, $darr, $ddate, $dhour, $ahour, $aair, $apiste);
237 237 
 				if ($n > 8) {
238 
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
239 
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
240 
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
238 
+					if ($globalDebug) echo 'airicao : '.$airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '.$darr.' - date depart : '.$ddate.' - departure hour : '.$dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
239 
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
240 
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
241 241 
 					$icao = trim($aident);
242 242
243 243 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
 
@@ -262,8 +262,8 @@  discard block
 
 block discarded – undo
262 262 
 				if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
263 263 
 					$las = $las.'.'.$lass;
264 264 
 					$lns = $lns.'.'.$lns;
265 
-					$latitude = $las / 1000.0;
266 
-					$longitude = $lns / 1000.0;
265 
+					$latitude = $las/1000.0;
266 
+					$longitude = $lns/1000.0;
267 267 
 					if ($lac == 'S') $latitude = '-'.$latitude;
268 268 
 					if ($lnc == 'W') $longitude = '-'.$longitude;
269 269 
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
 
@@ -358,17 +358,17 @@  discard block
 
 block discarded – undo
358 358 
 				$alt = '';
359 359 
 				$fuel = '';
360 360 
 				$speed = '';
361 
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
361 
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
362 362 
 				if ($n == 9) {
363 363 
 					//if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
364 364 
 					$icao = trim($aident);
365 365 
 					$decode['icao'] = $icao;
366 
-					$latitude = $las / 100.0;
367 
-					$longitude = $lns / 100.0;
366 
+					$latitude = $las/100.0;
367 
+					$longitude = $lns/100.0;
368 368 
 					if ($lac == 'S') $latitude = '-'.$latitude;
369 369 
 					if ($lnc == 'W') $longitude = '-'.$longitude;
370 370
371 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
371 
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed);
372 372 
 					$found = true;
373 373 
 				}
374 374 
 			}
 
@@ -387,7 +387,7 @@  discard block
 
 block discarded – undo
387 387 
 					if ($lac == 'S') $latitude = '-'.$latitude;
388 388 
 					if ($lnc == 'W') $longitude = '-'.$longitude;
389 389
390 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
390 
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
391 391 
 					$found = true;
392 392 
 				}
393 393 
 			}
 
@@ -420,7 +420,7 @@  discard block
 
 block discarded – undo
420 420 
 				$dair = '';
421 421 
 				$darr = '';
422 422 
 				$aident = '';
423 
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
423 
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
424 424 
 				if ($n == 8) {
425 425 
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
426 426 
 					$icao = trim($aident);
 
@@ -452,7 +452,7 @@  discard block
 
 block discarded – undo
452 452 
 				*/
453 453 
 				$dair = '';
454 454 
 				$darr = '';
455 
-				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
455 
+				$n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr);
456 456 
 				if ($n == 3) {
457 457 
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
458 458 
 					//$icao = $Translation->checkTranslation($ident);
 
@@ -467,7 +467,7 @@  discard block
 
 block discarded – undo
467 467 
 				*/
468 468 
 				$dair = '';
469 469 
 				$darr = '';
470 
-				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
470 
+				$n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr);
471 471 
 				if ($n == 3) {
472 472 
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
473 473 
 					//$icao = $Translation->checkTranslation($ident);
 
@@ -477,7 +477,7 @@  discard block
 
 block discarded – undo
477 477 
 				}
478 478 
 			}
479 479 
 			if (!$found) {
480 
-				$n = sscanf($message,'MET01%4c',$airport);
480 
+				$n = sscanf($message, 'MET01%4c', $airport);
481 481 
 				if ($n == 1) {
482 482 
 					if ($globalDebug) echo 'airport name : '.$airport;
483 483 
 					$decode = array('Airport/Waypoint name' => $airport);
 
@@ -485,241 +485,241 @@  discard block
 
 block discarded – undo
485 485 
 				}
486 486 
 			}
487 487 
 			if ($label == 'H1') {
488 
-				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
489 
-					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
488 
+				if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) {
489 
+					$decode = array_merge(array('Message nature' => 'Equipment failure'), $decode);
490 490 
 				}
491 
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
492 
-					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
491 
+				elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) {
492 
+					$decode = array_merge(array('Message nature' => 'Take off performance data'), $decode);
493 493 
 				}
494 
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
495 
-					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
494 
+				elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) {
495 
+					$decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode);
496 496 
 				}
497 
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
498 
-					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
497 
+				elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) {
498 
+					$decode = array_merge(array('Message nature' => 'Weather observation'), $decode);
499 499 
 				}
500 
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
501 
-					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
500 
+				elseif (preg_match(':^#DFB/PIREP:', $message)) {
501 
+					$decode = array_merge(array('Message nature' => 'Pilot Report'), $decode);
502 502 
 				}
503 
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
504 
-					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
503 
+				elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) {
504 
+					$decode = array_merge(array('Message nature' => 'Engine Data'), $decode);
505 505 
 				}
506 
-				elseif (preg_match(':^#M1AAEP:',$message)) {
507 
-					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
506 
+				elseif (preg_match(':^#M1AAEP:', $message)) {
507 
+					$decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode);
508 508 
 				}
509 
-				elseif (preg_match(':^#M2APWD:',$message)) {
510 
-					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
509 
+				elseif (preg_match(':^#M2APWD:', $message)) {
510 
+					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode);
511 511 
 				}
512 
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
513 
-					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
512 
+				elseif (preg_match(':^#M1BREQPWI:', $message)) {
513 
+					$decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode);
514 514 
 				}
515 
-				elseif (preg_match(':^#CF:',$message)) {
516 
-					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
515 
+				elseif (preg_match(':^#CF:', $message)) {
516 
+					$decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode);
517 517 
 				}
518 
-				elseif (preg_match(':^#DF:',$message)) {
519 
-					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
518 
+				elseif (preg_match(':^#DF:', $message)) {
519 
+					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode);
520 520 
 				}
521 
-				elseif (preg_match(':^#EC:',$message)) {
522 
-					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
521 
+				elseif (preg_match(':^#EC:', $message)) {
522 
+					$decode = array_merge(array('Message nature' => 'Engine Display System'), $decode);
523 523 
 				}
524 
-				elseif (preg_match(':^#EI:',$message)) {
525 
-					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
524 
+				elseif (preg_match(':^#EI:', $message)) {
525 
+					$decode = array_merge(array('Message nature' => 'Engine Report'), $decode);
526 526 
 				}
527 
-				elseif (preg_match(':^#H1:',$message)) {
528 
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
527 
+				elseif (preg_match(':^#H1:', $message)) {
528 
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode);
529 529 
 				}
530 
-				elseif (preg_match(':^#H2:',$message)) {
531 
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
530 
+				elseif (preg_match(':^#H2:', $message)) {
531 
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode);
532 532 
 				}
533 
-				elseif (preg_match(':^#HD:',$message)) {
534 
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
533 
+				elseif (preg_match(':^#HD:', $message)) {
534 
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode);
535 535 
 				}
536 
-				elseif (preg_match(':^#M1:',$message)) {
537 
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
536 
+				elseif (preg_match(':^#M1:', $message)) {
537 
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode);
538 538 
 				}
539 
-				elseif (preg_match(':^#M2:',$message)) {
540 
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
539 
+				elseif (preg_match(':^#M2:', $message)) {
540 
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode);
541 541 
 				}
542 
-				elseif (preg_match(':^#M3:',$message)) {
543 
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
542 
+				elseif (preg_match(':^#M3:', $message)) {
543 
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode);
544 544 
 				}
545 
-				elseif (preg_match(':^#MD:',$message)) {
546 
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
545 
+				elseif (preg_match(':^#MD:', $message)) {
546 
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode);
547 547 
 				}
548 
-				elseif (preg_match(':^#PS:',$message)) {
549 
-					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
548 
+				elseif (preg_match(':^#PS:', $message)) {
549 
+					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode);
550 550 
 				}
551 
-				elseif (preg_match(':^#S1:',$message)) {
552 
-					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
551 
+				elseif (preg_match(':^#S1:', $message)) {
552 
+					$decode = array_merge(array('Message nature' => 'SDU - Left'), $decode);
553 553 
 				}
554 
-				elseif (preg_match(':^#S2:',$message)) {
555 
-					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
554 
+				elseif (preg_match(':^#S2:', $message)) {
555 
+					$decode = array_merge(array('Message nature' => 'SDU - Right'), $decode);
556 556 
 				}
557 
-				elseif (preg_match(':^#SD:',$message)) {
558 
-					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
557 
+				elseif (preg_match(':^#SD:', $message)) {
558 
+					$decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode);
559 559 
 				}
560 
-				elseif (preg_match(':^#T[0-8]:',$message)) {
561 
-					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
560 
+				elseif (preg_match(':^#T[0-8]:', $message)) {
561 
+					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode);
562 562 
 				}
563 
-				elseif (preg_match(':^#WO:',$message)) {
564 
-					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
563 
+				elseif (preg_match(':^#WO:', $message)) {
564 
+					$decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode);
565 565 
 				}
566 
-				elseif (preg_match(':^#A1:',$message)) {
567 
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
566 
+				elseif (preg_match(':^#A1:', $message)) {
567 
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode);
568 568 
 				}
569 
-				elseif (preg_match(':^#A3:',$message)) {
570 
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
569 
+				elseif (preg_match(':^#A3:', $message)) {
570 
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode);
571 571 
 				}
572 
-				elseif (preg_match(':^#A4:',$message)) {
573 
-					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
572 
+				elseif (preg_match(':^#A4:', $message)) {
573 
+					$decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode);
574 574 
 				}
575 
-				elseif (preg_match(':^#A6:',$message)) {
576 
-					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
575 
+				elseif (preg_match(':^#A6:', $message)) {
576 
+					$decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode);
577 577 
 				}
578 
-				elseif (preg_match(':^#A8:',$message)) {
579 
-					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
578 
+				elseif (preg_match(':^#A8:', $message)) {
579 
+					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode);
580 580 
 				}
581 
-				elseif (preg_match(':^#A9:',$message)) {
582 
-					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
581 
+				elseif (preg_match(':^#A9:', $message)) {
582 
+					$decode = array_merge(array('Message nature' => 'ATIS report'), $decode);
583 583 
 				}
584 
-				elseif (preg_match(':^#A0:',$message)) {
585 
-					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
584 
+				elseif (preg_match(':^#A0:', $message)) {
585 
+					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode);
586 586 
 				}
587 
-				elseif (preg_match(':^#AA:',$message)) {
588 
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
587 
+				elseif (preg_match(':^#AA:', $message)) {
588 
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
589 589 
 				}
590 
-				elseif (preg_match(':^#AB:',$message)) {
591 
-					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
590 
+				elseif (preg_match(':^#AB:', $message)) {
591 
+					$decode = array_merge(array('Message nature' => 'TWIP Report'), $decode);
592 592 
 				}
593 
-				elseif (preg_match(':^#AC:',$message)) {
594 
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
593 
+				elseif (preg_match(':^#AC:', $message)) {
594 
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode);
595 595 
 				}
596 
-				elseif (preg_match(':^#AD:',$message)) {
597 
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
596 
+				elseif (preg_match(':^#AD:', $message)) {
597 
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode);
598 598 
 				}
599 
-				elseif (preg_match(':^#AF:',$message)) {
600 
-					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
599 
+				elseif (preg_match(':^#AF:', $message)) {
600 
+					$decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode);
601 601 
 				}
602 
-				elseif (preg_match(':^#B1:',$message)) {
603 
-					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
602 
+				elseif (preg_match(':^#B1:', $message)) {
603 
+					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode);
604 604 
 				}
605 
-				elseif (preg_match(':^#B2:',$message)) {
606 
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
605 
+				elseif (preg_match(':^#B2:', $message)) {
606 
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode);
607 607 
 				}
608 
-				elseif (preg_match(':^#B3:',$message)) {
609 
-					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
608 
+				elseif (preg_match(':^#B3:', $message)) {
609 
+					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode);
610 610 
 				}
611 
-				elseif (preg_match(':^#B4:',$message)) {
612 
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
611 
+				elseif (preg_match(':^#B4:', $message)) {
612 
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode);
613 613 
 				}
614 
-				elseif (preg_match(':^#B6:',$message)) {
615 
-					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
614 
+				elseif (preg_match(':^#B6:', $message)) {
615 
+					$decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode);
616 616 
 				}
617 
-				elseif (preg_match(':^#B8:',$message)) {
618 
-					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
617 
+				elseif (preg_match(':^#B8:', $message)) {
618 
+					$decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode);
619 619 
 				}
620 
-				elseif (preg_match(':^#B9:',$message)) {
621 
-					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
620 
+				elseif (preg_match(':^#B9:', $message)) {
621 
+					$decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode);
622 622 
 				}
623 
-				elseif (preg_match(':^#B0:',$message)) {
624 
-					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
623 
+				elseif (preg_match(':^#B0:', $message)) {
624 
+					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode);
625 625 
 				}
626 
-				elseif (preg_match(':^#BA:',$message)) {
627 
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
626 
+				elseif (preg_match(':^#BA:', $message)) {
627 
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
628 628 
 				}
629 
-				elseif (preg_match(':^#BB:',$message)) {
630 
-					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
629 
+				elseif (preg_match(':^#BB:', $message)) {
630 
+					$decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode);
631 631 
 				}
632 
-				elseif (preg_match(':^#BC:',$message)) {
633 
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
632 
+				elseif (preg_match(':^#BC:', $message)) {
633 
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode);
634 634 
 				}
635 
-				elseif (preg_match(':^#BD:',$message)) {
636 
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
635 
+				elseif (preg_match(':^#BD:', $message)) {
636 
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode);
637 637 
 				}
638 
-				elseif (preg_match(':^#BE:',$message)) {
639 
-					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
638 
+				elseif (preg_match(':^#BE:', $message)) {
639 
+					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode);
640 640 
 				}
641 
-				elseif (preg_match(':^#BF:',$message)) {
642 
-					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
641 
+				elseif (preg_match(':^#BF:', $message)) {
642 
+					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode);
643 643 
 				}
644 
-				elseif (preg_match(':^#H3:',$message)) {
645 
-					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
644 
+				elseif (preg_match(':^#H3:', $message)) {
645 
+					$decode = array_merge(array('Message nature' => 'Icing Report'), $decode);
646 646 
 				}
647 647 
 			}
648 648 
 			if ($label == '10') {
649 
-				if (preg_match(':^DTO01:',$message)) {
650 
-					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
649 
+				if (preg_match(':^DTO01:', $message)) {
650 
+					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode);
651 651 
 				}
652 
-				elseif (preg_match(':^AIS01:',$message)) {
653 
-					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
652 
+				elseif (preg_match(':^AIS01:', $message)) {
653 
+					$decode = array_merge(array('Message nature' => 'AIS Request'), $decode);
654 654 
 				}
655 
-				elseif (preg_match(':^FTX01:',$message)) {
656 
-					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
655 
+				elseif (preg_match(':^FTX01:', $message)) {
656 
+					$decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode);
657 657 
 				}
658 
-				elseif (preg_match(':^FPL01:',$message)) {
659 
-					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
658 
+				elseif (preg_match(':^FPL01:', $message)) {
659 
+					$decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode);
660 660 
 				}
661 
-				elseif (preg_match(':^WAB01:',$message)) {
662 
-					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
661 
+				elseif (preg_match(':^WAB01:', $message)) {
662 
+					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode);
663 663 
 				}
664 
-				elseif (preg_match(':^MET01:',$message)) {
665 
-					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
664 
+				elseif (preg_match(':^MET01:', $message)) {
665 
+					$decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode);
666 666 
 				}
667 
-				elseif (preg_match(':^WAB02:',$message)) {
668 
-					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
667 
+				elseif (preg_match(':^WAB02:', $message)) {
668 
+					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode);
669 669 
 				}
670 670 
 			}
671 671 
 			if ($label == '15') {
672 
-				if (preg_match(':^FST01:',$message)) {
673 
-					$decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode);
672 
+				if (preg_match(':^FST01:', $message)) {
673 
+					$decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode);
674 674 
 				}
675 675 
 			}
676 676 
 			if (!$found && $label == 'SA') {
677 
-				$n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at);
677 
+				$n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at);
678 678 
 				if ($n == 4) {
679 679 
 					$vsta = array('Version' => $version);
680 680 
 					if ($state == 'E') {
681 
-						$vsta = array_merge($vsta,array('Link state' => 'Established'));
681 
+						$vsta = array_merge($vsta, array('Link state' => 'Established'));
682 682 
 					}
683 683 
 					elseif ($state == 'L') {
684 
-						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
684 
+						$vsta = array_merge($vsta, array('Link state' => 'Lost'));
685 685 
 					}
686 686 
 					else {
687 
-						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
687 
+						$vsta = array_merge($vsta, array('Link state' => 'Unknown'));
688 688 
 					}
689 689 
 					if ($type == 'V') {
690 
-						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
690 
+						$vsta = array_merge($vsta, array('Link type' => 'VHF ACARS'));
691 691 
 					}
692 692 
 					elseif ($type == 'S') {
693 
-						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
693 
+						$vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM'));
694 694 
 					}
695 695 
 					elseif ($type == 'H') {
696 
-						$vsta = array_merge($vsta,array('Link type' => 'HF'));
696 
+						$vsta = array_merge($vsta, array('Link type' => 'HF'));
697 697 
 					}
698 698 
 					elseif ($type == 'G') {
699 
-						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
699 
+						$vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM'));
700 700 
 					}
701 701 
 					elseif ($type == 'C') {
702 
-						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
702 
+						$vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM'));
703 703 
 					}
704 704 
 					elseif ($type == '2') {
705 
-						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
705 
+						$vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2'));
706 706 
 					}
707 707 
 					elseif ($type == 'X') {
708 
-						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
708 
+						$vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero'));
709 709 
 					}
710 710 
 					elseif ($type == 'I') {
711 
-						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
711 
+						$vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM'));
712 712 
 					}
713 713 
 					else {
714 
-						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
714 
+						$vsta = array_merge($vsta, array('Link type' => 'Unknown'));
715 715 
 					}
716 
-					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
717 
-					$decode = array_merge($vsta,$decode);
716 
+					$vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2))));
717 
+					$decode = array_merge($vsta, $decode);
718 718 
 				}
719 719 
 			}
720 720
721 721 
 			$title = $this->getTitlefromLabel($label);
722 
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
722 
+			if ($title != '') $decode = array_merge(array('Message title' => $title), $decode);
723 723 
 			/*
724 724 
 			// Business jets always use GS0001
725 725 
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
 
@@ -747,13 +747,13 @@  discard block
 
 block discarded – undo
747 747 
 		$Translation = new Translation($this->db);
748 748 
 		$message = $this->parse($data);
749 749 
 		if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') {
750 
-			$ident = (string)$message['ident'];
750 
+			$ident = (string) $message['ident'];
751 751 
 			$label = $message['label'];
752 752 
 			$block_id = $message['block_id'];
753 753 
 			$msg_no = $message['msg_no'];
754 754 
 			$msg = $message['message'];
755 755 
 			$decode = $message['decode'];
756 
-			$registration = (string)$message['registration'];
756 
+			$registration = (string) $message['registration'];
757 757 
 			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
758 758 
 			else $latitude = '';
759 759 
 			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
 
@@ -767,20 +767,20 @@  discard block
 
 block discarded – undo
767 767 
 				$Image->addSpotterImage($registration);
768 768 
 			}
769 769 
 			// Business jets always use GS0001
770 
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
770 
+			if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude);
771 771 
 			if ($globalDebug && isset($info) && $info != '') echo $info;
772 772 
 			if (count($decode) > 0) $decode_json = json_encode($decode);
773 773 
 			else $decode_json = '';
774 774 
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
775 
-				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
775 
+				$Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS');
776 776 
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
777 
-				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
777 
+				$Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS');
778 778 
 			}
779 
-			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
780 
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
781 
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
779 
+			$result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
780 
+			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F');
781 
+			if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
782 782 
 			if ($globalDebug && count($decode) > 0) {
783 
-				echo "Human readable data : ".implode(' - ',$decode)."\n";
783 
+				echo "Human readable data : ".implode(' - ', $decode)."\n";
784 784 
 			}
785 785 
 		}
786 786 
 	}
 
@@ -795,7 +795,7 @@  discard block
 
 block discarded – undo
795 795 
 	* @param String $msg_no Number of the ACARS message
796 796 
 	* @param String $message ACARS message
797 797 
 	*/
798 
-	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
798 
+	public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
799 799 
 		global $globalDebug;
800 800 
 		date_default_timezone_set('UTC');
801 801 
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
 
@@ -803,21 +803,21 @@  discard block
 
 block discarded – undo
803 803 
 			$this->db = $Connection->db;
804 804 
 			if ($globalDebug) echo "Test if not already in Live ACARS table...";
805 805 
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
806 
-			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
806 
+			$query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message);
807 807 
 			try {
808 808 
 				$stht = $this->db->prepare($query_test);
809 809 
 				$stht->execute($query_test_values);
810 
-			} catch(PDOException $e) {
810 
+			} catch (PDOException $e) {
811 811 
 				return "error : ".$e->getMessage();
812 812 
 			}
813 813 
 			if ($stht->fetchColumn() == 0) {
814 814 
 				if ($globalDebug) echo "Add Live ACARS data...";
815 815 
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
816 
-				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
816 
+				$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode, ':date' => date("Y-m-d H:i:s"));
817 817 
 				try {
818 818 
 					$sth = $this->db->prepare($query);
819 819 
 					$sth->execute($query_values);
820 
-				} catch(PDOException $e) {
820 
+				} catch (PDOException $e) {
821 821 
 					return "error : ".$e->getMessage();
822 822 
 				}
823 823 
 			} else {
 
@@ -839,10 +839,10 @@  discard block
 
 block discarded – undo
839 839 
 	* @param String $msg_no Number of the ACARS message
840 840 
 	* @param String $message ACARS message
841 841 
 	*/
842 
-	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
842 
+	public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
843 843 
 		global $globalDebug;
844 844 
 		date_default_timezone_set('UTC');
845 
-		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/',$message) === 0 && preg_match('/^ARR0/',$message) === 0 && preg_match('/^ETA/',$message) === 0 && preg_match('/^WXR/',$message) === 0 && preg_match('/^FTX01.FIC/',$message) === 0) {
845 
+		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/', $message) === 0 && preg_match('/^ARR0/', $message) === 0 && preg_match('/^ETA/', $message) === 0 && preg_match('/^WXR/', $message) === 0 && preg_match('/^FTX01.FIC/', $message) === 0) {
846 846 
 			/*
847 847 
 				    if ($globalDebug) echo "Test if not already in Archive ACARS table...";
848 848 
 			    	    $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message";
 
@@ -857,11 +857,11 @@  discard block
 
 block discarded – undo
857 857 
 			*/
858 858 
 			if ($globalDebug) echo "Add Live ACARS data...";
859 859 
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
860 
-			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
860 
+			$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
861 861 
 			try {
862 862 
 				$sth = $this->db->prepare($query);
863 863 
 				$sth->execute($query_values);
864 
-			} catch(PDOException $e) {
864 
+			} catch (PDOException $e) {
865 865 
 				return "error : ".$e->getMessage();
866 866 
 			}
867 867 
 			if ($globalDebug) echo "Done\n";
 
@@ -882,7 +882,7 @@  discard block
 
 block discarded – undo
882 882 
 		try {
883 883 
 			$sth = $this->db->prepare($query);
884 884 
 			$sth->execute($query_values);
885 
-		} catch(PDOException $e) {
885 
+		} catch (PDOException $e) {
886 886 
 			echo "error : ".$e->getMessage();
887 887 
 			return '';
888 888 
 		}
 
@@ -902,7 +902,7 @@  discard block
 
 block discarded – undo
902 902 
 		try {
903 903 
 			$sth = $this->db->prepare($query);
904 904 
 			$sth->execute($query_values);
905 
-		} catch(PDOException $e) {
905 
+		} catch (PDOException $e) {
906 906 
 			echo "error : ".$e->getMessage();
907 907 
 			return array();
908 908 
 		}
 
@@ -923,7 +923,7 @@  discard block
 
 block discarded – undo
923 923 
 		try {
924 924 
 			$sth = $this->db->prepare($query);
925 925 
 			$sth->execute($query_values);
926 
-		} catch(PDOException $e) {
926 
+		} catch (PDOException $e) {
927 927 
 			echo "error : ".$e->getMessage();
928 928 
 			return array();
929 929 
 		}
 
@@ -937,7 +937,7 @@  discard block
 
 block discarded – undo
937 937 
 	*
938 938 
 	* @return Array Return ACARS data in array
939 939 
 	*/
940 
-	public function getLatestAcarsData($limit = '',$label = '') {
940 
+	public function getLatestAcarsData($limit = '', $label = '') {
941 941 
 		global $globalURL, $globalDBdriver;
942 942 
 		$Image = new Image($this->db);
943 943 
 		$Spotter = new Spotter($this->db);
 
@@ -948,8 +948,8 @@  discard block
 
 block discarded – undo
948 948 
 		if ($limit != "")
949 949 
 		{
950 950 
 			$limit_array = explode(",", $limit);
951 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
952 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
951 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
952 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
953 953 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
954 954 
 			{
955 955 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
 
@@ -965,46 +965,46 @@  discard block
 
 block discarded – undo
965 965 
 		try {
966 966 
 			$sth = $this->db->prepare($query);
967 967 
 			$sth->execute($query_values);
968 
-		} catch(PDOException $e) {
968 
+		} catch (PDOException $e) {
969 969 
 			return "error : ".$e->getMessage();
970 970 
 		}
971 971 
 		$i = 0;
972 972 
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
973 973 
 			$data = array();
974 974 
 			if ($row['registration'] != '') {
975 
-				$row['registration'] = str_replace('.','',$row['registration']);
975 
+				$row['registration'] = str_replace('.', '', $row['registration']);
976 976 
 				$image_array = $Image->getSpotterImage($row['registration']);
977 
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
978 
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
979 
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
977 
+				if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
978 
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
979 
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
980 980 
 			if ($row['registration'] == '') $row['registration'] = 'NA';
981 981 
 			if ($row['ident'] == '') $row['ident'] = 'NA';
982 
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
982 
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
983 983 
 			if (isset($identicao[0])) {
984 
-				if (substr($row['ident'],0,2) == 'AF') {
985 
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
986 
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
987 
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
988 
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
984 
+				if (substr($row['ident'], 0, 2) == 'AF') {
985 
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
986 
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
987 
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
988 
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
989 989 
 			} else $icao = $row['ident'];
990 
-			$icao = $Translation->checkTranslation($icao,false);
991 
-			$decode = json_decode($row['decode'],true);
990 
+			$icao = $Translation->checkTranslation($icao, false);
991 
+			$decode = json_decode($row['decode'], true);
992 992 
 			$found = false;
993 
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
993 
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
994 994 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
995 995 
 				if (isset($airport_info[0]['icao'])) {
996 996 
 					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
997 997 
 					$found = true;
998 998 
 				}
999 999 
 			}
1000 
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1000 
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
1001 1001 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1002 1002 
 				if (isset($airport_info[0]['icao'])) {
1003 1003 
 					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1004 1004 
 					$found = true;
1005 1005 
 				}
1006 1006 
 			}
1007 
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
1007 
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
1008 1008 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
1009 1009 
 				if (isset($airport_info[0]['icao'])) {
1010 1010 
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 
@@ -1012,7 +1012,7 @@  discard block
 
 block discarded – undo
1012 1012 
 				}
1013 1013 
 			}
1014 1014 
 			if ($found) $row['decode'] = json_encode($decode);
1015 
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1015 
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1016 1016 
 			$result[] = $data;
1017 1017 
 			$i++;
1018 1018 
 		}
 
@@ -1028,7 +1028,7 @@  discard block
 
 block discarded – undo
1028 1028 
 	*
1029 1029 
 	* @return Array Return ACARS data in array
1030 1030 
 	*/
1031 
-	public function getArchiveAcarsData($limit = '',$label = '') {
1031 
+	public function getArchiveAcarsData($limit = '', $label = '') {
1032 1032 
 		global $globalURL, $globalDBdriver;
1033 1033 
 		$Image = new Image($this->db);
1034 1034 
 		$Spotter = new Spotter($this->db);
 
@@ -1038,8 +1038,8 @@  discard block
 
 block discarded – undo
1038 1038 
 		if ($limit != "")
1039 1039 
 		{
1040 1040 
 			$limit_array = explode(",", $limit);
1041 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1042 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1041 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1042 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1043 1043 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1044 1044 
 			{
1045 1045 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
 
@@ -1060,43 +1060,43 @@  discard block
 
 block discarded – undo
1060 1060 
 		try {
1061 1061 
 			$sth = $this->db->prepare($query);
1062 1062 
 			$sth->execute($query_values);
1063 
-		} catch(PDOException $e) {
1063 
+		} catch (PDOException $e) {
1064 1064 
 			return "error : ".$e->getMessage();
1065 1065 
 		}
1066 
-		$i=0;
1066 
+		$i = 0;
1067 1067 
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
1068 1068 
 			$data = array();
1069 1069 
 			if ($row['registration'] != '') {
1070 
-				$row['registration'] = str_replace('.','',$row['registration']);
1070 
+				$row['registration'] = str_replace('.', '', $row['registration']);
1071 1071 
 				$image_array = $Image->getSpotterImage($row['registration']);
1072 
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1073 
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1074 
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1072 
+				if (count($image_array) > 0) $data = array_merge($data, array('image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
1073 
+				else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1074 
+			} else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1075 1075 
 			$icao = '';
1076 1076 
 			if ($row['registration'] == '') $row['registration'] = 'NA';
1077 1077 
 			if ($row['ident'] == '') $row['ident'] = 'NA';
1078 
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1078 
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
1079 1079 
 			if (isset($identicao[0])) {
1080 
-				if (substr($row['ident'],0,2) == 'AF') {
1081 
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1082 
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1083 
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1084 
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1080 
+				if (substr($row['ident'], 0, 2) == 'AF') {
1081 
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1082 
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
1083 
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
1084 
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
1085 1085 
 			} else $icao = $row['ident'];
1086 1086 
 			$icao = $Translation->checkTranslation($icao);
1087 
-			$decode = json_decode($row['decode'],true);
1087 
+			$decode = json_decode($row['decode'], true);
1088 1088 
 			$found = false;
1089 
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1089 
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
1090 1090 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1091 1091 
 				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1092 1092 
 				$found = true;
1093 1093 
 			}
1094 
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1094 
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
1095 1095 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1096 1096 
 				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1097 1097 
 				$found = true;
1098 1098 
 			}
1099 
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
1099 
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
1100 1100 
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
1101 1101 
 				if (isset($airport_info[0]['icao'])) {
1102 1102 
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 
@@ -1104,7 +1104,7 @@  discard block
 
 block discarded – undo
1104 1104 
 				}
1105 1105 
 			}
1106 1106 
 			if ($found) $row['decode'] = json_encode($decode);
1107 
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1107 
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1108 1108 
 			$result[] = $data;
1109 1109 
 			$i++;
1110 1110 
 		}
 
@@ -1122,7 +1122,7 @@  discard block
 
 block discarded – undo
1122 1122 
 	* @param String $icao
1123 1123 
 	* @param String $ICAOTypeCode
1124 1124 
 	*/
1125 
-	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
1125 
+	public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') {
1126 1126 
 		global $globalDebug, $globalDBdriver;
1127 1127 
 		$ident = trim($ident);
1128 1128 
 		$Translation = new Translation($this->db);
 
@@ -1135,7 +1135,7 @@  discard block
 
 block discarded – undo
1135 1135 
 			if ($globalDebug) echo "Ident or registration null, exit\n";
1136 1136 
 			return '';
1137 1137 
 		}
1138 
-		$registration = str_replace('.','',$registration);
1138 
+		$registration = str_replace('.', '', $registration);
1139 1139 
 		$ident = $Translation->ident2icao($ident);
1140 1140 
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1141 1141 
 		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
 
@@ -1144,7 +1144,7 @@  discard block
 
 block discarded – undo
1144 1144 
 		try {
1145 1145 
 			$sthsi = $this->db->prepare($querysi);
1146 1146 
 			$sthsi->execute($querysi_values);
1147 
-		} catch(PDOException $e) {
1147 
+		} catch (PDOException $e) {
1148 1148 
 			if ($globalDebug) echo $e->getMessage();
1149 1149 
 			return "error : ".$e->getMessage();
1150 1150 
 		}
 
@@ -1154,8 +1154,8 @@  discard block
 
 block discarded – undo
1154 1154 
 			$Translation = new Translation($this->db);
1155 1155 
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1156 1156 
 			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1157 
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1158 
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1157 
+			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS');
1158 
+			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS');
1159 1159 
 		} else {
1160 1160 
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1161 1161 
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
 
@@ -1163,7 +1163,7 @@  discard block
 
 block discarded – undo
1163 1163 
 				try {
1164 1164 
 					$sth = $this->db->prepare($query);
1165 1165 
 					$sth->execute($query_values);
1166 
-				} catch(PDOException $e) {
1166 
+				} catch (PDOException $e) {
1167 1167 
 					if ($globalDebug) echo $e->getMessage();
1168 1168 
 					return "error : ".$e->getMessage();
1169 1169 
 				}
 
@@ -1171,7 +1171,7 @@  discard block
 
 block discarded – undo
1171 1171 
 				$sth->closeCursor();
1172 1172 
 				if (isset($result['modes'])) $hex = $result['modes'];
1173 1173 
 				else $hex = '';
1174 
-				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1174 
+				$SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS');
1175 1175 
 				if ($this->fromACARSscript) $this->SI->add($SI_data);
1176 1176 
 			}
1177 1177 
 		}
 
@@ -1181,7 +1181,7 @@  discard block
 
 block discarded – undo
1181 1181 
 		try {
1182 1182 
 			$sth = $this->db->prepare($query);
1183 1183 
 			$sth->execute($query_values);
1184 
-		} catch(PDOException $e) {
1184 
+		} catch (PDOException $e) {
1185 1185 
 			if ($globalDebug) echo $e->getMessage();
1186 1186 
 			return "error : ".$e->getMessage();
1187 1187 
 		}
 
@@ -1191,7 +1191,7 @@  discard block
 
 block discarded – undo
1191 1191 
 			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1192 1192 
 			else $ModeS = '';
1193 1193 
 			if ($ModeS == '') {
1194 
-				$id = explode('-',$result['flightaware_id']);
1194 
+				$id = explode('-', $result['flightaware_id']);
1195 1195 
 				$ModeS = $id[0];
1196 1196 
 			}
1197 1197 
 			if ($ModeS != '') {
 
@@ -1201,20 +1201,20 @@  discard block
 
 block discarded – undo
1201 1201 
 				try {
1202 1202 
 					$sthc = $this->db->prepare($queryc);
1203 1203 
 					$sthc->execute($queryc_values);
1204 
-				} catch(PDOException $e) {
1204 
+				} catch (PDOException $e) {
1205 1205 
 					if ($globalDebug) echo $e->getMessage();
1206 1206 
 					return "error : ".$e->getMessage();
1207 1207 
 				}
1208 1208 
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1209 1209 
 				$sthc->closeCursor();
1210 
-				if (count($row) ==  0) {
1210 
+				if (count($row) == 0) {
1211 1211 
 					if ($globalDebug) echo " Add to ModeS table - ";
1212 1212 
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1213 
-					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1213 
+					$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1214 1214 
 					try {
1215 1215 
 						$sthi = $this->db->prepare($queryi);
1216 1216 
 						$sthi->execute($queryi_values);
1217 
-					} catch(PDOException $e) {
1217 
+					} catch (PDOException $e) {
1218 1218 
 						if ($globalDebug) echo $e->getMessage();
1219 1219 
 						return "error : ".$e->getMessage();
1220 1220 
 					}
 
@@ -1222,15 +1222,15 @@  discard block
 
 block discarded – undo
1222 1222 
 					if ($globalDebug) echo " Update ModeS table - ";
1223 1223 
 					if ($ICAOTypeCode != '') {
1224 1224 
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1225 
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1225 
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1226 1226 
 					} else {
1227 1227 
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1228 
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration);
1228 
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration);
1229 1229 
 					}
1230 1230 
 					try {
1231 1231 
 						$sthi = $this->db->prepare($queryi);
1232 1232 
 						$sthi->execute($queryi_values);
1233 
-					} catch(PDOException $e) {
1233 
+					} catch (PDOException $e) {
1234 1234 
 						if ($globalDebug) echo $e->getMessage();
1235 1235 
 						return "error : ".$e->getMessage();
1236 1236 
 					}
 
@@ -1267,12 +1267,12 @@  discard block
 
 block discarded – undo
1267 1267 
 					elseif ($globalDBdriver == 'pgsql') {
1268 1268 
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1269 1269 
 					}
1270 
-					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
1270 
+					$queryi_values = array(':Registration' => $registration, ':ident' => $icao);
1271 1271 
 				}
1272 1272 
 				try {
1273 1273 
 					$sthi = $this->db->prepare($queryi);
1274 1274 
 					$sthi->execute($queryi_values);
1275 
-				} catch(PDOException $e) {
1275 
+				} catch (PDOException $e) {
1276 1276 
 					if ($globalDebug) echo $e->getMessage();
1277 1277 
 					return "error : ".$e->getMessage();
1278 1278 
 				}
Please login to merge, or discard this patch.
sitemap.php 3 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -21,9 +21,9 @@  discard block
 
 block discarded – undo
21 21 
 		foreach($spotter_array as $spotter_item)
22 22 
 		{
23 23 
 			$output .= '<url>';
24 
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
25 
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
26 
-			    $output .= '<changefreq>weekly</changefreq>';
24 
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
25 
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
26 
+				$output .= '<changefreq>weekly</changefreq>';
27 27 
 			$output .= '</url>';
28 28 
 		}
29 29 
 	$output .= '</urlset>';
 
@@ -38,9 +38,9 @@  discard block
 
 block discarded – undo
38 38 
 		foreach($aircraft_types as $aircraft_item)
39 39 
 		{
40 40 
 			$output .= '<url>';
41 
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>';
42 
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
43 
-			    $output .= '<changefreq>daily</changefreq>';
41 
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>';
42 
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
43 
+				$output .= '<changefreq>daily</changefreq>';
44 44 
 			$output .= '</url>';
45 45 
 		}
46 46 
 	$output .= '</urlset>';
 
@@ -55,9 +55,9 @@  discard block
 
 block discarded – undo
55 55 
 		foreach($aircraft_registrations as $aircraft_item)
56 56 
 		{
57 57 
 			$output .= '<url>';
58 
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>';
59 
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
60 
-			    $output .= '<changefreq>daily</changefreq>';
58 
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>';
59 
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
60 
+				$output .= '<changefreq>daily</changefreq>';
61 61 
 			$output .= '</url>';
62 62 
 		}
63 63 
 	$output .= '</urlset>';
 
@@ -71,9 +71,9 @@  discard block
 
 block discarded – undo
71 71 
 		foreach($airline_names as $airline_item)
72 72 
 		{
73 73 
 			$output .= '<url>';
74 
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>';
75 
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
76 
-			    $output .= '<changefreq>daily</changefreq>';
74 
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>';
75 
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
76 
+				$output .= '<changefreq>daily</changefreq>';
77 77 
 			$output .= '</url>';
78 78 
 		}
79 79 
 	$output .= '</urlset>';
 
@@ -88,9 +88,9 @@  discard block
 
 block discarded – undo
88 88 
 		foreach($airport_names as $airport_item)
89 89 
 		{
90 90 
 			$output .= '<url>';
91 
-			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
92 
-			    $output .= '<lastmod>'.date("c", time()).'</lastmod>';
93 
-			    $output .= '<changefreq>daily</changefreq>';
91 
+				$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
92 
+				$output .= '<lastmod>'.date("c", time()).'</lastmod>';
93 
+				$output .= '<changefreq>daily</changefreq>';
94 94 
 			$output .= '</url>';
95 95 
 		}
96 96 
 	$output .= '</urlset>';
Please login to merge, or discard this patch.
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -34,7 +34,9 @@  discard block
 
 block discarded – undo
34 34 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
35 35 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
36 36 
 		$aircraft_types = $Stats->getAllAircraftTypes();
37 
-		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
37 
+		if (empty($aircraft_types)) {
38 
+			$aircraft_types = $Spotter->getAllAircraftTypes();
39 
+		}
38 40 
 		foreach($aircraft_types as $aircraft_item)
39 41 
 		{
40 42 
 			$output .= '<url>';
 
@@ -84,7 +86,9 @@  discard block
 
 block discarded – undo
84 86 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
85 87
86 88 
 		$airport_names = $Stats->getAllAirportNames();
87 
-		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
89 
+		if (empty($airport_names)) {
90 
+			$airport_names = $Spotter->getAllAirportNames();
91 
+		}
88 92 
 		foreach($airport_names as $airport_item)
89 93 
 		{
90 94 
 			$output .= '<url>';
 
@@ -99,7 +103,9 @@  discard block
 
 block discarded – undo
99 103 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
100 104 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
101 105 
 	$manufacturer_names = $Stats->getAllManufacturers();
102 
-	if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers();
106 
+	if (empty($manufacturer_names)) {
107 
+		$manufacturer_names = $Spotter->getAllManufacturers();
108 
+	}
103 109 
 	foreach($manufacturer_names as $manufacturer_item)
104 110 
 	{
105 111 
 		$output .= '<url>';
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -18,7 +18,7 @@  discard block
 
 block discarded – undo
18 18 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
19 19
20 20 
 		$spotter_array = $Spotter->getAllFlightsforSitemap();
21 
-		foreach($spotter_array as $spotter_item)
21 
+		foreach ($spotter_array as $spotter_item)
22 22 
 		{
23 23 
 			$output .= '<url>';
24 24 
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
 
@@ -29,13 +29,13 @@  discard block
 
 block discarded – undo
29 29 
 	$output .= '</urlset>';
30 30
31 31
32 
-} else if (isset($_GET['type']) && $_GET['type'] == "aircraft"){
32 
+} else if (isset($_GET['type']) && $_GET['type'] == "aircraft") {
33 33
34 34 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
35 35 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
36 36 
 		$aircraft_types = $Stats->getAllAircraftTypes();
37 37 
 		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
38 
-		foreach($aircraft_types as $aircraft_item)
38 
+		foreach ($aircraft_types as $aircraft_item)
39 39 
 		{
40 40 
 			$output .= '<url>';
41 41 
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>';
 
@@ -46,13 +46,13 @@  discard block
 
 block discarded – undo
46 46 
 	$output .= '</urlset>';
47 47
48 48
49 
-} else if (isset($_GET['type']) && $_GET['type'] == "registration"){
49 
+} else if (isset($_GET['type']) && $_GET['type'] == "registration") {
50 50
51 51 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
52 52 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
53 53
54 54 
 		$aircraft_registrations = $Spotter->getAllAircraftRegistrations();
55 
-		foreach($aircraft_registrations as $aircraft_item)
55 
+		foreach ($aircraft_registrations as $aircraft_item)
56 56 
 		{
57 57 
 			$output .= '<url>';
58 58 
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>';
 
@@ -62,13 +62,13 @@  discard block
 
 block discarded – undo
62 62 
 		}
63 63 
 	$output .= '</urlset>';
64 64
65 
-} else if (isset($_GET['type']) && $_GET['type'] == "airline"){
65 
+} else if (isset($_GET['type']) && $_GET['type'] == "airline") {
66 66
67 67 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
68 68 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
69 69
70 70 
 		$airline_names = $Stats->getAllAirlineNames();
71 
-		foreach($airline_names as $airline_item)
71 
+		foreach ($airline_names as $airline_item)
72 72 
 		{
73 73 
 			$output .= '<url>';
74 74 
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>';
 
@@ -78,14 +78,14 @@  discard block
 
 block discarded – undo
78 78 
 		}
79 79 
 	$output .= '</urlset>';
80 80
81 
-} else if (isset($_GET['type']) && $_GET['type'] == "airport"){
81 
+} else if (isset($_GET['type']) && $_GET['type'] == "airport") {
82 82
83 83 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
84 84 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
85 85
86 86 
 		$airport_names = $Stats->getAllAirportNames();
87 87 
 		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
88 
-		foreach($airport_names as $airport_item)
88 
+		foreach ($airport_names as $airport_item)
89 89 
 		{
90 90 
 			$output .= '<url>';
91 91 
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
 
@@ -95,12 +95,12 @@  discard block
 
 block discarded – undo
95 95 
 		}
96 96 
 	$output .= '</urlset>';
97 97
98 
-} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer"){
98 
+} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer") {
99 99 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
100 100 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
101 101 
 	$manufacturer_names = $Stats->getAllManufacturers();
102 102 
 	if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers();
103 
-	foreach($manufacturer_names as $manufacturer_item)
103 
+	foreach ($manufacturer_names as $manufacturer_item)
104 104 
 	{
105 105 
 		$output .= '<url>';
106 106 
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>';
 
@@ -109,11 +109,11 @@  discard block
 
 block discarded – undo
109 109 
 		$output .= '</url>';
110 110 
 	}
111 111 
 	$output .= '</urlset>';
112 
-} else if (isset($_GET['type']) && $_GET['type'] == "country"){
112 
+} else if (isset($_GET['type']) && $_GET['type'] == "country") {
113 113 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
114 114 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
115 115 
 	$country_names = $Spotter->getAllCountries();
116 
-	foreach($country_names as $country_item)
116 
+	foreach ($country_names as $country_item)
117 117 
 	{
118 118 
 		$output .= '<url>';
119 119 
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>';
 
@@ -122,11 +122,11 @@  discard block
 
 block discarded – undo
122 122 
 		$output .= '</url>';
123 123 
 	}
124 124 
 	$output .= '</urlset>';
125 
-} else if (isset($_GET['type']) && $_GET['type'] == "ident"){
125 
+} else if (isset($_GET['type']) && $_GET['type'] == "ident") {
126 126 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
127 127 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
128 128 
 	$ident_names = $Spotter->getAllIdents();
129 
-	foreach($ident_names as $ident_item)
129 
+	foreach ($ident_names as $ident_item)
130 130 
 	{
131 131 
 		if (ctype_alnum($ident_item['ident'])) {
132 132 
 			$output .= '<url>';
 
@@ -137,11 +137,11 @@  discard block
 
 block discarded – undo
137 137 
 		}
138 138 
 	}
139 139 
 	$output .= '</urlset>';
140 
-} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident"){
140 
+} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident") {
141 141 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
142 142 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
143 143 
 	$ident_names = $Marine->getAllIdents();
144 
-	foreach($ident_names as $ident_item)
144 
+	foreach ($ident_names as $ident_item)
145 145 
 	{
146 146 
 		if (ctype_alnum($ident_item['ident'])) {
147 147 
 			$output .= '<url>';
 
@@ -152,11 +152,11 @@  discard block
 
 block discarded – undo
152 152 
 		}
153 153 
 	}
154 154 
 	$output .= '</urlset>';
155 
-} else if (isset($_GET['type']) && $_GET['type'] == "date"){
155 
+} else if (isset($_GET['type']) && $_GET['type'] == "date") {
156 156 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
157 157 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
158 158 
 	$date_names = $Spotter->getAllDates();
159 
-	foreach($date_names as $date_item)
159 
+	foreach ($date_names as $date_item)
160 160 
 	{
161 161 
 		$output .= '<url>';
162 162 
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
 
@@ -165,11 +165,11 @@  discard block
 
 block discarded – undo
165 165 
 		$output .= '</url>';
166 166 
 	}
167 167 
 	$output .= '</urlset>';
168 
-} else if (isset($_GET['type']) && $_GET['type'] == "marine-date"){
168 
+} else if (isset($_GET['type']) && $_GET['type'] == "marine-date") {
169 169 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
170 170 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
171 171 
 	$date_names = $Marine->getAllDates();
172 
-	foreach($date_names as $date_item)
172 
+	foreach ($date_names as $date_item)
173 173 
 	{
174 174 
 		$output .= '<url>';
175 175 
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/marine/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
 
@@ -178,11 +178,11 @@  discard block
 
 block discarded – undo
178 178 
 		$output .= '</url>';
179 179 
 	}
180 180 
 	$output .= '</urlset>';
181 
-} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date"){
181 
+} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date") {
182 182 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
183 183 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
184 184 
 	$date_names = $Tracker->getAllDates();
185 
-	foreach($date_names as $date_item)
185 
+	foreach ($date_names as $date_item)
186 186 
 	{
187 187 
 		$output .= '<url>';
188 188 
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/tracker/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
 
@@ -191,11 +191,11 @@  discard block
 
 block discarded – undo
191 191 
 		$output .= '</url>';
192 192 
 	}
193 193 
 	$output .= '</urlset>';
194 
-} else if (isset($_GET['type']) && $_GET['type'] == "route"){
194 
+} else if (isset($_GET['type']) && $_GET['type'] == "route") {
195 195 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
196 196 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
197 197 
 	$route_names = $Spotter->getAllRoutes();
198 
-	foreach($route_names as $route_item)
198 
+	foreach ($route_names as $route_item)
199 199 
 	{
200 200 
 		$output .= '<url>';
201 201 
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>';
 
@@ -204,7 +204,7 @@  discard block
 
 block discarded – undo
204 204 
 		$output .= '</url>';
205 205 
 	}
206 206 
 	$output .= '</urlset>';
207 
-} else if (isset($_GET['type']) && $_GET['type'] == "static"){
207 
+} else if (isset($_GET['type']) && $_GET['type'] == "static") {
208 208 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
209 209 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
210 210 
 	/* STATIC PAGES */
 
@@ -322,7 +322,7 @@  discard block
 
 block discarded – undo
322 322 
 	$output .= '<changefreq>daily</changefreq>';
323 323 
 	$output .= '</url>';
324 324 
 	$output .= '</urlset>';
325 
-} else if (isset($_GET['type']) && $_GET['type'] == "marine-static"){
325 
+} else if (isset($_GET['type']) && $_GET['type'] == "marine-static") {
326 326 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
327 327 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
328 328 
 	/* STATIC PAGES */
 
@@ -348,7 +348,7 @@  discard block
 
 block discarded – undo
348 348 
 	$output .= '<changefreq>daily</changefreq>';
349 349 
 	$output .= '</url>';
350 350 
 	$output .= '</urlset>';
351 
-} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static"){
351 
+} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static") {
352 352 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
353 353 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
354 354 
 	/* STATIC PAGES */
Please login to merge, or discard this patch.
require/class.Marine.php 4 patches
Doc Comments   +3 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -14,7 +14,7 @@  discard block
 
 block discarded – undo
14 14 
 	/**
15 15 
 	* Get SQL query part for filter used
16 16 
 	* @param Array $filter the filter
17 
-	* @return Array the SQL part
17 
+	* @return string the SQL part
18 18 
 	*/
19 19
20 20 
 	public function getFilter($filter = array(),$where = false,$and = false) {
 
@@ -584,25 +584,6 @@  discard block
 
 block discarded – undo
584 584 
 	*
585 585 
 	* @param String $fammarine_id the ID
586 586 
 	* @param String $ident the marine ident
587 
-	* @param String $departure_airport_icao the departure airport
588 
-	* @param String $arrival_airport_icao the arrival airport
589 
-	* @param String $latitude latitude of flight
590 
-	* @param String $longitude latitude of flight
591 
-	* @param String $waypoints waypoints of flight
592 
-	* @param String $heading heading of flight
593 
-	* @param String $groundspeed speed of flight
594 
-	* @param String $date date of flight
595 
-	* @param String $departure_airport_time departure time of flight
596 
-	* @param String $arrival_airport_time arrival time of flight
597 
-	* @param String $squawk squawk code of flight
598 
-	* @param String $route_stop route stop of flight
599 
-	* @param String $highlight highlight or not
600 
-	* @param String $ModeS ModesS code of flight
601 
-	* @param String $registration registration code of flight
602 
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
603 
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
604 
-	* @param String $verticalrate vertival rate of flight
605 
-	* @return String success or false
606 587 
 	*/
607 588 
 	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '')
608 589 
 	{
 
@@ -1195,6 +1176,7 @@  discard block
 
 block discarded – undo
1195 1176 
 	/**
1196 1177 
 	* Counts all hours
1197 1178 
 	*
1179 
+	* @param string $orderby
1198 1180 
 	* @return Array the hour list
1199 1181 
 	*
1200 1182 
 	*/
 
@@ -1546,7 +1528,7 @@  discard block
 
 block discarded – undo
1546 1528 
 	/**
1547 1529 
 	* Parses the direction degrees to working
1548 1530 
 	*
1549 
-	* @param Float $direction the direction in degrees
1531 
+	* @param integer $direction the direction in degrees
1550 1532 
 	* @return Array the direction information
1551 1533 
 	*
1552 1534 
 	*/
Please login to merge, or discard this patch.
Indentation   +227 added lines, -227 removed lines patch added patch discarded remove patch 
@@ -12,10 +12,10 @@  discard block
 
 block discarded – undo
12 12 
 	}
13 13
14 14 
 	/**
15 
-	* Get SQL query part for filter used
16 
-	* @param Array $filter the filter
17 
-	* @return Array the SQL part
18 
-	*/
15 
+	 * Get SQL query part for filter used
16 
+	 * @param Array $filter the filter
17 
+	 * @return Array the SQL part
18 
+	 */
19 19
20 20 
 	public function getFilter($filter = array(),$where = false,$and = false) {
21 21 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 
@@ -82,14 +82,14 @@  discard block
 
 block discarded – undo
82 82 
 	}
83 83
84 84 
 	/**
85 
-	* Executes the SQL statements to get the spotter information
86 
-	*
87 
-	* @param String $query the SQL query
88 
-	* @param Array $params parameter of the query
89 
-	* @param String $limitQuery the limit query
90 
-	* @return Array the spotter information
91 
-	*
92 
-	*/
85 
+	 * Executes the SQL statements to get the spotter information
86 
+	 *
87 
+	 * @param String $query the SQL query
88 
+	 * @param Array $params parameter of the query
89 
+	 * @param String $limitQuery the limit query
90 
+	 * @return Array the spotter information
91 
+	 *
92 
+	 */
93 93 
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
94 94 
 	{
95 95 
 		date_default_timezone_set('UTC');
 
@@ -220,11 +220,11 @@  discard block
 
 block discarded – undo
220 220
221 221
222 222 
 	/**
223 
-	* Gets all the spotter information based on the latest data entry
224 
-	*
225 
-	* @return Array the spotter information
226 
-	*
227 
-	*/
223 
+	 * Gets all the spotter information based on the latest data entry
224 
+	 *
225 
+	 * @return Array the spotter information
226 
+	 *
227 
+	 */
228 228 
 	public function getLatestMarineData($limit = '', $sort = '', $filter = array())
229 229 
 	{
230 230 
 		global $global_query;
 
@@ -273,11 +273,11 @@  discard block
 
 block discarded – undo
273 273 
 	}
274 274
275 275 
 	/**
276 
-	* Gets all the spotter information based on the callsign
277 
-	*
278 
-	* @return Array the spotter information
279 
-	*
280 
-	*/
276 
+	 * Gets all the spotter information based on the callsign
277 
+	 *
278 
+	 * @return Array the spotter information
279 
+	 *
280 
+	 */
281 281 
 	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
282 282 
 	{
283 283 
 		global $global_query;
 
@@ -329,11 +329,11 @@  discard block
 
 block discarded – undo
329 329 
 	}
330 330
331 331 
 	/**
332 
-	* Gets all the marine information based on the type
333 
-	*
334 
-	* @return Array the marine information
335 
-	*
336 
-	*/
332 
+	 * Gets all the marine information based on the type
333 
+	 *
334 
+	 * @return Array the marine information
335 
+	 *
336 
+	 */
337 337 
 	public function getMarineDataByType($type = '', $limit = '', $sort = '', $filter = array())
338 338 
 	{
339 339 
 		global $global_query;
 
@@ -441,12 +441,12 @@  discard block
 
 block discarded – undo
441 441
442 442
443 443 
 	/**
444 
-	* Gets all source name
445 
-	*
446 
-	* @param String type format of source
447 
-	* @return Array list of source name
448 
-	*
449 
-	*/
444 
+	 * Gets all source name
445 
+	 *
446 
+	 * @param String type format of source
447 
+	 * @return Array list of source name
448 
+	 *
449 
+	 */
450 450 
 	public function getAllSourceName($type = '',$filters = array())
451 451 
 	{
452 452 
 		$filter_query = $this->getFilter($filters,true,true);
 
@@ -476,11 +476,11 @@  discard block
 
 block discarded – undo
476 476
477 477
478 478 
 	/**
479 
-	* Gets a list of all idents/callsigns
480 
-	*
481 
-	* @return Array list of ident/callsign names
482 
-	*
483 
-	*/
479 
+	 * Gets a list of all idents/callsigns
480 
+	 *
481 
+	 * @return Array list of ident/callsign names
482 
+	 *
483 
+	 */
484 484 
 	public function getAllIdents($filters = array())
485 485 
 	{
486 486 
 		$filter_query = $this->getFilter($filters,true,true);
 
@@ -504,11 +504,11 @@  discard block
 
 block discarded – undo
504 504 
 	}
505 505
506 506 
 	/**
507 
-	* Gets all info from a mmsi
508 
-	*
509 
-	* @return Array ident
510 
-	*
511 
-	*/
507 
+	 * Gets all info from a mmsi
508 
+	 *
509 
+	 * @return Array ident
510 
+	 *
511 
+	 */
512 512 
 	public function getIdentity($mmsi)
513 513 
 	{
514 514 
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
 
@@ -521,9 +521,9 @@  discard block
 
 block discarded – undo
521 521 
 	}
522 522
523 523 
 	/**
524 
-	* Add identity
525 
-	*
526 
-	*/
524 
+	 * Add identity
525 
+	 *
526 
+	 */
527 527 
 	public function addIdentity($mmsi,$imo,$ident,$callsign,$type)
528 528 
 	{
529 529 
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
 
@@ -589,13 +589,13 @@  discard block
 
 block discarded – undo
589 589 
 	}
590 590
591 591 
 	/**
592 
-	* Update ident tracker data
593 
-	*
594 
-	* @param String $fammarine_id the ID
595 
-	* @param String $ident the marine ident
596 
-	* @return String success or false
597 
-	*
598 
-	*/
592 
+	 * Update ident tracker data
593 
+	 *
594 
+	 * @param String $fammarine_id the ID
595 
+	 * @param String $ident the marine ident
596 
+	 * @return String success or false
597 
+	 *
598 
+	 */
599 599 
 	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
600 600 
 	{
601 601 
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
 
@@ -610,13 +610,13 @@  discard block
 
 block discarded – undo
610 610 
 	}
611 611
612 612 
 	/**
613 
-	* Update arrival marine data
614 
-	*
615 
-	* @param String $fammarine_id the ID
616 
-	* @param String $arrival_code the marine ident
617 
-	* @return String success or false
618 
-	*
619 
-	*/
613 
+	 * Update arrival marine data
614 
+	 *
615 
+	 * @param String $fammarine_id the ID
616 
+	 * @param String $arrival_code the marine ident
617 
+	 * @return String success or false
618 
+	 *
619 
+	 */
620 620 
 	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL)
621 621 
 	{
622 622 
 		$query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id';
 
@@ -631,19 +631,19 @@  discard block
 
 block discarded – undo
631 631 
 	}
632 632
633 633 
 	/**
634 
-	* Update Status data
635 
-	*
636 
-	* @param String $fammarine_id the ID
637 
-	* @param String $status_id the marine status id
638 
-	* @param String $status the marine status
639 
-	* @return String success or false
640 
-	*
641 
-	*/
634 
+	 * Update Status data
635 
+	 *
636 
+	 * @param String $fammarine_id the ID
637 
+	 * @param String $status_id the marine status id
638 
+	 * @param String $status the marine status
639 
+	 * @return String success or false
640 
+	 *
641 
+	 */
642 642 
 	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
643 643 
 	{
644 644
645 645 
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
646 
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
646 
+				$query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
647 647
648 648 
 		try {
649 649 
 			$sth = $this->db->prepare($query);
 
@@ -656,17 +656,17 @@  discard block
 
 block discarded – undo
656 656
657 657 
 	}
658 658 
 	/**
659 
-	* Update latest marine data
660 
-	*
661 
-	* @param String $fammarine_id the ID
662 
-	* @param String $ident the marine ident
663 
-	* @return String success or false
664 
-	*
665 
-	*/
659 
+	 * Update latest marine data
660 
+	 *
661 
+	 * @param String $fammarine_id the ID
662 
+	 * @param String $ident the marine ident
663 
+	 * @return String success or false
664 
+	 *
665 
+	 */
666 666 
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '')
667 667 
 	{
668 668 
 		$query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id';
669 
-                $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
669 
+				$query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
670 670
671 671 
 		try {
672 672 
 			$sth = $this->db->prepare($query);
 
@@ -680,30 +680,30 @@  discard block
 
 block discarded – undo
680 680 
 	}
681 681
682 682 
 	/**
683 
-	* Adds a new spotter data
684 
-	*
685 
-	* @param String $fammarine_id the ID
686 
-	* @param String $ident the marine ident
687 
-	* @param String $departure_airport_icao the departure airport
688 
-	* @param String $arrival_airport_icao the arrival airport
689 
-	* @param String $latitude latitude of flight
690 
-	* @param String $longitude latitude of flight
691 
-	* @param String $waypoints waypoints of flight
692 
-	* @param String $heading heading of flight
693 
-	* @param String $groundspeed speed of flight
694 
-	* @param String $date date of flight
695 
-	* @param String $departure_airport_time departure time of flight
696 
-	* @param String $arrival_airport_time arrival time of flight
697 
-	* @param String $squawk squawk code of flight
698 
-	* @param String $route_stop route stop of flight
699 
-	* @param String $highlight highlight or not
700 
-	* @param String $ModeS ModesS code of flight
701 
-	* @param String $registration registration code of flight
702 
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
703 
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
704 
-	* @param String $verticalrate vertival rate of flight
705 
-	* @return String success or false
706 
-	*/
683 
+	 * Adds a new spotter data
684 
+	 *
685 
+	 * @param String $fammarine_id the ID
686 
+	 * @param String $ident the marine ident
687 
+	 * @param String $departure_airport_icao the departure airport
688 
+	 * @param String $arrival_airport_icao the arrival airport
689 
+	 * @param String $latitude latitude of flight
690 
+	 * @param String $longitude latitude of flight
691 
+	 * @param String $waypoints waypoints of flight
692 
+	 * @param String $heading heading of flight
693 
+	 * @param String $groundspeed speed of flight
694 
+	 * @param String $date date of flight
695 
+	 * @param String $departure_airport_time departure time of flight
696 
+	 * @param String $arrival_airport_time arrival time of flight
697 
+	 * @param String $squawk squawk code of flight
698 
+	 * @param String $route_stop route stop of flight
699 
+	 * @param String $highlight highlight or not
700 
+	 * @param String $ModeS ModesS code of flight
701 
+	 * @param String $registration registration code of flight
702 
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
703 
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
704 
+	 * @param String $verticalrate vertival rate of flight
705 
+	 * @return String success or false
706 
+	 */
707 707 
 	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '')
708 708 
 	{
709 709 
 		global $globalURL, $globalMarineImageFetch;
 
@@ -818,7 +818,7 @@  discard block
 
 block discarded – undo
818 818 
 			$sth->execute($query_values);
819 819 
 			$this->db = null;
820 820 
 		} catch (PDOException $e) {
821 
-		    return "error : ".$e->getMessage();
821 
+			return "error : ".$e->getMessage();
822 822 
 		}
823 823
824 824 
 		return "success";
 
@@ -827,11 +827,11 @@  discard block
 
 block discarded – undo
827 827
828 828
829 829 
 	/**
830 
-	* Gets the aircraft ident within the last hour
831 
-	*
832 
-	* @return String the ident
833 
-	*
834 
-	*/
830 
+	 * Gets the aircraft ident within the last hour
831 
+	 *
832 
+	 * @return String the ident
833 
+	 *
834 
+	 */
835 835 
 	public function getIdentFromLastHour($ident)
836 836 
 	{
837 837 
 		global $globalDBdriver, $globalTimezone;
 
@@ -847,11 +847,11 @@  discard block
 
 block discarded – undo
847 847 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
848 848 
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
849 849 
 			$query_data = array(':ident' => $ident);
850 
-    		}
850 
+			}
851 851
852 852 
 		$sth = $this->db->prepare($query);
853 853 
 		$sth->execute($query_data);
854 
-    		$ident_result='';
854 
+			$ident_result='';
855 855 
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
856 856 
 		{
857 857 
 			$ident_result = $row['ident'];
 
@@ -862,11 +862,11 @@  discard block
 
 block discarded – undo
862 862
863 863
864 864 
 	/**
865 
-	* Gets the aircraft data from the last 20 seconds
866 
-	*
867 
-	* @return Array the spotter data
868 
-	*
869 
-	*/
865 
+	 * Gets the aircraft data from the last 20 seconds
866 
+	 *
867 
+	 * @return Array the spotter data
868 
+	 *
869 
+	 */
870 870 
 	public function getRealTimeData($q = '')
871 871 
 	{
872 872 
 		global $globalDBdriver;
 
@@ -904,11 +904,11 @@  discard block
 
 block discarded – undo
904 904
905 905
906 906 
 	/**
907 
-	* Gets all number of flight over countries
908 
-	*
909 
-	* @return Array the airline country list
910 
-	*
911 
-	*/
907 
+	 * Gets all number of flight over countries
908 
+	 *
909 
+	 * @return Array the airline country list
910 
+	 *
911 
+	 */
912 912
913 913 
 	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
914 914 
 	{
 
@@ -981,11 +981,11 @@  discard block
 
 block discarded – undo
981 981
982 982
983 983 
 	/**
984 
-	* Gets all callsigns that have flown over
985 
-	*
986 
-	* @return Array the callsign list
987 
-	*
988 
-	*/
984 
+	 * Gets all callsigns that have flown over
985 
+	 *
986 
+	 * @return Array the callsign list
987 
+	 *
988 
+	 */
989 989 
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
990 990 
 	{
991 991 
 		global $globalDBdriver;
 
@@ -1052,11 +1052,11 @@  discard block
 
 block discarded – undo
1052 1052
1053 1053
1054 1054 
 	/**
1055 
-	* Counts all dates
1056 
-	*
1057 
-	* @return Array the date list
1058 
-	*
1059 
-	*/
1055 
+	 * Counts all dates
1056 
+	 *
1057 
+	 * @return Array the date list
1058 
+	 *
1059 
+	 */
1060 1060 
 	public function countAllDates($filters = array())
1061 1061 
 	{
1062 1062 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1102,11 +1102,11 @@  discard block
 
 block discarded – undo
1102 1102
1103 1103
1104 1104 
 	/**
1105 
-	* Counts all dates during the last 7 days
1106 
-	*
1107 
-	* @return Array the date list
1108 
-	*
1109 
-	*/
1105 
+	 * Counts all dates during the last 7 days
1106 
+	 *
1107 
+	 * @return Array the date list
1108 
+	 *
1109 
+	 */
1110 1110 
 	public function countAllDatesLast7Days($filters = array())
1111 1111 
 	{
1112 1112 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1128,7 +1128,7 @@  discard block
 
 block discarded – undo
1128 1128 
 			$query .= " GROUP BY date_name
1129 1129 
 								ORDER BY date_name ASC";
1130 1130 
 			$query_data = array(':offset' => $offset);
1131 
-    		}
1131 
+			}
1132 1132
1133 1133 
 		$sth = $this->db->prepare($query);
1134 1134 
 		$sth->execute($query_data);
 
@@ -1148,11 +1148,11 @@  discard block
 
 block discarded – undo
1148 1148 
 	}
1149 1149
1150 1150 
 	/**
1151 
-	* Counts all dates during the last month
1152 
-	*
1153 
-	* @return Array the date list
1154 
-	*
1155 
-	*/
1151 
+	 * Counts all dates during the last month
1152 
+	 *
1153 
+	 * @return Array the date list
1154 
+	 *
1155 
+	 */
1156 1156 
 	public function countAllDatesLastMonth($filters = array())
1157 1157 
 	{
1158 1158 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1174,7 +1174,7 @@  discard block
 
 block discarded – undo
1174 1174 
 			$query .= " GROUP BY date_name
1175 1175 
 								ORDER BY date_name ASC";
1176 1176 
 			$query_data = array(':offset' => $offset);
1177 
-    		}
1177 
+			}
1178 1178
1179 1179 
 		$sth = $this->db->prepare($query);
1180 1180 
 		$sth->execute($query_data);
 
@@ -1196,11 +1196,11 @@  discard block
 
 block discarded – undo
1196 1196
1197 1197
1198 1198 
 	/**
1199 
-	* Counts all month
1200 
-	*
1201 
-	* @return Array the month list
1202 
-	*
1203 
-	*/
1199 
+	 * Counts all month
1200 
+	 *
1201 
+	 * @return Array the month list
1202 
+	 *
1203 
+	 */
1204 1204 
 	public function countAllMonths($filters = array())
1205 1205 
 	{
1206 1206 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1245,11 +1245,11 @@  discard block
 
 block discarded – undo
1245 1245
1246 1246
1247 1247 
 	/**
1248 
-	* Counts all dates during the last year
1249 
-	*
1250 
-	* @return Array the date list
1251 
-	*
1252 
-	*/
1248 
+	 * Counts all dates during the last year
1249 
+	 *
1250 
+	 * @return Array the date list
1251 
+	 *
1252 
+	 */
1253 1253 
 	public function countAllMonthsLastYear($filters)
1254 1254 
 	{
1255 1255 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1271,7 +1271,7 @@  discard block
 
 block discarded – undo
1271 1271 
 			$query .= " GROUP BY year_name, month_name
1272 1272 
 								ORDER BY year_name, month_name ASC";
1273 1273 
 			$query_data = array(':offset' => $offset);
1274 
-    		}
1274 
+			}
1275 1275
1276 1276 
 		$sth = $this->db->prepare($query);
1277 1277 
 		$sth->execute($query_data);
 
@@ -1294,11 +1294,11 @@  discard block
 
 block discarded – undo
1294 1294
1295 1295
1296 1296 
 	/**
1297 
-	* Counts all hours
1298 
-	*
1299 
-	* @return Array the hour list
1300 
-	*
1301 
-	*/
1297 
+	 * Counts all hours
1298 
+	 *
1299 
+	 * @return Array the hour list
1300 
+	 *
1301 
+	 */
1302 1302 
 	public function countAllHours($orderby,$filters = array())
1303 1303 
 	{
1304 1304 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1361,11 +1361,11 @@  discard block
 
 block discarded – undo
1361 1361
1362 1362
1363 1363 
 	/**
1364 
-	* Counts all hours by date
1365 
-	*
1366 
-	* @return Array the hour list
1367 
-	*
1368 
-	*/
1364 
+	 * Counts all hours by date
1365 
+	 *
1366 
+	 * @return Array the hour list
1367 
+	 *
1368 
+	 */
1369 1369 
 	public function countAllHoursByDate($date, $filters = array())
1370 1370 
 	{
1371 1371 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1409,11 +1409,11 @@  discard block
 
 block discarded – undo
1409 1409
1410 1410
1411 1411 
 	/**
1412 
-	* Counts all hours by a ident/callsign
1413 
-	*
1414 
-	* @return Array the hour list
1415 
-	*
1416 
-	*/
1412 
+	 * Counts all hours by a ident/callsign
1413 
+	 *
1414 
+	 * @return Array the hour list
1415 
+	 *
1416 
+	 */
1417 1417 
 	public function countAllHoursByIdent($ident, $filters = array())
1418 1418 
 	{
1419 1419 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1458,11 +1458,11 @@  discard block
 
 block discarded – undo
1458 1458
1459 1459
1460 1460 
 	/**
1461 
-	* Counts all vessels
1462 
-	*
1463 
-	* @return Integer the number of vessels
1464 
-	*
1465 
-	*/
1461 
+	 * Counts all vessels
1462 
+	 *
1463 
+	 * @return Integer the number of vessels
1464 
+	 *
1465 
+	 */
1466 1466 
 	public function countOverallMarine($filters = array(),$year = '',$month = '')
1467 1467 
 	{
1468 1468 
 		global $globalDBdriver;
 
@@ -1497,11 +1497,11 @@  discard block
 
 block discarded – undo
1497 1497 
 	}
1498 1498
1499 1499 
 	/**
1500 
-	* Counts all vessel type
1501 
-	*
1502 
-	* @return Integer the number of vessels
1503 
-	*
1504 
-	*/
1500 
+	 * Counts all vessel type
1501 
+	 *
1502 
+	 * @return Integer the number of vessels
1503 
+	 *
1504 
+	 */
1505 1505 
 	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
1506 1506 
 	{
1507 1507 
 		global $globalDBdriver;
 
@@ -1536,11 +1536,11 @@  discard block
 
 block discarded – undo
1536 1536
1537 1537
1538 1538 
 	/**
1539 
-	* Counts all hours of today
1540 
-	*
1541 
-	* @return Array the hour list
1542 
-	*
1543 
-	*/
1539 
+	 * Counts all hours of today
1540 
+	 *
1541 
+	 * @return Array the hour list
1542 
+	 *
1543 
+	 */
1544 1544 
 	public function countAllHoursFromToday($filters = array())
1545 1545 
 	{
1546 1546 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1580,12 +1580,12 @@  discard block
 
 block discarded – undo
1580 1580 
 	}
1581 1581
1582 1582
1583 
-     /**
1584 
-	* Gets the Barrie Spotter ID based on the FlightAware ID
1585 
-	*
1586 
-	* @return Integer the Barrie Spotter ID
1583 
+	 /**
1584 
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
1585 
+	  *
1586 
+	  * @return Integer the Barrie Spotter ID
1587 1587 
 q	*
1588 
-	*/
1588 
+	  */
1589 1589 
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
1590 1590 
 	{
1591 1591 
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
 
@@ -1606,13 +1606,13 @@  discard block
 
 block discarded – undo
1606 1606
1607 1607
1608 1608 
 	/**
1609 
-	* Parses a date string
1610 
-	*
1611 
-	* @param String $dateString the date string
1612 
-	* @param String $timezone the timezone of a user
1613 
-	* @return Array the time information
1614 
-	*
1615 
-	*/
1609 
+	 * Parses a date string
1610 
+	 *
1611 
+	 * @param String $dateString the date string
1612 
+	 * @param String $timezone the timezone of a user
1613 
+	 * @return Array the time information
1614 
+	 *
1615 
+	 */
1616 1616 
 	public function parseDateString($dateString, $timezone = '')
1617 1617 
 	{
1618 1618 
 		$time_array = array();
 
@@ -1645,12 +1645,12 @@  discard block
 
 block discarded – undo
1645 1645 
 	}
1646 1646
1647 1647 
 	/**
1648 
-	* Parses the direction degrees to working
1649 
-	*
1650 
-	* @param Float $direction the direction in degrees
1651 
-	* @return Array the direction information
1652 
-	*
1653 
-	*/
1648 
+	 * Parses the direction degrees to working
1649 
+	 *
1650 
+	 * @param Float $direction the direction in degrees
1651 
+	 * @return Array the direction information
1652 
+	 *
1653 
+	 */
1654 1654 
 	public function parseDirection($direction = 0)
1655 1655 
 	{
1656 1656 
 		if ($direction == '') $direction = 0;
 
@@ -1729,12 +1729,12 @@  discard block
 
 block discarded – undo
1729 1729
1730 1730
1731 1731 
 	/**
1732 
-	* Gets Country from latitude/longitude
1733 
-	*
1734 
-	* @param Float $latitude latitute of the flight
1735 
-	* @param Float $longitude longitute of the flight
1736 
-	* @return String the countrie
1737 
-	*/
1732 
+	 * Gets Country from latitude/longitude
1733 
+	 *
1734 
+	 * @param Float $latitude latitute of the flight
1735 
+	 * @param Float $longitude longitute of the flight
1736 
+	 * @return String the countrie
1737 
+	 */
1738 1738 
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
1739 1739 
 	{
1740 1740 
 		global $globalDBdriver, $globalDebug;
 
@@ -1771,11 +1771,11 @@  discard block
 
 block discarded – undo
1771 1771 
 	}
1772 1772
1773 1773 
 	/**
1774 
-	* Gets Country from iso2
1775 
-	*
1776 
-	* @param String $iso2 ISO2 country code
1777 
-	* @return String the countrie
1778 
-	*/
1774 
+	 * Gets Country from iso2
1775 
+	 *
1776 
+	 * @param String $iso2 ISO2 country code
1777 
+	 * @return String the countrie
1778 
+	 */
1779 1779 
 	public function getCountryFromISO2($iso2)
1780 1780 
 	{
1781 1781 
 		global $globalDBdriver, $globalDebug;
 
@@ -1804,12 +1804,12 @@  discard block
 
 block discarded – undo
1804 1804
1805 1805
1806 1806 
 	/**
1807 
-	* Gets the short url from bit.ly
1808 
-	*
1809 
-	* @param String $url the full url
1810 
-	* @return String the bit.ly url
1811 
-	*
1812 
-	*/
1807 
+	 * Gets the short url from bit.ly
1808 
+	 *
1809 
+	 * @param String $url the full url
1810 
+	 * @return String the bit.ly url
1811 
+	 *
1812 
+	 */
1813 1813 
 	public function getBitlyURL($url)
1814 1814 
 	{
1815 1815 
 		global $globalBitlyAccessToken;
 
@@ -1836,11 +1836,11 @@  discard block
 
 block discarded – undo
1836 1836
1837 1837
1838 1838 
 	/**
1839 
-	* Gets all vessels types that have flown over
1840 
-	*
1841 
-	* @return Array the vessel type list
1842 
-	*
1843 
-	*/
1839 
+	 * Gets all vessels types that have flown over
1840 
+	 *
1841 
+	 * @return Array the vessel type list
1842 
+	 *
1843 
+	 */
1844 1844 
 	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
1845 1845 
 	{
1846 1846 
 		global $globalDBdriver;
 
@@ -1906,11 +1906,11 @@  discard block
 
 block discarded – undo
1906 1906 
 	}
1907 1907
1908 1908 
 	/**
1909 
-	* Gets all the tracker information
1910 
-	*
1911 
-	* @return Array the tracker information
1912 
-	*
1913 
-	*/
1909 
+	 * Gets all the tracker information
1910 
+	 *
1911 
+	 * @return Array the tracker information
1912 
+	 *
1913 
+	 */
1914 1914 
 	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
1915 1915 
 	{
1916 1916 
 		global $globalTimezone, $globalDBdriver;
Please login to merge, or discard this patch.
Spacing   +208 added lines, -208 removed lines patch added patch discarded remove patch 
@@ -2,7 +2,7 @@  discard block
 
 block discarded – undo
2 2 
 require_once(dirname(__FILE__).'/class.Image.php');
3 3 
 $global_query = "SELECT marine_output.* FROM marine_output";
4 4
5 
-class Marine{
5 
+class Marine {
6 6 
 	public $db;
7 7
8 8 
 	public function __construct($dbc = null) {
 
@@ -17,33 +17,33 @@  discard block
 
 block discarded – undo
17 17 
 	* @return Array the SQL part
18 18 
 	*/
19 19
20 
-	public function getFilter($filter = array(),$where = false,$and = false) {
20 
+	public function getFilter($filter = array(), $where = false, $and = false) {
21 21 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
22 22 
 		$filters = array();
23 23 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
24 24 
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
25 25 
 				$filters = $globalStatsFilters[$globalFilterName];
26 26 
 			} else {
27 
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
27 
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
28 28 
 			}
29 29 
 		}
30 30 
 		if (isset($filter[0]['source'])) {
31 
-			$filters = array_merge($filters,$filter);
31 
+			$filters = array_merge($filters, $filter);
32 32 
 		}
33 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
33 
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
34 34 
 		$filter_query_join = '';
35 35 
 		$filter_query_where = '';
36 
-		foreach($filters as $flt) {
36 
+		foreach ($filters as $flt) {
37 37 
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
38 38 
 				if (isset($flt['source'])) {
39 
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
39 
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
40 40 
 				} else {
41 
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
41 
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
42 42 
 				}
43 43 
 			}
44 44 
 		}
45 45 
 		if (isset($filter['source']) && !empty($filter['source'])) {
46 
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
46 
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
47 47 
 		}
48 48 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
49 49 
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
 
@@ -75,7 +75,7 @@  discard block
 
 block discarded – undo
75 75 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
76 76 
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
77 77 
 		if ($filter_query_where != '') {
78 
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
78 
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
79 79 
 		}
80 80 
 		$filter_query = $filter_query_join.$filter_query_where;
81 81 
 		return $filter_query;
 
@@ -90,7 +90,7 @@  discard block
 
 block discarded – undo
90 90 
 	* @return Array the spotter information
91 91 
 	*
92 92 
 	*/
93 
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
93 
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
94 94 
 	{
95 95 
 		date_default_timezone_set('UTC');
96 96 
 		if (!is_string($query))
 
@@ -110,13 +110,13 @@  discard block
 
 block discarded – undo
110 110 
 			$sth = $this->db->prepare($query.$limitQuery);
111 111 
 			$sth->execute($params);
112 112 
 		} catch (PDOException $e) {
113 
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
113 
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
114 114 
 			exit();
115 115 
 		}
116 116
117 117 
 		$num_rows = 0;
118 118 
 		$spotter_array = array();
119 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
119 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
120 120 
 		{
121 121 
 			$num_rows++;
122 122 
 			$temp_array = array();
 
@@ -151,10 +151,10 @@  discard block
 
 block discarded – undo
151 151 
 			}
152 152 
 			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
153 153
154 
-			if(isset($temp_array['mmsi']) && $temp_array['mmsi'] != "")
154 
+			if (isset($temp_array['mmsi']) && $temp_array['mmsi'] != "")
155 155 
 			{
156 156 
 				$Image = new Image($this->db);
157 
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
157 
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'], '', $temp_array['ident']);
158 158 
 				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
159 159 
 				unset($Image);
160 160 
 				if (count($image_array) > 0) {
 
@@ -190,17 +190,17 @@  discard block
 
 block discarded – undo
190 190 
 				{
191 191 
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
192 192 
 				} else {
193 
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
193 
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
194 194 
 				}
195 195 
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
196 
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
197 
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
196 
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
197 
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
198 198 
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
199 199 
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
200 200 
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
201 201 
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
202 
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
203 
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
202 
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
203 
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
204 204 
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
205 205 
 					}
206 206 
 				}
 
@@ -233,8 +233,8 @@  discard block
 
 block discarded – undo
233 233 
 		if ($limit != "")
234 234 
 		{
235 235 
 			$limit_array = explode(",", $limit);
236 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
237 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
236 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
237 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
238 238 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
239 239 
 			{
240 240 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 
@@ -248,8 +248,8 @@  discard block
 
 block discarded – undo
248 248 
 		} else {
249 249 
 			$orderby_query = " ORDER BY marine_output.date DESC";
250 250 
 		}
251 
-		$query  = $global_query.$filter_query." ".$orderby_query;
252 
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query,true);
251 
+		$query = $global_query.$filter_query." ".$orderby_query;
252 
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query, true);
253 253 
 		return $spotter_array;
254 254 
 	}
255 255 
     
@@ -267,8 +267,8 @@  discard block
 
 block discarded – undo
267 267 
 		if ($id == '') return array();
268 268 
 		$additional_query = "marine_output.fammarine_id = :id";
269 269 
 		$query_values = array(':id' => $id);
270 
-		$query  = $global_query." WHERE ".$additional_query." ";
271 
-		$spotter_array = $this->getDataFromDB($query,$query_values);
270 
+		$query = $global_query." WHERE ".$additional_query." ";
271 
+		$spotter_array = $this->getDataFromDB($query, $query_values);
272 272 
 		return $spotter_array;
273 273 
 	}
274 274 
 
@@ -287,7 +287,7 @@  discard block
 
 block discarded – undo
287 287 
 		$query_values = array();
288 288 
 		$limit_query = '';
289 289 
 		$additional_query = '';
290 
-		$filter_query = $this->getFilter($filter,true,true);
290 
+		$filter_query = $this->getFilter($filter, true, true);
291 291 
 		if ($ident != "")
292 292 
 		{
293 293 
 			if (!is_string($ident))
 
@@ -303,8 +303,8 @@  discard block
 
 block discarded – undo
303 303 
 		{
304 304 
 			$limit_array = explode(",", $limit);
305 305
306 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
307 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
306 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
307 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
308 308
309 309 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
310 310 
 			{
 
@@ -343,7 +343,7 @@  discard block
 
 block discarded – undo
343 343 
 		$query_values = array();
344 344 
 		$limit_query = '';
345 345 
 		$additional_query = '';
346 
-		$filter_query = $this->getFilter($filter,true,true);
346 
+		$filter_query = $this->getFilter($filter, true, true);
347 347 
 		if (!is_string($type))
348 348 
 		{
349 349 
 			return false;
 
@@ -356,8 +356,8 @@  discard block
 
 block discarded – undo
356 356 
 		{
357 357 
 			$limit_array = explode(",", $limit);
358 358
359 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
360 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
359 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
360 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
361 361
362 362 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
363 363 
 			{
 
@@ -381,7 +381,7 @@  discard block
 
 block discarded – undo
381 381 
 		return $spotter_array;
382 382 
 	}
383 383
384 
-	public function getMarineDataByDate($date = '', $limit = '', $sort = '',$filter = array())
384 
+	public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array())
385 385 
 	{
386 386 
 		global $global_query, $globalTimezone, $globalDBdriver;
387 387 
 		
@@ -389,7 +389,7 @@  discard block
 
 block discarded – undo
389 389 
 		$limit_query = '';
390 390 
 		$additional_query = '';
391 391
392 
-		$filter_query = $this->getFilter($filter,true,true);
392 
+		$filter_query = $this->getFilter($filter, true, true);
393 393
394 394 
 		if ($date != "")
395 395 
 		{
 
@@ -415,8 +415,8 @@  discard block
 
 block discarded – undo
415 415 
 		{
416 416 
 			$limit_array = explode(",", $limit);
417 417
418 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
419 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
418 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
419 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
420 420
421 421 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
422 422 
 			{
 
@@ -447,11 +447,11 @@  discard block
 
 block discarded – undo
447 447 
 	* @return Array list of source name
448 448 
 	*
449 449 
 	*/
450 
-	public function getAllSourceName($type = '',$filters = array())
450 
+	public function getAllSourceName($type = '', $filters = array())
451 451 
 	{
452 
-		$filter_query = $this->getFilter($filters,true,true);
452 
+		$filter_query = $this->getFilter($filters, true, true);
453 453 
 		$query_values = array();
454 
-		$query  = "SELECT DISTINCT marine_output.source_name
454 
+		$query = "SELECT DISTINCT marine_output.source_name
455 455 
 				FROM marine_output".$filter_query." marine_output.source_name <> ''";
456 456 
 		if ($type != '') {
457 457 
 			$query_values = array(':type' => $type);
 
@@ -466,7 +466,7 @@  discard block
 
 block discarded – undo
466 466 
 		$source_array = array();
467 467 
 		$temp_array = array();
468 468
469 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
469 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
470 470 
 		{
471 471 
 			$temp_array['source_name'] = $row['source_name'];
472 472 
 			$source_array[] = $temp_array;
 
@@ -483,8 +483,8 @@  discard block
 
 block discarded – undo
483 483 
 	*/
484 484 
 	public function getAllIdents($filters = array())
485 485 
 	{
486 
-		$filter_query = $this->getFilter($filters,true,true);
487 
-		$query  = "SELECT DISTINCT marine_output.ident
486 
+		$filter_query = $this->getFilter($filters, true, true);
487 
+		$query = "SELECT DISTINCT marine_output.ident
488 488 
 								FROM marine_output".$filter_query." marine_output.ident <> ''
489 489 
 								ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0";
490 490 
 
@@ -494,7 +494,7 @@  discard block
 
 block discarded – undo
494 494 
 		$ident_array = array();
495 495 
 		$temp_array = array();
496 496
497 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
497 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
498 498 
 		{
499 499 
 			$temp_array['ident'] = $row['ident'];
500 500 
 			$ident_array[] = $temp_array;
 
@@ -511,7 +511,7 @@  discard block
 
 block discarded – undo
511 511 
 	*/
512 512 
 	public function getIdentity($mmsi)
513 513 
 	{
514 
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
514 
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT);
515 515 
 		$query  = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1";
516 516 
 		$sth = $this->db->prepare($query);
517 517 
 		$sth->execute(array(':mmsi' => $mmsi));
 
@@ -524,23 +524,23 @@  discard block
 
 block discarded – undo
524 524 
 	* Add identity
525 525 
 	*
526 526 
 	*/
527 
-	public function addIdentity($mmsi,$imo,$ident,$callsign,$type)
527 
+	public function addIdentity($mmsi, $imo, $ident, $callsign, $type)
528 528 
 	{
529 
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
529 
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT);
530 530 
 		if ($mmsi != '') {
531 
-			$imo = filter_var($imo,FILTER_SANITIZE_NUMBER_INT);
532 
-			$ident = filter_var($ident,FILTER_SANITIZE_STRING);
533 
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
534 
-			$type = filter_var($type,FILTER_SANITIZE_STRING);
531 
+			$imo = filter_var($imo, FILTER_SANITIZE_NUMBER_INT);
532 
+			$ident = filter_var($ident, FILTER_SANITIZE_STRING);
533 
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
534 
+			$type = filter_var($type, FILTER_SANITIZE_STRING);
535 535 
 			$identinfo = $this->getIdentity($mmsi);
536 536 
 			if (empty($identinfo)) {
537 
-				$query  = "INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:type)";
537 
+				$query = "INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:type)";
538 538 
 				$sth = $this->db->prepare($query);
539 
-				$sth->execute(array(':mmsi' => $mmsi,':imo' => $imo,':call_sign' => $callsign,':ship_name' => $ident,':type' => $type));
539 
+				$sth->execute(array(':mmsi' => $mmsi, ':imo' => $imo, ':call_sign' => $callsign, ':ship_name' => $ident, ':type' => $type));
540 540 
 			} elseif ($ident != '' && $identinfo['ship_name'] != $ident) {
541 
-				$query  = "UPDATE marine_identity SET ship_name = :ship_name,type = :type WHERE mmsi = :mmsi";
541 
+				$query = "UPDATE marine_identity SET ship_name = :ship_name,type = :type WHERE mmsi = :mmsi";
542 542 
 				$sth = $this->db->prepare($query);
543 
-				$sth->execute(array(':mmsi' => $mmsi,':ship_name' => $ident,':type' => $type));
543 
+				$sth->execute(array(':mmsi' => $mmsi, ':ship_name' => $ident, ':type' => $type));
544 544 
 			}
545 545 
 		}
546 546 
 	}
 
@@ -561,12 +561,12 @@  discard block
 
 block discarded – undo
561 561 
 		} else $offset = '+00:00';
562 562
563 563 
 		if ($globalDBdriver == 'mysql') {
564 
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
564 
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
565 565 
 								FROM marine_output
566 566 
 								WHERE marine_output.date <> ''
567 567 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
568 568 
 		} else {
569 
-			$query  = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
569 
+			$query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
570 570 
 								FROM marine_output
571 571 
 								WHERE marine_output.date <> ''
572 572 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
 
@@ -578,7 +578,7 @@  discard block
 
 block discarded – undo
578 578 
 		$date_array = array();
579 579 
 		$temp_array = array();
580 580
581 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
581 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
582 582 
 		{
583 583 
 			$temp_array['date'] = $row['date'];
584 584 
 
@@ -596,10 +596,10 @@  discard block
 
 block discarded – undo
596 596 
 	* @return String success or false
597 597 
 	*
598 598 
 	*/
599 
-	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
599 
+	public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL)
600 600 
 	{
601 601 
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
602 
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident);
602 
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident);
603 603 
 		try {
604 604 
 			$sth = $this->db->prepare($query);
605 605 
 			$sth->execute($query_values);
 
@@ -617,10 +617,10 @@  discard block
 
 block discarded – undo
617 617 
 	* @return String success or false
618 618 
 	*
619 619 
 	*/
620 
-	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL)
620 
+	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '', $fromsource = NULL)
621 621 
 	{
622 622 
 		$query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id';
623 
-		$query_values = array(':fammarine_id' => $fammarine_id,':arrival_code' => $arrival_code);
623 
+		$query_values = array(':fammarine_id' => $fammarine_id, ':arrival_code' => $arrival_code);
624 624 
 		try {
625 625 
 			$sth = $this->db->prepare($query);
626 626 
 			$sth->execute($query_values);
 
@@ -639,11 +639,11 @@  discard block
 
 block discarded – undo
639 639 
 	* @return String success or false
640 640 
 	*
641 641 
 	*/
642 
-	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
642 
+	public function updateStatusMarineData($fammarine_id = '', $status_id = '', $status = '')
643 643 
 	{
644 644
645 645 
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
646 
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
646 
+                $query_values = array(':fammarine_id' => $fammarine_id, ':status' => $status, ':status_id' => $status_id);
647 647
648 648 
 		try {
649 649 
 			$sth = $this->db->prepare($query);
 
@@ -666,7 +666,7 @@  discard block
 
 block discarded – undo
666 666 
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '')
667 667 
 	{
668 668 
 		$query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id';
669 
-                $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
669 
+                $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident);
670 670
671 671 
 		try {
672 672 
 			$sth = $this->db->prepare($query);
 
@@ -704,7 +704,7 @@  discard block
 
 block discarded – undo
704 704 
 	* @param String $verticalrate vertival rate of flight
705 705 
 	* @return String success or false
706 706 
 	*/
707 
-	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '')
707 
+	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $format_source = '', $source_name = '')
708 708 
 	{
709 709 
 		global $globalURL, $globalMarineImageFetch;
710 710 
 		
@@ -771,32 +771,32 @@  discard block
 
 block discarded – undo
771 771 
 		}
772 772
773 773
774 
-		if ($date == "" || strtotime($date) < time()-20*60)
774 
+		if ($date == "" || strtotime($date) < time() - 20*60)
775 775 
 		{
776 776 
 			$date = date("Y-m-d H:i:s", time());
777 777 
 		}
778 778
779 
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
780 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
781 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
782 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
783 
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
784 
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
785 
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
786 
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
787 
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
788 
-		$status = filter_var($status,FILTER_SANITIZE_STRING);
789 
-		$type_id = filter_var($typeid,FILTER_SANITIZE_NUMBER_INT);
790 
-		$status_id = filter_var($statusid,FILTER_SANITIZE_NUMBER_INT);
791 
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
792 
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
793 
-		$arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING);
794 
-		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
779 
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
780 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
781 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
782 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
783 
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
784 
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
785 
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
786 
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
787 
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
788 
+		$status = filter_var($status, FILTER_SANITIZE_STRING);
789 
+		$type_id = filter_var($typeid, FILTER_SANITIZE_NUMBER_INT);
790 
+		$status_id = filter_var($statusid, FILTER_SANITIZE_NUMBER_INT);
791 
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
792 
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
793 
+		$arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING);
794 
+		$arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING);
795 795 
 		if (isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) {
796 796 
 			$Image = new Image($this->db);
797 
-			$image_array = $Image->getMarineImage($mmsi,$imo,$ident);
797 
+			$image_array = $Image->getMarineImage($mmsi, $imo, $ident);
798 798 
 			if (!isset($image_array[0]['mmsi'])) {
799 
-				$Image->addMarineImage($mmsi,$imo,$ident);
799 
+				$Image->addMarineImage($mmsi, $imo, $ident);
800 800 
 			}
801 801 
 			unset($Image);
802 802 
 		}
 
@@ -809,10 +809,10 @@  discard block
 
 block discarded – undo
809 809 
 		if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
810 810 
 		if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
811 811 
 		if ($arrival_date == '') $arrival_date = NULL;
812 
-		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, type_id, status,status_id,imo,arrival_port_name,arrival_port_date)
812 
+		$query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, type_id, status,status_id,imo,arrival_port_name,arrival_port_date)
813 813 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:type_id,:status,:status_id,:imo,:arrival_port_name,:arrival_port_date)";
814 814
815 
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':mmsi' => $mmsi,':type' => $type,':type_id' => $type_id,':status' => $status,':status_id' => $status_id,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date);
815 
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':mmsi' => $mmsi, ':type' => $type, ':type_id' => $type_id, ':status' => $status, ':status_id' => $status_id, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date);
816 816 
 		try {
817 817 
 			$sth = $this->db->prepare($query);
818 818 
 			$sth->execute($query_values);
 
@@ -836,13 +836,13 @@  discard block
 
 block discarded – undo
836 836 
 	{
837 837 
 		global $globalDBdriver, $globalTimezone;
838 838 
 		if ($globalDBdriver == 'mysql') {
839 
-			$query  = "SELECT marine_output.ident FROM marine_output
839 
+			$query = "SELECT marine_output.ident FROM marine_output
840 840 
 								WHERE marine_output.ident = :ident
841 841 
 								AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR)
842 842 
 								AND marine_output.date < UTC_TIMESTAMP()";
843 843 
 			$query_data = array(':ident' => $ident);
844 844 
 		} else {
845 
-			$query  = "SELECT marine_output.ident FROM marine_output
845 
+			$query = "SELECT marine_output.ident FROM marine_output
846 846 
 								WHERE marine_output.ident = :ident
847 847 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
848 848 
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
 
@@ -851,8 +851,8 @@  discard block
 
 block discarded – undo
851 851
852 852 
 		$sth = $this->db->prepare($query);
853 853 
 		$sth->execute($query_data);
854 
-    		$ident_result='';
855 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
854 
+    		$ident_result = '';
855 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
856 856 
 		{
857 857 
 			$ident_result = $row['ident'];
858 858 
 		}
 
@@ -878,8 +878,8 @@  discard block
 
 block discarded – undo
878 878 
 				return false;
879 879 
 			} else {
880 880 
 				$q_array = explode(" ", $q);
881 
-				foreach ($q_array as $q_item){
882 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
881 
+				foreach ($q_array as $q_item) {
882 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
883 883 
 					$additional_query .= " AND (";
884 884 
 					$additional_query .= "(marine_output.ident like '%".$q_item."%')";
885 885 
 					$additional_query .= ")";
 
@@ -887,11 +887,11 @@  discard block
 
 block discarded – undo
887 887 
 			}
888 888 
 		}
889 889 
 		if ($globalDBdriver == 'mysql') {
890 
-			$query  = "SELECT marine_output.* FROM marine_output
890 
+			$query = "SELECT marine_output.* FROM marine_output
891 891 
 				WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query."
892 892 
 				AND marine_output.date < UTC_TIMESTAMP()";
893 893 
 		} else {
894 
-			$query  = "SELECT marine_output.* FROM marine_output
894 
+			$query = "SELECT marine_output.* FROM marine_output
895 895 
 				WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query."
896 896 
 				AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
897 897 
 		}
 
@@ -910,16 +910,16 @@  discard block
 
 block discarded – undo
910 910 
 	*
911 911 
 	*/
912 912
913 
-	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
913 
+	public function countAllMarineOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
914 914 
 	{
915 915 
 		global $globalDBdriver, $globalArchive;
916 916 
 		//$filter_query = $this->getFilter($filters,true,true);
917 
-		$Connection= new Connection($this->db);
917 
+		$Connection = new Connection($this->db);
918 918 
 		if (!$Connection->tableExists('countries')) return array();
919 919 
 		require_once('class.SpotterLive.php');
920 920 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
921 921 
 			$MarineLive = new MarineLive($this->db);
922 
-			$filter_query = $MarineLive->getFilter($filters,true,true);
922 
+			$filter_query = $MarineLive->getFilter($filters, true, true);
923 923 
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
924 924 
 			if ($olderthanmonths > 0) {
925 925 
 				if ($globalDBdriver == 'mysql') {
 
@@ -939,7 +939,7 @@  discard block
 
 block discarded – undo
939 939 
 		} else {
940 940 
 			require_once(dirname(__FILE__)."/class.MarineArchive.php");
941 941 
 			$MarineArchive = new MarineArchive($this->db);
942 
-			$filter_query = $MarineArchive->getFilter($filters,true,true);
942 
+			$filter_query = $MarineArchive->getFilter($filters, true, true);
943 943 
 			$filter_query .= " over_country <> ''";
944 944 
 			if ($olderthanmonths > 0) {
945 945 
 				if ($globalDBdriver == 'mysql') {
 
@@ -967,7 +967,7 @@  discard block
 
 block discarded – undo
967 967 
 		$flight_array = array();
968 968 
 		$temp_array = array();
969 969
970 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
970 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
971 971 
 		{
972 972 
 			$temp_array['marine_count'] = $row['nb'];
973 973 
 			$temp_array['marine_country'] = $row['name'];
 
@@ -986,11 +986,11 @@  discard block
 
 block discarded – undo
986 986 
 	* @return Array the callsign list
987 987 
 	*
988 988 
 	*/
989 
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
989 
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
990 990 
 	{
991 991 
 		global $globalDBdriver;
992 
-		$filter_query = $this->getFilter($filters,true,true);
993 
-		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count
992 
+		$filter_query = $this->getFilter($filters, true, true);
993 
+		$query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count
994 994 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
995 995 
 		 if ($olderthanmonths > 0) {
996 996 
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
 
@@ -1004,28 +1004,28 @@  discard block
 
 block discarded – undo
1004 1004 
 		if ($year != '') {
1005 1005 
 			if ($globalDBdriver == 'mysql') {
1006 1006 
 				$query .= " AND YEAR(marine_output.date) = :year";
1007 
-				$query_values = array_merge($query_values,array(':year' => $year));
1007 
+				$query_values = array_merge($query_values, array(':year' => $year));
1008 1008 
 			} else {
1009 1009 
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
1010 
-				$query_values = array_merge($query_values,array(':year' => $year));
1010 
+				$query_values = array_merge($query_values, array(':year' => $year));
1011 1011 
 			}
1012 1012 
 		}
1013 1013 
 		if ($month != '') {
1014 1014 
 			if ($globalDBdriver == 'mysql') {
1015 1015 
 				$query .= " AND MONTH(marine_output.date) = :month";
1016 
-				$query_values = array_merge($query_values,array(':month' => $month));
1016 
+				$query_values = array_merge($query_values, array(':month' => $month));
1017 1017 
 			} else {
1018 1018 
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
1019 
-				$query_values = array_merge($query_values,array(':month' => $month));
1019 
+				$query_values = array_merge($query_values, array(':month' => $month));
1020 1020 
 			}
1021 1021 
 		}
1022 1022 
 		if ($day != '') {
1023 1023 
 			if ($globalDBdriver == 'mysql') {
1024 1024 
 				$query .= " AND DAY(marine_output.date) = :day";
1025 
-				$query_values = array_merge($query_values,array(':day' => $day));
1025 
+				$query_values = array_merge($query_values, array(':day' => $day));
1026 1026 
 			} else {
1027 1027 
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
1028 
-				$query_values = array_merge($query_values,array(':day' => $day));
1028 
+				$query_values = array_merge($query_values, array(':day' => $day));
1029 1029 
 			}
1030 1030 
 		}
1031 1031 
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
 
@@ -1037,7 +1037,7 @@  discard block
 
 block discarded – undo
1037 1037 
 		$callsign_array = array();
1038 1038 
 		$temp_array = array();
1039 1039
1040 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1040 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1041 1041 
 		{
1042 1042 
 			$temp_array['callsign_icao'] = $row['ident'];
1043 1043 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -1089,7 +1089,7 @@  discard block
 
 block discarded – undo
1089 1089 
 		$date_array = array();
1090 1090 
 		$temp_array = array();
1091 1091
1092 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1092 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1093 1093 
 		{
1094 1094 
 			$temp_array['date_name'] = $row['date_name'];
1095 1095 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -1115,7 +1115,7 @@  discard block
 
 block discarded – undo
1115 1115 
 			$datetime = new DateTime();
1116 1116 
 			$offset = $datetime->format('P');
1117 1117 
 		} else $offset = '+00:00';
1118 
-		$filter_query = $this->getFilter($filters,true,true);
1118 
+		$filter_query = $this->getFilter($filters, true, true);
1119 1119 
 		if ($globalDBdriver == 'mysql') {
1120 1120 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
1121 1121 
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
 
@@ -1136,7 +1136,7 @@  discard block
 
 block discarded – undo
1136 1136 
 		$date_array = array();
1137 1137 
 		$temp_array = array();
1138 1138
1139 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1139 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1140 1140 
 		{
1141 1141 
 			$temp_array['date_name'] = $row['date_name'];
1142 1142 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -1161,7 +1161,7 @@  discard block
 
 block discarded – undo
1161 1161 
 			$datetime = new DateTime();
1162 1162 
 			$offset = $datetime->format('P');
1163 1163 
 		} else $offset = '+00:00';
1164 
-		$filter_query = $this->getFilter($filters,true,true);
1164 
+		$filter_query = $this->getFilter($filters, true, true);
1165 1165 
 		if ($globalDBdriver == 'mysql') {
1166 1166 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
1167 1167 
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
 
@@ -1182,7 +1182,7 @@  discard block
 
 block discarded – undo
1182 1182 
 		$date_array = array();
1183 1183 
 		$temp_array = array();
1184 1184
1185 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1185 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1186 1186 
 		{
1187 1187 
 			$temp_array['date_name'] = $row['date_name'];
1188 1188 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -1229,7 +1229,7 @@  discard block
 
 block discarded – undo
1229 1229 
 		$date_array = array();
1230 1230 
 		$temp_array = array();
1231 1231
1232 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1232 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1233 1233 
 		{
1234 1234 
 			$temp_array['month_name'] = $row['month_name'];
1235 1235 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -1258,7 +1258,7 @@  discard block
 
 block discarded – undo
1258 1258 
 			$datetime = new DateTime();
1259 1259 
 			$offset = $datetime->format('P');
1260 1260 
 		} else $offset = '+00:00';
1261 
-		$filter_query = $this->getFilter($filters,true,true);
1261 
+		$filter_query = $this->getFilter($filters, true, true);
1262 1262 
 		if ($globalDBdriver == 'mysql') {
1263 1263 
 			$query  = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
1264 1264 
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
 
@@ -1279,7 +1279,7 @@  discard block
 
 block discarded – undo
1279 1279 
 		$date_array = array();
1280 1280 
 		$temp_array = array();
1281 1281
1282 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1282 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1283 1283 
 		{
1284 1284 
 			$temp_array['year_name'] = $row['year_name'];
1285 1285 
 			$temp_array['month_name'] = $row['month_name'];
 
@@ -1299,7 +1299,7 @@  discard block
 
 block discarded – undo
1299 1299 
 	* @return Array the hour list
1300 1300 
 	*
1301 1301 
 	*/
1302 
-	public function countAllHours($orderby,$filters = array())
1302 
+	public function countAllHours($orderby, $filters = array())
1303 1303 
 	{
1304 1304 
 		global $globalTimezone, $globalDBdriver;
1305 1305 
 		if ($globalTimezone != '') {
 
@@ -1347,7 +1347,7 @@  discard block
 
 block discarded – undo
1347 1347 
 		$hour_array = array();
1348 1348 
 		$temp_array = array();
1349 1349
1350 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1350 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1351 1351 
 		{
1352 1352 
 			$temp_array['hour_name'] = $row['hour_name'];
1353 1353 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1369,8 +1369,8 @@  discard block
 
 block discarded – undo
1369 1369 
 	public function countAllHoursByDate($date, $filters = array())
1370 1370 
 	{
1371 1371 
 		global $globalTimezone, $globalDBdriver;
1372 
-		$filter_query = $this->getFilter($filters,true,true);
1373 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
1372 
+		$filter_query = $this->getFilter($filters, true, true);
1373 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
1374 1374 
 		if ($globalTimezone != '') {
1375 1375 
 			date_default_timezone_set($globalTimezone);
1376 1376 
 			$datetime = new DateTime($date);
 
@@ -1378,12 +1378,12 @@  discard block
 
 block discarded – undo
1378 1378 
 		} else $offset = '+00:00';
1379 1379
1380 1380 
 		if ($globalDBdriver == 'mysql') {
1381 
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1381 
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1382 1382 
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date
1383 1383 
 								GROUP BY hour_name
1384 1384 
 								ORDER BY hour_name ASC";
1385 1385 
 		} else {
1386 
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1386 
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1387 1387 
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
1388 1388 
 								GROUP BY hour_name
1389 1389 
 								ORDER BY hour_name ASC";
 
@@ -1395,7 +1395,7 @@  discard block
 
 block discarded – undo
1395 1395 
 		$hour_array = array();
1396 1396 
 		$temp_array = array();
1397 1397
1398 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1398 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1399 1399 
 		{
1400 1400 
 			$temp_array['hour_name'] = $row['hour_name'];
1401 1401 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1417,8 +1417,8 @@  discard block
 
 block discarded – undo
1417 1417 
 	public function countAllHoursByIdent($ident, $filters = array())
1418 1418 
 	{
1419 1419 
 		global $globalTimezone, $globalDBdriver;
1420 
-		$filter_query = $this->getFilter($filters,true,true);
1421 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
1420 
+		$filter_query = $this->getFilter($filters, true, true);
1421 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1422 1422 
 		if ($globalTimezone != '') {
1423 1423 
 			date_default_timezone_set($globalTimezone);
1424 1424 
 			$datetime = new DateTime();
 
@@ -1426,12 +1426,12 @@  discard block
 
 block discarded – undo
1426 1426 
 		} else $offset = '+00:00';
1427 1427
1428 1428 
 		if ($globalDBdriver == 'mysql') {
1429 
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1429 
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1430 1430 
 								FROM marine_output".$filter_query." marine_output.ident = :ident
1431 1431 
 								GROUP BY hour_name
1432 1432 
 								ORDER BY hour_name ASC";
1433 1433 
 		} else {
1434 
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1434 
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1435 1435 
 								FROM marine_output".$filter_query." marine_output.ident = :ident
1436 1436 
 								GROUP BY hour_name
1437 1437 
 								ORDER BY hour_name ASC";
 
@@ -1439,12 +1439,12 @@  discard block
 
 block discarded – undo
1439 1439
1440 1440
1441 1441 
 		$sth = $this->db->prepare($query);
1442 
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
1442 
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
1443 1443
1444 1444 
 		$hour_array = array();
1445 1445 
 		$temp_array = array();
1446 1446
1447 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1447 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1448 1448 
 		{
1449 1449 
 			$temp_array['hour_name'] = $row['hour_name'];
1450 1450 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1463,33 +1463,33 @@  discard block
 
 block discarded – undo
1463 1463 
 	* @return Integer the number of vessels
1464 1464 
 	*
1465 1465 
 	*/
1466 
-	public function countOverallMarine($filters = array(),$year = '',$month = '')
1466 
+	public function countOverallMarine($filters = array(), $year = '', $month = '')
1467 1467 
 	{
1468 1468 
 		global $globalDBdriver;
1469 1469 
 		//$queryi  = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output";
1470 
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
1470 
+		$queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
1471 1471 
 		$query_values = array();
1472 1472 
 		$query = '';
1473 1473 
 		if ($year != '') {
1474 1474 
 			if ($globalDBdriver == 'mysql') {
1475 1475 
 				$query .= " AND YEAR(marine_output.date) = :year";
1476 
-				$query_values = array_merge($query_values,array(':year' => $year));
1476 
+				$query_values = array_merge($query_values, array(':year' => $year));
1477 1477 
 			} else {
1478 1478 
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
1479 
-				$query_values = array_merge($query_values,array(':year' => $year));
1479 
+				$query_values = array_merge($query_values, array(':year' => $year));
1480 1480 
 			}
1481 1481 
 		}
1482 1482 
 		if ($month != '') {
1483 1483 
 			if ($globalDBdriver == 'mysql') {
1484 1484 
 				$query .= " AND MONTH(marine_output.date) = :month";
1485 
-				$query_values = array_merge($query_values,array(':month' => $month));
1485 
+				$query_values = array_merge($query_values, array(':month' => $month));
1486 1486 
 			} else {
1487 1487 
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
1488 
-				$query_values = array_merge($query_values,array(':month' => $month));
1488 
+				$query_values = array_merge($query_values, array(':month' => $month));
1489 1489 
 			}
1490 1490 
 		}
1491 1491 
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1492 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1492 
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
1493 1493
1494 1494 
 		$sth = $this->db->prepare($queryi);
1495 1495 
 		$sth->execute($query_values);
 
@@ -1502,32 +1502,32 @@  discard block
 
 block discarded – undo
1502 1502 
 	* @return Integer the number of vessels
1503 1503 
 	*
1504 1504 
 	*/
1505 
-	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
1505 
+	public function countOverallMarineTypes($filters = array(), $year = '', $month = '')
1506 1506 
 	{
1507 1507 
 		global $globalDBdriver;
1508 
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
1508 
+		$queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
1509 1509 
 		$query_values = array();
1510 1510 
 		$query = '';
1511 1511 
 		if ($year != '') {
1512 1512 
 			if ($globalDBdriver == 'mysql') {
1513 1513 
 				$query .= " AND YEAR(marine_output.date) = :year";
1514 
-				$query_values = array_merge($query_values,array(':year' => $year));
1514 
+				$query_values = array_merge($query_values, array(':year' => $year));
1515 1515 
 			} else {
1516 1516 
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
1517 
-				$query_values = array_merge($query_values,array(':year' => $year));
1517 
+				$query_values = array_merge($query_values, array(':year' => $year));
1518 1518 
 			}
1519 1519 
 		}
1520 1520 
 		if ($month != '') {
1521 1521 
 			if ($globalDBdriver == 'mysql') {
1522 1522 
 				$query .= " AND MONTH(marine_output.date) = :month";
1523 
-				$query_values = array_merge($query_values,array(':month' => $month));
1523 
+				$query_values = array_merge($query_values, array(':month' => $month));
1524 1524 
 			} else {
1525 1525 
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
1526 
-				$query_values = array_merge($query_values,array(':month' => $month));
1526 
+				$query_values = array_merge($query_values, array(':month' => $month));
1527 1527 
 			}
1528 1528 
 		}
1529 1529 
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1530 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1530 
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
1531 1531
1532 1532 
 		$sth = $this->db->prepare($queryi);
1533 1533 
 		$sth->execute($query_values);
 
@@ -1544,7 +1544,7 @@  discard block
 
 block discarded – undo
1544 1544 
 	public function countAllHoursFromToday($filters = array())
1545 1545 
 	{
1546 1546 
 		global $globalTimezone, $globalDBdriver;
1547 
-		$filter_query = $this->getFilter($filters,true,true);
1547 
+		$filter_query = $this->getFilter($filters, true, true);
1548 1548 
 		if ($globalTimezone != '') {
1549 1549 
 			date_default_timezone_set($globalTimezone);
1550 1550 
 			$datetime = new DateTime();
 
@@ -1552,12 +1552,12 @@  discard block
 
 block discarded – undo
1552 1552 
 		} else $offset = '+00:00';
1553 1553
1554 1554 
 		if ($globalDBdriver == 'mysql') {
1555 
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1555 
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1556 1556 
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE()
1557 1557 
 								GROUP BY hour_name
1558 1558 
 								ORDER BY hour_name ASC";
1559 1559 
 		} else {
1560 
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1560 
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1561 1561 
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
1562 1562 
 								GROUP BY hour_name
1563 1563 
 								ORDER BY hour_name ASC";
 
@@ -1569,7 +1569,7 @@  discard block
 
 block discarded – undo
1569 1569 
 		$hour_array = array();
1570 1570 
 		$temp_array = array();
1571 1571
1572 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1572 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1573 1573 
 		{
1574 1574 
 			$temp_array['hour_name'] = $row['hour_name'];
1575 1575 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1588,9 +1588,9 @@  discard block
 
 block discarded – undo
1588 1588 
 	*/
1589 1589 
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
1590 1590 
 	{
1591 
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
1591 
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
1592 1592
1593 
-		$query  = "SELECT marine_output.marine_id
1593 
+		$query = "SELECT marine_output.marine_id
1594 1594 
 				FROM marine_output
1595 1595 
 				WHERE marine_output.fammarine_id = '".$fammarine_id."'";
1596 1596 
         
@@ -1598,7 +1598,7 @@  discard block
 
 block discarded – undo
1598 1598 
 		$sth = $this->db->prepare($query);
1599 1599 
 		$sth->execute();
1600 1600
1601 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1601 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1602 1602 
 		{
1603 1603 
 			return $row['marine_id'];
1604 1604 
 		}
 
@@ -1623,23 +1623,23 @@  discard block
 
 block discarded – undo
1623 1623 
 		}
1624 1624
1625 1625 
 		$current_date = date("Y-m-d H:i:s");
1626 
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
1626 
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
1627 1627
1628 1628 
 		$diff = abs(strtotime($current_date) - strtotime($date));
1629 1629
1630 
-		$time_array['years'] = floor($diff / (365*60*60*24));
1630 
+		$time_array['years'] = floor($diff/(365*60*60*24));
1631 1631 
 		$years = $time_array['years'];
1632 1632
1633 
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
1633 
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
1634 1634 
 		$months = $time_array['months'];
1635 1635
1636 
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
1636 
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
1637 1637 
 		$days = $time_array['days'];
1638 
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
1638 
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
1639 1639 
 		$hours = $time_array['hours'];
1640 
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
1640 
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
1641 1641 
 		$minutes = $time_array['minutes'];
1642 
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
1642 
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
1643 1643
1644 1644 
 		return $time_array;
1645 1645 
 	}
 
@@ -1662,63 +1662,63 @@  discard block
 
 block discarded – undo
1662 1662 
 			$temp_array['direction_degree'] = $direction;
1663 1663 
 			$temp_array['direction_shortname'] = "N";
1664 1664 
 			$temp_array['direction_fullname'] = "North";
1665 
-		} elseif ($direction >= 22.5 && $direction < 45){
1665 
+		} elseif ($direction >= 22.5 && $direction < 45) {
1666 1666 
 			$temp_array['direction_degree'] = $direction;
1667 1667 
 			$temp_array['direction_shortname'] = "NNE";
1668 1668 
 			$temp_array['direction_fullname'] = "North-Northeast";
1669 
-		} elseif ($direction >= 45 && $direction < 67.5){
1669 
+		} elseif ($direction >= 45 && $direction < 67.5) {
1670 1670 
 			$temp_array['direction_degree'] = $direction;
1671 1671 
 			$temp_array['direction_shortname'] = "NE";
1672 1672 
 			$temp_array['direction_fullname'] = "Northeast";
1673 
-		} elseif ($direction >= 67.5 && $direction < 90){
1673 
+		} elseif ($direction >= 67.5 && $direction < 90) {
1674 1674 
 			$temp_array['direction_degree'] = $direction;
1675 1675 
 			$temp_array['direction_shortname'] = "ENE";
1676 1676 
 			$temp_array['direction_fullname'] = "East-Northeast";
1677 
-		} elseif ($direction >= 90 && $direction < 112.5){
1677 
+		} elseif ($direction >= 90 && $direction < 112.5) {
1678 1678 
 			$temp_array['direction_degree'] = $direction;
1679 1679 
 			$temp_array['direction_shortname'] = "E";
1680 1680 
 			$temp_array['direction_fullname'] = "East";
1681 
-		} elseif ($direction >= 112.5 && $direction < 135){
1681 
+		} elseif ($direction >= 112.5 && $direction < 135) {
1682 1682 
 			$temp_array['direction_degree'] = $direction;
1683 1683 
 			$temp_array['direction_shortname'] = "ESE";
1684 1684 
 			$temp_array['direction_fullname'] = "East-Southeast";
1685 
-		} elseif ($direction >= 135 && $direction < 157.5){
1685 
+		} elseif ($direction >= 135 && $direction < 157.5) {
1686 1686 
 			$temp_array['direction_degree'] = $direction;
1687 1687 
 			$temp_array['direction_shortname'] = "SE";
1688 1688 
 			$temp_array['direction_fullname'] = "Southeast";
1689 
-		} elseif ($direction >= 157.5 && $direction < 180){
1689 
+		} elseif ($direction >= 157.5 && $direction < 180) {
1690 1690 
 			$temp_array['direction_degree'] = $direction;
1691 1691 
 			$temp_array['direction_shortname'] = "SSE";
1692 1692 
 			$temp_array['direction_fullname'] = "South-Southeast";
1693 
-		} elseif ($direction >= 180 && $direction < 202.5){
1693 
+		} elseif ($direction >= 180 && $direction < 202.5) {
1694 1694 
 			$temp_array['direction_degree'] = $direction;
1695 1695 
 			$temp_array['direction_shortname'] = "S";
1696 1696 
 			$temp_array['direction_fullname'] = "South";
1697 
-		} elseif ($direction >= 202.5 && $direction < 225){
1697 
+		} elseif ($direction >= 202.5 && $direction < 225) {
1698 1698 
 			$temp_array['direction_degree'] = $direction;
1699 1699 
 			$temp_array['direction_shortname'] = "SSW";
1700 1700 
 			$temp_array['direction_fullname'] = "South-Southwest";
1701 
-		} elseif ($direction >= 225 && $direction < 247.5){
1701 
+		} elseif ($direction >= 225 && $direction < 247.5) {
1702 1702 
 			$temp_array['direction_degree'] = $direction;
1703 1703 
 			$temp_array['direction_shortname'] = "SW";
1704 1704 
 			$temp_array['direction_fullname'] = "Southwest";
1705 
-		} elseif ($direction >= 247.5 && $direction < 270){
1705 
+		} elseif ($direction >= 247.5 && $direction < 270) {
1706 1706 
 			$temp_array['direction_degree'] = $direction;
1707 1707 
 			$temp_array['direction_shortname'] = "WSW";
1708 1708 
 			$temp_array['direction_fullname'] = "West-Southwest";
1709 
-		} elseif ($direction >= 270 && $direction < 292.5){
1709 
+		} elseif ($direction >= 270 && $direction < 292.5) {
1710 1710 
 			$temp_array['direction_degree'] = $direction;
1711 1711 
 			$temp_array['direction_shortname'] = "W";
1712 1712 
 			$temp_array['direction_fullname'] = "West";
1713 
-		} elseif ($direction >= 292.5 && $direction < 315){
1713 
+		} elseif ($direction >= 292.5 && $direction < 315) {
1714 1714 
 			$temp_array['direction_degree'] = $direction;
1715 1715 
 			$temp_array['direction_shortname'] = "WNW";
1716 1716 
 			$temp_array['direction_fullname'] = "West-Northwest";
1717 
-		} elseif ($direction >= 315 && $direction < 337.5){
1717 
+		} elseif ($direction >= 315 && $direction < 337.5) {
1718 1718 
 			$temp_array['direction_degree'] = $direction;
1719 1719 
 			$temp_array['direction_shortname'] = "NW";
1720 1720 
 			$temp_array['direction_fullname'] = "Northwest";
1721 
-		} elseif ($direction >= 337.5 && $direction < 360){
1721 
+		} elseif ($direction >= 337.5 && $direction < 360) {
1722 1722 
 			$temp_array['direction_degree'] = $direction;
1723 1723 
 			$temp_array['direction_shortname'] = "NNW";
1724 1724 
 			$temp_array['direction_fullname'] = "North-Northwest";
 
@@ -1735,11 +1735,11 @@  discard block
 
 block discarded – undo
1735 1735 
 	* @param Float $longitude longitute of the flight
1736 1736 
 	* @return String the countrie
1737 1737 
 	*/
1738 
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
1738 
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
1739 1739 
 	{
1740 1740 
 		global $globalDBdriver, $globalDebug;
1741 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1742 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1741 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1742 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1743 1743
1744 1744 
 		$Connection = new Connection($this->db);
1745 1745 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -1779,7 +1779,7 @@  discard block
 
 block discarded – undo
1779 1779 
 	public function getCountryFromISO2($iso2)
1780 1780 
 	{
1781 1781 
 		global $globalDBdriver, $globalDebug;
1782 
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1782 
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
1783 1783
1784 1784 
 		$Connection = new Connection($this->db);
1785 1785 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -1827,7 +1827,7 @@  discard block
 
 block discarded – undo
1827 1827
1828 1828 
 		$bitly_data = json_decode($bitly_data);
1829 1829 
 		$bitly_url = '';
1830 
-		if ($bitly_data->status_txt = "OK"){
1830 
+		if ($bitly_data->status_txt = "OK") {
1831 1831 
 			$bitly_url = $bitly_data->data->url;
1832 1832 
 		}
1833 1833 
 
@@ -1841,11 +1841,11 @@  discard block
 
 block discarded – undo
1841 1841 
 	* @return Array the vessel type list
1842 1842 
 	*
1843 1843 
 	*/
1844 
-	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
1844 
+	public function countAllMarineTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
1845 1845 
 	{
1846 1846 
 		global $globalDBdriver;
1847 
-		$filter_query = $this->getFilter($filters,true,true);
1848 
-		$query  = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count, marine_output.type_id AS marine_type_id
1847 
+		$filter_query = $this->getFilter($filters, true, true);
1848 
+		$query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count, marine_output.type_id AS marine_type_id
1849 1849 
 		    FROM marine_output ".$filter_query." marine_output.type <> '' AND marine_output.type_id IS NOT NULL";
1850 1850 
 		if ($olderthanmonths > 0) {
1851 1851 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1865,28 +1865,28 @@  discard block
 
 block discarded – undo
1865 1865 
 		if ($year != '') {
1866 1866 
 			if ($globalDBdriver == 'mysql') {
1867 1867 
 				$query .= " AND YEAR(marine_output.date) = :year";
1868 
-				$query_values = array_merge($query_values,array(':year' => $year));
1868 
+				$query_values = array_merge($query_values, array(':year' => $year));
1869 1869 
 			} else {
1870 1870 
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
1871 
-				$query_values = array_merge($query_values,array(':year' => $year));
1871 
+				$query_values = array_merge($query_values, array(':year' => $year));
1872 1872 
 			}
1873 1873 
 		}
1874 1874 
 		if ($month != '') {
1875 1875 
 			if ($globalDBdriver == 'mysql') {
1876 1876 
 				$query .= " AND MONTH(marine_output.date) = :month";
1877 
-				$query_values = array_merge($query_values,array(':month' => $month));
1877 
+				$query_values = array_merge($query_values, array(':month' => $month));
1878 1878 
 			} else {
1879 1879 
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
1880 
-				$query_values = array_merge($query_values,array(':month' => $month));
1880 
+				$query_values = array_merge($query_values, array(':month' => $month));
1881 1881 
 			}
1882 1882 
 		}
1883 1883 
 		if ($day != '') {
1884 1884 
 			if ($globalDBdriver == 'mysql') {
1885 1885 
 				$query .= " AND DAY(marine_output.date) = :day";
1886 
-				$query_values = array_merge($query_values,array(':day' => $day));
1886 
+				$query_values = array_merge($query_values, array(':day' => $day));
1887 1887 
 			} else {
1888 1888 
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
1889 
-				$query_values = array_merge($query_values,array(':day' => $day));
1889 
+				$query_values = array_merge($query_values, array(':day' => $day));
1890 1890 
 			}
1891 1891 
 		}
1892 1892 
 		$query .= " GROUP BY marine_output.type, marine_output.type_id ORDER BY marine_type_count DESC";
 
@@ -1895,7 +1895,7 @@  discard block
 
 block discarded – undo
1895 1895 
 		$sth->execute($query_values);
1896 1896 
 		$marine_array = array();
1897 1897 
 		$temp_array = array();
1898 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1898 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1899 1899 
 		{
1900 1900 
 			$temp_array['marine_type'] = $row['marine_type'];
1901 1901 
 			$temp_array['marine_type_id'] = $row['marine_type_id'];
 
@@ -1911,13 +1911,13 @@  discard block
 
 block discarded – undo
1911 1911 
 	* @return Array the tracker information
1912 1912 
 	*
1913 1913 
 	*/
1914 
-	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
1914 
+	public function searchMarineData($q = '', $callsign = '', $mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
1915 1915 
 	{
1916 1916 
 		global $globalTimezone, $globalDBdriver;
1917 1917 
 		date_default_timezone_set('UTC');
1918 1918 
 		$query_values = array();
1919 1919 
 		$additional_query = '';
1920 
-		$filter_query = $this->getFilter($filters,true,true);
1920 
+		$filter_query = $this->getFilter($filters, true, true);
1921 1921 
 		if ($q != "")
1922 1922 
 		{
1923 1923 
 			if (!is_string($q))
 
@@ -1925,8 +1925,8 @@  discard block
 
 block discarded – undo
1925 1925 
 				return false;
1926 1926 
 			} else {
1927 1927 
 				$q_array = explode(" ", $q);
1928 
-				foreach ($q_array as $q_item){
1929 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
1928 
+				foreach ($q_array as $q_item) {
1929 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
1930 1930 
 					$additional_query .= " AND (";
1931 1931 
 					if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
1932 1932 
 					if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
 
@@ -1938,42 +1938,42 @@  discard block
 
 block discarded – undo
1938 1938 
 		}
1939 1939 
 		if ($callsign != "")
1940 1940 
 		{
1941 
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
1941 
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
1942 1942 
 			if (!is_string($callsign))
1943 1943 
 			{
1944 1944 
 				return false;
1945 1945 
 			} else {
1946 1946 
 				$additional_query .= " AND marine_output.ident = :callsign";
1947 
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
1947 
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
1948 1948 
 			}
1949 1949 
 		}
1950 1950 
 		if ($mmsi != "")
1951 1951 
 		{
1952 
-			$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
1952 
+			$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
1953 1953 
 			if (!is_numeric($mmsi))
1954 1954 
 			{
1955 1955 
 				return false;
1956 1956 
 			} else {
1957 1957 
 				$additional_query .= " AND marine_output.mmsi = :mmsi";
1958 
-				$query_values = array_merge($query_values,array(':mmsi' => $mmsi));
1958 
+				$query_values = array_merge($query_values, array(':mmsi' => $mmsi));
1959 1959 
 			}
1960 1960 
 		}
1961 1961 
 		if ($imo != "")
1962 1962 
 		{
1963 
-			$imo = filter_var($imo,FILTER_SANITIZE_STRING);
1963 
+			$imo = filter_var($imo, FILTER_SANITIZE_STRING);
1964 1964 
 			if (!is_numeric($imo))
1965 1965 
 			{
1966 1966 
 				return false;
1967 1967 
 			} else {
1968 1968 
 				$additional_query .= " AND marine_output.imo = :imo";
1969 
-				$query_values = array_merge($query_values,array(':imo' => $imo));
1969 
+				$query_values = array_merge($query_values, array(':imo' => $imo));
1970 1970 
 			}
1971 1971 
 		}
1972 1972 
 		if ($date_posted != "")
1973 1973 
 		{
1974 1974 
 			$date_array = explode(",", $date_posted);
1975 
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
1976 
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
1975 
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
1976 
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
1977 1977 
 			if ($globalTimezone != '') {
1978 1978 
 				date_default_timezone_set($globalTimezone);
1979 1979 
 				$datetime = new DateTime();
 
@@ -2000,8 +2000,8 @@  discard block
 
 block discarded – undo
2000 2000 
 		if ($limit != "")
2001 2001 
 		{
2002 2002 
 			$limit_array = explode(",", $limit);
2003 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
2004 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
2003 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
2004 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
2005 2005 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
2006 2006 
 			{
2007 2007 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
 
@@ -2019,28 +2019,28 @@  discard block
 
 block discarded – undo
2019 2019 
 			}
2020 2020 
 		}
2021 2021 
 		if ($origLat != "" && $origLon != "" && $dist != "") {
2022 
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
2022 
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
2023 2023 
 			if ($globalDBdriver == 'mysql') {
2024 
-				$query="SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance
2024 
+				$query = "SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance
2025 2025 
 				    FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND marine_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and marine_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
2026 2026 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
2027 2027 
 			} else {
2028 
-				$query="SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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
2028 
+				$query = "SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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
2029 2029 
 				    FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
2030 2030 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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.$orderby_query;
2031 2031 
 			}
2032 2032 
 		} else {
2033 
-			$query  = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> ''
2033 
+			$query = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> ''
2034 2034 
 			    ".$additional_query."
2035 2035 
 			    ".$orderby_query;
2036 2036 
 		}
2037 
-		$marine_array = $this->getDataFromDB($query, $query_values,$limit_query);
2037 
+		$marine_array = $this->getDataFromDB($query, $query_values, $limit_query);
2038 2038 
 		return $marine_array;
2039 2039 
 	}
2040 2040
2041 2041 
 	public function getOrderBy()
2042 2042 
 	{
2043 
-		$orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY marine_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY marine_output.type DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
2043 
+		$orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY marine_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY marine_output.type DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
2044 2044
2045 2045 
 		return $orderby;
2046 2046
Please login to merge, or discard this patch.
Braces   +206 added lines, -73 removed lines patch added patch discarded remove patch 
@@ -8,7 +8,9 @@  discard block
 
 block discarded – undo
8 8 
 	public function __construct($dbc = null) {
9 9 
 		$Connection = new Connection($dbc);
10 10 
 		$this->db = $Connection->db();
11 
-		if ($this->db === null) die('Error: No DB connection. (Marine)');
11 
+		if ($this->db === null) {
12 
+			die('Error: No DB connection. (Marine)');
13 
+		}
12 14 
 	}
13 15
14 16 
 	/**
 
@@ -30,7 +32,9 @@  discard block
 
 block discarded – undo
30 32 
 		if (isset($filter[0]['source'])) {
31 33 
 			$filters = array_merge($filters,$filter);
32 34 
 		}
33 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
35 
+		if (is_array($globalFilter)) {
36 
+			$filter = array_merge($filter,$globalFilter);
37 
+		}
34 38 
 		$filter_query_join = '';
35 39 
 		$filter_query_where = '';
36 40 
 		foreach($filters as $flt) {
 
@@ -72,8 +76,11 @@  discard block
 
 block discarded – undo
72 76 
 				$filter_query_where .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'";
73 77 
 			}
74 78 
 		}
75 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
76 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
79 
+		if ($filter_query_where == '' && $where) {
80 
+			$filter_query_where = ' WHERE';
81 
+		} elseif ($filter_query_where != '' && $and) {
82 
+			$filter_query_where .= ' AND';
83 
+		}
77 84 
 		if ($filter_query_where != '') {
78 85 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
79 86 
 		}
 
@@ -127,35 +134,63 @@  discard block
 
 block discarded – undo
127 134 
 				$temp_array['spotter_id'] = $row['spotter_archive_id'];
128 135 
 			} elseif (isset($row['spotter_archive_output_id'])) {
129 136 
 				$temp_array['spotter_id'] = $row['spotter_archive_output_id'];
130 
-			*/}
131 
-			elseif (isset($row['marineid'])) {
137 
+			*/} elseif (isset($row['marineid'])) {
132 138 
 				$temp_array['marine_id'] = $row['marineid'];
133 139 
 			} else {
134 140 
 				$temp_array['marine_id'] = '';
135 141 
 			}
136 
-			if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id'];
137 
-			if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi'];
138 
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
139 
-			if (isset($row['type_id'])) $temp_array['type_id'] = $row['type_id'];
140 
-			if (isset($row['status'])) $temp_array['status'] = $row['status'];
141 
-			if (isset($row['status_id'])) $temp_array['status_id'] = $row['status_id'];
142 
-			if (isset($row['ident'])) $temp_array['ident'] = $row['ident'];
143 
-			if (isset($row['arrival_port_name'])) $temp_array['arrival_port_name'] = $row['arrival_port_name'];
144 
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
145 
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
146 
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
142 
+			if (isset($row['fammarine_id'])) {
143 
+				$temp_array['fammarine_id'] = $row['fammarine_id'];
144 
+			}
145 
+			if (isset($row['mmsi'])) {
146 
+				$temp_array['mmsi'] = $row['mmsi'];
147 
+			}
148 
+			if (isset($row['type'])) {
149 
+				$temp_array['type'] = $row['type'];
150 
+			}
151 
+			if (isset($row['type_id'])) {
152 
+				$temp_array['type_id'] = $row['type_id'];
153 
+			}
154 
+			if (isset($row['status'])) {
155 
+				$temp_array['status'] = $row['status'];
156 
+			}
157 
+			if (isset($row['status_id'])) {
158 
+				$temp_array['status_id'] = $row['status_id'];
159 
+			}
160 
+			if (isset($row['ident'])) {
161 
+				$temp_array['ident'] = $row['ident'];
162 
+			}
163 
+			if (isset($row['arrival_port_name'])) {
164 
+				$temp_array['arrival_port_name'] = $row['arrival_port_name'];
165 
+			}
166 
+			if (isset($row['latitude'])) {
167 
+				$temp_array['latitude'] = $row['latitude'];
168 
+			}
169 
+			if (isset($row['longitude'])) {
170 
+				$temp_array['longitude'] = $row['longitude'];
171 
+			}
172 
+			if (isset($row['format_source'])) {
173 
+				$temp_array['format_source'] = $row['format_source'];
174 
+			}
147 175 
 			if (isset($row['heading'])) {
148 176 
 				$temp_array['heading'] = $row['heading'];
149 177 
 				$heading_direction = $this->parseDirection($row['heading']);
150 
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
178 
+				if (isset($heading_direction[0]['direction_fullname'])) {
179 
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
180 
+				}
181 
+			}
182 
+			if (isset($row['ground_speed'])) {
183 
+				$temp_array['ground_speed'] = $row['ground_speed'];
151 184 
 			}
152 
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
153 185
154 186 
 			if(isset($temp_array['mmsi']) && $temp_array['mmsi'] != "")
155 187 
 			{
156 188 
 				$Image = new Image($this->db);
157 
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
158 
-				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
189 
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') {
190 
+					$image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
191 
+				} else {
192 
+					$image_array = $Image->getMarineImage($temp_array['mmsi']);
193 
+				}
159 194 
 				unset($Image);
160 195 
 				if (count($image_array) > 0) {
161 196 
 					$temp_array['image'] = $image_array[0]['image'];
 
@@ -207,13 +242,21 @@  discard block
 
 block discarded – undo
207 242 
 			}
208 243
209 244 
 			$fromsource = NULL;
210 
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
211 
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
212 
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
245 
+			if (isset($row['source_name']) && $row['source_name'] != '') {
246 
+				$temp_array['source_name'] = $row['source_name'];
247 
+			}
248 
+			if (isset($row['over_country']) && $row['over_country'] != '') {
249 
+				$temp_array['over_country'] = $row['over_country'];
250 
+			}
251 
+			if (isset($row['distance']) && $row['distance'] != '') {
252 
+				$temp_array['distance'] = $row['distance'];
253 
+			}
213 254 
 			$temp_array['query_number_rows'] = $num_rows;
214 255 
 			$spotter_array[] = $temp_array;
215 256 
 		}
216 
-		if ($num_rows == 0) return array();
257 
+		if ($num_rows == 0) {
258 
+			return array();
259 
+		}
217 260 
 		$spotter_array[0]['query_number_rows'] = $num_rows;
218 261 
 		return $spotter_array;
219 262 
 	}	
@@ -239,8 +282,12 @@  discard block
 
 block discarded – undo
239 282 
 			{
240 283 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
241 284 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
242 
-			} else $limit_query = "";
243 
-		} else $limit_query = "";
285 
+			} else {
286 
+				$limit_query = "";
287 
+			}
288 
+		} else {
289 
+			$limit_query = "";
290 
+		}
244 291 
 		if ($sort != "")
245 292 
 		{
246 293 
 			$search_orderby_array = $this->getOrderBy();
 
@@ -264,7 +311,9 @@  discard block
 
 block discarded – undo
264 311 
 		global $global_query;
265 312
266 313 
 		date_default_timezone_set('UTC');
267 
-		if ($id == '') return array();
314 
+		if ($id == '') {
315 
+			return array();
316 
+		}
268 317 
 		$additional_query = "marine_output.fammarine_id = :id";
269 318 
 		$query_values = array(':id' => $id);
270 319 
 		$query  = $global_query." WHERE ".$additional_query." ";
 
@@ -460,8 +509,11 @@  discard block
 
 block discarded – undo
460 509 
 		$query .= " ORDER BY marine_output.source_name ASC";
461 510
462 511 
 		$sth = $this->db->prepare($query);
463 
-		if (!empty($query_values)) $sth->execute($query_values);
464 
-		else $sth->execute();
512 
+		if (!empty($query_values)) {
513 
+			$sth->execute($query_values);
514 
+		} else {
515 
+			$sth->execute();
516 
+		}
465 517
466 518 
 		$source_array = array();
467 519 
 		$temp_array = array();
 
@@ -516,8 +568,11 @@  discard block
 
 block discarded – undo
516 568 
 		$sth = $this->db->prepare($query);
517 569 
 		$sth->execute(array(':mmsi' => $mmsi));
518 570 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
519 
-		if (isset($result[0])) return $result[0];
520 
-		else return array();
571 
+		if (isset($result[0])) {
572 
+			return $result[0];
573 
+		} else {
574 
+			return array();
575 
+		}
521 576 
 	}
522 577
523 578 
 	/**
 
@@ -558,7 +613,9 @@  discard block
 
 block discarded – undo
558 613 
 			date_default_timezone_set($globalTimezone);
559 614 
 			$datetime = new DateTime();
560 615 
 			$offset = $datetime->format('P');
561 
-		} else $offset = '+00:00';
616 
+		} else {
617 
+			$offset = '+00:00';
618 
+		}
562 619
563 620 
 		if ($globalDBdriver == 'mysql') {
564 621 
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
 
@@ -804,11 +861,21 @@  discard block
 
 block discarded – undo
804 861 
 			$latitude = 0;
805 862 
 			$longitude = 0;
806 863 
 		}
807 
-		if ($type_id == '') $type_id = NULL;
808 
-		if ($status_id == '') $status_id = NULL;
809 
-		if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
810 
-		if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
811 
-		if ($arrival_date == '') $arrival_date = NULL;
864 
+		if ($type_id == '') {
865 
+			$type_id = NULL;
866 
+		}
867 
+		if ($status_id == '') {
868 
+			$status_id = NULL;
869 
+		}
870 
+		if ($heading == '' || $Common->isInteger($heading) === false) {
871 
+			$heading = 0;
872 
+		}
873 
+		if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
874 
+			$groundspeed = 0;
875 
+		}
876 
+		if ($arrival_date == '') {
877 
+			$arrival_date = NULL;
878 
+		}
812 879 
 		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, type_id, status,status_id,imo,arrival_port_name,arrival_port_date)
813 880 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:type_id,:status,:status_id,:imo,:arrival_port_name,:arrival_port_date)";
814 881 
 
@@ -915,7 +982,9 @@  discard block
 
 block discarded – undo
915 982 
 		global $globalDBdriver, $globalArchive;
916 983 
 		//$filter_query = $this->getFilter($filters,true,true);
917 984 
 		$Connection= new Connection($this->db);
918 
-		if (!$Connection->tableExists('countries')) return array();
985 
+		if (!$Connection->tableExists('countries')) {
986 
+			return array();
987 
+		}
919 988 
 		require_once('class.SpotterLive.php');
920 989 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
921 990 
 			$MarineLive = new MarineLive($this->db);
 
@@ -959,7 +1028,9 @@  discard block
 
 block discarded – undo
959 1028 
 			$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT fammarine_id,over_country FROM marine_archive".$filter_query.") l ON c.iso2 = l.over_country ";
960 1029 
 		}
961 1030 
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
962 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
1031 
+		if ($limit) {
1032 
+			$query .= " LIMIT 10 OFFSET 0";
1033 
+		}
963 1034
964 1035 
 		$sth = $this->db->prepare($query);
965 1036 
 		$sth->execute();
 
@@ -993,12 +1064,18 @@  discard block
 
 block discarded – undo
993 1064 
 		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count
994 1065 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
995 1066 
 		 if ($olderthanmonths > 0) {
996 
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
997 
-			else $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1067 
+			if ($globalDBdriver == 'mysql') {
1068 
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
1069 
+			} else {
1070 
+				$query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1071 
+			}
998 1072 
 		}
999 1073 
 		if ($sincedate != '') {
1000 
-			if ($globalDBdriver == 'mysql') $query .= " AND marine_output.date > '".$sincedate."'";
1001 
-			else $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
1074 
+			if ($globalDBdriver == 'mysql') {
1075 
+				$query .= " AND marine_output.date > '".$sincedate."'";
1076 
+			} else {
1077 
+				$query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
1078 
+			}
1002 1079 
 		}
1003 1080 
 		$query_values = array();
1004 1081 
 		if ($year != '') {
 
@@ -1029,7 +1106,9 @@  discard block
 
 block discarded – undo
1029 1106 
 			}
1030 1107 
 		}
1031 1108 
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
1032 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
1109 
+		if ($limit) {
1110 
+			$query .= " LIMIT 10 OFFSET 0";
1111 
+		}
1033 1112
1034 1113 
 		$sth = $this->db->prepare($query);
1035 1114 
 		$sth->execute($query_values);
 
@@ -1064,7 +1143,9 @@  discard block
 
 block discarded – undo
1064 1143 
 			date_default_timezone_set($globalTimezone);
1065 1144 
 			$datetime = new DateTime();
1066 1145 
 			$offset = $datetime->format('P');
1067 
-		} else $offset = '+00:00';
1146 
+		} else {
1147 
+			$offset = '+00:00';
1148 
+		}
1068 1149
1069 1150 
 		if ($globalDBdriver == 'mysql') {
1070 1151 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1114,7 +1195,9 @@  discard block
 
 block discarded – undo
1114 1195 
 			date_default_timezone_set($globalTimezone);
1115 1196 
 			$datetime = new DateTime();
1116 1197 
 			$offset = $datetime->format('P');
1117 
-		} else $offset = '+00:00';
1198 
+		} else {
1199 
+			$offset = '+00:00';
1200 
+		}
1118 1201 
 		$filter_query = $this->getFilter($filters,true,true);
1119 1202 
 		if ($globalDBdriver == 'mysql') {
1120 1203 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1160,7 +1243,9 @@  discard block
 
 block discarded – undo
1160 1243 
 			date_default_timezone_set($globalTimezone);
1161 1244 
 			$datetime = new DateTime();
1162 1245 
 			$offset = $datetime->format('P');
1163 
-		} else $offset = '+00:00';
1246 
+		} else {
1247 
+			$offset = '+00:00';
1248 
+		}
1164 1249 
 		$filter_query = $this->getFilter($filters,true,true);
1165 1250 
 		if ($globalDBdriver == 'mysql') {
1166 1251 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1208,7 +1293,9 @@  discard block
 
 block discarded – undo
1208 1293 
 			date_default_timezone_set($globalTimezone);
1209 1294 
 			$datetime = new DateTime();
1210 1295 
 			$offset = $datetime->format('P');
1211 
-		} else $offset = '+00:00';
1296 
+		} else {
1297 
+			$offset = '+00:00';
1298 
+		}
1212 1299
1213 1300 
 		if ($globalDBdriver == 'mysql') {
1214 1301 
 			$query  = "SELECT YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
 
@@ -1257,7 +1344,9 @@  discard block
 
 block discarded – undo
1257 1344 
 			date_default_timezone_set($globalTimezone);
1258 1345 
 			$datetime = new DateTime();
1259 1346 
 			$offset = $datetime->format('P');
1260 
-		} else $offset = '+00:00';
1347 
+		} else {
1348 
+			$offset = '+00:00';
1349 
+		}
1261 1350 
 		$filter_query = $this->getFilter($filters,true,true);
1262 1351 
 		if ($globalDBdriver == 'mysql') {
1263 1352 
 			$query  = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 
@@ -1306,7 +1395,9 @@  discard block
 
 block discarded – undo
1306 1395 
 			date_default_timezone_set($globalTimezone);
1307 1396 
 			$datetime = new DateTime();
1308 1397 
 			$offset = $datetime->format('P');
1309 
-		} else $offset = '+00:00';
1398 
+		} else {
1399 
+			$offset = '+00:00';
1400 
+		}
1310 1401
1311 1402 
 		$orderby_sql = '';
1312 1403 
 		if ($orderby == "hour")
 
@@ -1375,7 +1466,9 @@  discard block
 
 block discarded – undo
1375 1466 
 			date_default_timezone_set($globalTimezone);
1376 1467 
 			$datetime = new DateTime($date);
1377 1468 
 			$offset = $datetime->format('P');
1378 
-		} else $offset = '+00:00';
1469 
+		} else {
1470 
+			$offset = '+00:00';
1471 
+		}
1379 1472
1380 1473 
 		if ($globalDBdriver == 'mysql') {
1381 1474 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1423,7 +1516,9 @@  discard block
 
 block discarded – undo
1423 1516 
 			date_default_timezone_set($globalTimezone);
1424 1517 
 			$datetime = new DateTime();
1425 1518 
 			$offset = $datetime->format('P');
1426 
-		} else $offset = '+00:00';
1519 
+		} else {
1520 
+			$offset = '+00:00';
1521 
+		}
1427 1522
1428 1523 
 		if ($globalDBdriver == 'mysql') {
1429 1524 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1488,8 +1583,11 @@  discard block
 
 block discarded – undo
1488 1583 
 				$query_values = array_merge($query_values,array(':month' => $month));
1489 1584 
 			}
1490 1585 
 		}
1491 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1492 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1586 
+		if (empty($query_values)) {
1587 
+			$queryi .= $this->getFilter($filters);
1588 
+		} else {
1589 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1590 
+		}
1493 1591
1494 1592 
 		$sth = $this->db->prepare($queryi);
1495 1593 
 		$sth->execute($query_values);
 
@@ -1526,8 +1624,11 @@  discard block
 
 block discarded – undo
1526 1624 
 				$query_values = array_merge($query_values,array(':month' => $month));
1527 1625 
 			}
1528 1626 
 		}
1529 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1530 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1627 
+		if (empty($query_values)) {
1628 
+			$queryi .= $this->getFilter($filters);
1629 
+		} else {
1630 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1631 
+		}
1531 1632
1532 1633 
 		$sth = $this->db->prepare($queryi);
1533 1634 
 		$sth->execute($query_values);
 
@@ -1549,7 +1650,9 @@  discard block
 
 block discarded – undo
1549 1650 
 			date_default_timezone_set($globalTimezone);
1550 1651 
 			$datetime = new DateTime();
1551 1652 
 			$offset = $datetime->format('P');
1552 
-		} else $offset = '+00:00';
1653 
+		} else {
1654 
+			$offset = '+00:00';
1655 
+		}
1553 1656
1554 1657 
 		if ($globalDBdriver == 'mysql') {
1555 1658 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1653,7 +1756,9 @@  discard block
 
 block discarded – undo
1653 1756 
 	*/
1654 1757 
 	public function parseDirection($direction = 0)
1655 1758 
 	{
1656 
-		if ($direction == '') $direction = 0;
1759 
+		if ($direction == '') {
1760 
+			$direction = 0;
1761 
+		}
1657 1762 
 		$direction_array = array();
1658 1763 
 		$temp_array = array();
1659 1764 
 
@@ -1742,7 +1847,9 @@  discard block
 
 block discarded – undo
1742 1847 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1743 1848
1744 1849 
 		$Connection = new Connection($this->db);
1745 
-		if (!$Connection->tableExists('countries')) return '';
1850 
+		if (!$Connection->tableExists('countries')) {
1851 
+			return '';
1852 
+		}
1746 1853
1747 1854 
 		try {
1748 1855 
 			/*
 
@@ -1762,9 +1869,13 @@  discard block
 
 block discarded – undo
1762 1869 
 			$sth->closeCursor();
1763 1870 
 			if (count($row) > 0) {
1764 1871 
 				return $row;
1765 
-			} else return '';
1872 
+			} else {
1873 
+				return '';
1874 
+			}
1766 1875 
 		} catch (PDOException $e) {
1767 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1876 
+			if (isset($globalDebug) && $globalDebug) {
1877 
+				echo 'Error : '.$e->getMessage()."\n";
1878 
+			}
1768 1879 
 			return '';
1769 1880 
 		}
1770 1881 
 	
@@ -1782,7 +1893,9 @@  discard block
 
 block discarded – undo
1782 1893 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1783 1894
1784 1895 
 		$Connection = new Connection($this->db);
1785 
-		if (!$Connection->tableExists('countries')) return '';
1896 
+		if (!$Connection->tableExists('countries')) {
1897 
+			return '';
1898 
+		}
1786 1899
1787 1900 
 		try {
1788 1901 
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
 
@@ -1794,9 +1907,13 @@  discard block
 
 block discarded – undo
1794 1907 
 			$sth->closeCursor();
1795 1908 
 			if (count($row) > 0) {
1796 1909 
 				return $row;
1797 
-			} else return '';
1910 
+			} else {
1911 
+				return '';
1912 
+			}
1798 1913 
 		} catch (PDOException $e) {
1799 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1914 
+			if (isset($globalDebug) && $globalDebug) {
1915 
+				echo 'Error : '.$e->getMessage()."\n";
1916 
+			}
1800 1917 
 			return '';
1801 1918 
 		}
1802 1919 
 	
@@ -1814,7 +1931,9 @@  discard block
 
 block discarded – undo
1814 1931 
 	{
1815 1932 
 		global $globalBitlyAccessToken;
1816 1933
1817 
-		if ($globalBitlyAccessToken == '') return $url;
1934 
+		if ($globalBitlyAccessToken == '') {
1935 
+			return $url;
1936 
+		}
1818 1937
1819 1938 
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
1820 1939 
 		
@@ -1890,7 +2009,9 @@  discard block
 
 block discarded – undo
1890 2009 
 			}
1891 2010 
 		}
1892 2011 
 		$query .= " GROUP BY marine_output.type, marine_output.type_id ORDER BY marine_type_count DESC";
1893 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
2012 
+		if ($limit) {
2013 
+			$query .= " LIMIT 10 OFFSET 0";
2014 
+		}
1894 2015 
 		$sth = $this->db->prepare($query);
1895 2016 
 		$sth->execute($query_values);
1896 2017 
 		$marine_array = array();
 
@@ -1928,9 +2049,15 @@  discard block
 
 block discarded – undo
1928 2049 
 				foreach ($q_array as $q_item){
1929 2050 
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
1930 2051 
 					$additional_query .= " AND (";
1931 
-					if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
1932 
-					if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
1933 
-					if (is_int($q_item)) $additional_query .= "(marine_output.imo = '".$q_item."') OR ";
2052 
+					if (is_int($q_item)) {
2053 
+						$additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
2054 
+					}
2055 
+					if (is_int($q_item)) {
2056 
+						$additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
2057 
+					}
2058 
+					if (is_int($q_item)) {
2059 
+						$additional_query .= "(marine_output.imo = '".$q_item."') OR ";
2060 
+					}
1934 2061 
 					$additional_query .= "(marine_output.ident like '%".$q_item."%') OR ";
1935 2062 
 					$additional_query .= ")";
1936 2063 
 				}
 
@@ -1978,7 +2105,9 @@  discard block
 
 block discarded – undo
1978 2105 
 				date_default_timezone_set($globalTimezone);
1979 2106 
 				$datetime = new DateTime();
1980 2107 
 				$offset = $datetime->format('P');
1981 
-			} else $offset = '+00:00';
2108 
+			} else {
2109 
+				$offset = '+00:00';
2110 
+			}
1982 2111 
 			if ($date_array[1] != "")
1983 2112 
 			{
1984 2113 
 				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 
@@ -2005,8 +2134,12 @@  discard block
 
 block discarded – undo
2005 2134 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
2006 2135 
 			{
2007 2136 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
2008 
-			} else $limit_query = "";
2009 
-		} else $limit_query = "";
2137 
+			} else {
2138 
+				$limit_query = "";
2139 
+			}
2140 
+		} else {
2141 
+			$limit_query = "";
2142 
+		}
2010 2143 
 		if ($sort != "")
2011 2144 
 		{
2012 2145 
 			$search_orderby_array = $this->getOrderBy();
Please login to merge, or discard this patch.
require/class.Tracker.php 4 patches
Doc Comments   +3 added lines, -32 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 	/**
17 17 
 	* Get SQL query part for filter used
18 18 
 	* @param Array $filter the filter
19 
-	* @return Array the SQL part
19 
+	* @return string the SQL part
20 20 
 	*/
21 21
22 22 
 	public function getFilter($filter = array(),$where = false,$and = false) {
 
@@ -487,9 +487,6 @@  discard block
 
 block discarded – undo
487 487 
 	/**
488 488 
 	* Update ident tracker data
489 489 
 	*
490 
-	* @param String $flightaware_id the ID from flightaware
491 
-	* @param String $ident the flight ident
492 
-	* @return String success or false
493 490 
 	*
494 491 
 	*/
495 492 
 	public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL)
 
@@ -511,10 +508,6 @@  discard block
 
 block discarded – undo
511 508 
 	/**
512 509 
 	* Update latest tracker data
513 510 
 	*
514 
-	* @param String $flightaware_id the ID from flightaware
515 
-	* @param String $ident the flight ident
516 
-	* @param String $arrival_airport_icao the arrival airport
517 
-	* @return String success or false
518 511 
 	*
519 512 
 	*/
520 513 
 	public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '')
 
@@ -536,29 +529,6 @@  discard block
 
 block discarded – undo
536 529 
 	/**
537 530 
 	* Adds a new tracker data
538 531 
 	*
539 
-	* @param String $flightaware_id the ID from flightaware
540 
-	* @param String $ident the flight ident
541 
-	* @param String $aircraft_icao the aircraft type
542 
-	* @param String $departure_airport_icao the departure airport
543 
-	* @param String $arrival_airport_icao the arrival airport
544 
-	* @param String $latitude latitude of flight
545 
-	* @param String $longitude latitude of flight
546 
-	* @param String $waypoints waypoints of flight
547 
-	* @param String $altitude altitude of flight
548 
-	* @param String $heading heading of flight
549 
-	* @param String $groundspeed speed of flight
550 
-	* @param String $date date of flight
551 
-	* @param String $departure_airport_time departure time of flight
552 
-	* @param String $arrival_airport_time arrival time of flight
553 
-	* @param String $squawk squawk code of flight
554 
-	* @param String $route_stop route stop of flight
555 
-	* @param String $highlight highlight or not
556 
-	* @param String $ModeS ModesS code of flight
557 
-	* @param String $registration registration code of flight
558 
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
559 
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
560 
-	* @param String $verticalrate vertival rate of flight
561 
-	* @return String success or false
562 532 
 	*/
563 533 
 	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '')
564 534 
 	{
 
@@ -1132,6 +1102,7 @@  discard block
 
 block discarded – undo
1132 1102 
 	/**
1133 1103 
 	* Counts all hours
1134 1104 
 	*
1105 
+	* @param string $orderby
1135 1106 
 	* @return Array the hour list
1136 1107 
 	*
1137 1108 
 	*/
 
@@ -1483,7 +1454,7 @@  discard block
 
 block discarded – undo
1483 1454 
 	/**
1484 1455 
 	* Parses the direction degrees to working
1485 1456 
 	*
1486 
-	* @param Float $direction the direction in degrees
1457 
+	* @param integer $direction the direction in degrees
1487 1458 
 	* @return Array the direction information
1488 1459 
 	*
1489 1460 
 	*/
Please login to merge, or discard this patch.
Indentation   +210 added lines, -210 removed lines patch added patch discarded remove patch 
@@ -14,10 +14,10 @@  discard block
 
 block discarded – undo
14 14 
 	}
15 15
16 16 
 	/**
17 
-	* Get SQL query part for filter used
18 
-	* @param Array $filter the filter
19 
-	* @return Array the SQL part
20 
-	*/
17 
+	 * Get SQL query part for filter used
18 
+	 * @param Array $filter the filter
19 
+	 * @return Array the SQL part
20 
+	 */
21 21
22 22 
 	public function getFilter($filter = array(),$where = false,$and = false) {
23 23 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 
@@ -81,14 +81,14 @@  discard block
 
 block discarded – undo
81 81 
 	}
82 82
83 83 
 	/**
84 
-	* Executes the SQL statements to get the tracker information
85 
-	*
86 
-	* @param String $query the SQL query
87 
-	* @param Array $params parameter of the query
88 
-	* @param String $limitQuery the limit query
89 
-	* @return Array the tracker information
90 
-	*
91 
-	*/
84 
+	 * Executes the SQL statements to get the tracker information
85 
+	 *
86 
+	 * @param String $query the SQL query
87 
+	 * @param Array $params parameter of the query
88 
+	 * @param String $limitQuery the limit query
89 
+	 * @return Array the tracker information
90 
+	 *
91 
+	 */
92 92 
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
93 93 
 	{
94 94 
 		date_default_timezone_set('UTC');
 
@@ -201,11 +201,11 @@  discard block
 
 block discarded – undo
201 201
202 202
203 203 
 	/**
204 
-	* Gets all the tracker information based on the latest data entry
205 
-	*
206 
-	* @return Array the tracker information
207 
-	*
208 
-	*/
204 
+	 * Gets all the tracker information based on the latest data entry
205 
+	 *
206 
+	 * @return Array the tracker information
207 
+	 *
208 
+	 */
209 209 
 	public function getLatestTrackerData($limit = '', $sort = '', $filter = array())
210 210 
 	{
211 211 
 		global $global_query;
 
@@ -263,11 +263,11 @@  discard block
 
 block discarded – undo
263 263 
 	}
264 264
265 265 
 	/**
266 
-	* Gets all the tracker information based on the callsign
267 
-	*
268 
-	* @return Array the tracker information
269 
-	*
270 
-	*/
266 
+	 * Gets all the tracker information based on the callsign
267 
+	 *
268 
+	 * @return Array the tracker information
269 
+	 *
270 
+	 */
271 271 
 	public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
272 272 
 	{
273 273 
 		global $global_query;
 
@@ -378,12 +378,12 @@  discard block
 
 block discarded – undo
378 378
379 379
380 380 
 	/**
381 
-	* Gets all source name
382 
-	*
383 
-	* @param String type format of source
384 
-	* @return Array list of source name
385 
-	*
386 
-	*/
381 
+	 * Gets all source name
382 
+	 *
383 
+	 * @param String type format of source
384 
+	 * @return Array list of source name
385 
+	 *
386 
+	 */
387 387 
 	public function getAllSourceName($type = '',$filters = array())
388 388 
 	{
389 389 
 		$filter_query = $this->getFilter($filters,true,true);
 
@@ -413,11 +413,11 @@  discard block
 
 block discarded – undo
413 413
414 414
415 415 
 	/**
416 
-	* Gets a list of all idents/callsigns
417 
-	*
418 
-	* @return Array list of ident/callsign names
419 
-	*
420 
-	*/
416 
+	 * Gets a list of all idents/callsigns
417 
+	 *
418 
+	 * @return Array list of ident/callsign names
419 
+	 *
420 
+	 */
421 421 
 	public function getAllIdents($filters = array())
422 422 
 	{
423 423 
 		$filter_query = $this->getFilter($filters,true,true);
 
@@ -485,18 +485,18 @@  discard block
 
 block discarded – undo
485 485
486 486
487 487 
 	/**
488 
-	* Update ident tracker data
489 
-	*
490 
-	* @param String $flightaware_id the ID from flightaware
491 
-	* @param String $ident the flight ident
492 
-	* @return String success or false
493 
-	*
494 
-	*/
488 
+	 * Update ident tracker data
489 
+	 *
490 
+	 * @param String $flightaware_id the ID from flightaware
491 
+	 * @param String $ident the flight ident
492 
+	 * @return String success or false
493 
+	 *
494 
+	 */
495 495 
 	public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL)
496 496 
 	{
497 497
498 498 
 		$query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid';
499 
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
499 
+				$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
500 500
501 501 
 		try {
502 502 
 			$sth = $this->db->prepare($query);
 
@@ -509,18 +509,18 @@  discard block
 
 block discarded – undo
509 509
510 510 
 	}
511 511 
 	/**
512 
-	* Update latest tracker data
513 
-	*
514 
-	* @param String $flightaware_id the ID from flightaware
515 
-	* @param String $ident the flight ident
516 
-	* @param String $arrival_airport_icao the arrival airport
517 
-	* @return String success or false
518 
-	*
519 
-	*/
512 
+	 * Update latest tracker data
513 
+	 *
514 
+	 * @param String $flightaware_id the ID from flightaware
515 
+	 * @param String $ident the flight ident
516 
+	 * @param String $arrival_airport_icao the arrival airport
517 
+	 * @return String success or false
518 
+	 *
519 
+	 */
520 520 
 	public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '')
521 521 
 	{
522 522 
 		$query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid';
523 
-                $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
523 
+				$query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
524 524
525 525 
 		try {
526 526 
 			$sth = $this->db->prepare($query);
 
@@ -534,32 +534,32 @@  discard block
 
 block discarded – undo
534 534 
 	}
535 535
536 536 
 	/**
537 
-	* Adds a new tracker data
538 
-	*
539 
-	* @param String $flightaware_id the ID from flightaware
540 
-	* @param String $ident the flight ident
541 
-	* @param String $aircraft_icao the aircraft type
542 
-	* @param String $departure_airport_icao the departure airport
543 
-	* @param String $arrival_airport_icao the arrival airport
544 
-	* @param String $latitude latitude of flight
545 
-	* @param String $longitude latitude of flight
546 
-	* @param String $waypoints waypoints of flight
547 
-	* @param String $altitude altitude of flight
548 
-	* @param String $heading heading of flight
549 
-	* @param String $groundspeed speed of flight
550 
-	* @param String $date date of flight
551 
-	* @param String $departure_airport_time departure time of flight
552 
-	* @param String $arrival_airport_time arrival time of flight
553 
-	* @param String $squawk squawk code of flight
554 
-	* @param String $route_stop route stop of flight
555 
-	* @param String $highlight highlight or not
556 
-	* @param String $ModeS ModesS code of flight
557 
-	* @param String $registration registration code of flight
558 
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
559 
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
560 
-	* @param String $verticalrate vertival rate of flight
561 
-	* @return String success or false
562 
-	*/
537 
+	 * Adds a new tracker data
538 
+	 *
539 
+	 * @param String $flightaware_id the ID from flightaware
540 
+	 * @param String $ident the flight ident
541 
+	 * @param String $aircraft_icao the aircraft type
542 
+	 * @param String $departure_airport_icao the departure airport
543 
+	 * @param String $arrival_airport_icao the arrival airport
544 
+	 * @param String $latitude latitude of flight
545 
+	 * @param String $longitude latitude of flight
546 
+	 * @param String $waypoints waypoints of flight
547 
+	 * @param String $altitude altitude of flight
548 
+	 * @param String $heading heading of flight
549 
+	 * @param String $groundspeed speed of flight
550 
+	 * @param String $date date of flight
551 
+	 * @param String $departure_airport_time departure time of flight
552 
+	 * @param String $arrival_airport_time arrival time of flight
553 
+	 * @param String $squawk squawk code of flight
554 
+	 * @param String $route_stop route stop of flight
555 
+	 * @param String $highlight highlight or not
556 
+	 * @param String $ModeS ModesS code of flight
557 
+	 * @param String $registration registration code of flight
558 
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
559 
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
560 
+	 * @param String $verticalrate vertival rate of flight
561 
+	 * @return String success or false
562 
+	 */
563 563 
 	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '')
564 564 
 	{
565 565 
 		global $globalURL;
 
@@ -644,16 +644,16 @@  discard block
 
 block discarded – undo
644 644 
 		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
645 645 
 		$type = filter_var($type,FILTER_SANITIZE_STRING);
646 646
647 
-                if ($latitude == '' && $longitude == '') {
648 
-            		$latitude = 0;
649 
-            		$longitude = 0;
650 
-            	}
651 
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
652 
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
653 
-                $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type)
647 
+				if ($latitude == '' && $longitude == '') {
648 
+					$latitude = 0;
649 
+					$longitude = 0;
650 
+				}
651 
+				if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
652 
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
653 
+				$query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type)
654 654 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
655 655
656 
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type);
656 
+				$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type);
657 657
658 658 
 		try {
659 659 
 		        
@@ -661,7 +661,7 @@  discard block
 
 block discarded – undo
661 661 
 			$sth->execute($query_values);
662 662 
 			$this->db = null;
663 663 
 		} catch (PDOException $e) {
664 
-		    return "error : ".$e->getMessage();
664 
+			return "error : ".$e->getMessage();
665 665 
 		}
666 666
667 667 
 		return "success";
 
@@ -670,11 +670,11 @@  discard block
 
 block discarded – undo
670 670
671 671
672 672 
 	/**
673 
-	* Gets the aircraft ident within the last hour
674 
-	*
675 
-	* @return String the ident
676 
-	*
677 
-	*/
673 
+	 * Gets the aircraft ident within the last hour
674 
+	 *
675 
+	 * @return String the ident
676 
+	 *
677 
+	 */
678 678 
 	public function getIdentFromLastHour($ident)
679 679 
 	{
680 680 
 		global $globalDBdriver, $globalTimezone;
 
@@ -690,11 +690,11 @@  discard block
 
 block discarded – undo
690 690 
 								AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
691 691 
 								AND tracker_output.date < now() AT TIME ZONE 'UTC'";
692 692 
 			$query_data = array(':ident' => $ident);
693 
-    		}
693 
+			}
694 694
695 695 
 		$sth = $this->db->prepare($query);
696 696 
 		$sth->execute($query_data);
697 
-    		$ident_result='';
697 
+			$ident_result='';
698 698 
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
699 699 
 		{
700 700 
 			$ident_result = $row['ident'];
 
@@ -705,11 +705,11 @@  discard block
 
 block discarded – undo
705 705
706 706
707 707 
 	/**
708 
-	* Gets the aircraft data from the last 20 seconds
709 
-	*
710 
-	* @return Array the tracker data
711 
-	*
712 
-	*/
708 
+	 * Gets the aircraft data from the last 20 seconds
709 
+	 *
710 
+	 * @return Array the tracker data
711 
+	 *
712 
+	 */
713 713 
 	public function getRealTimeData($q = '')
714 714 
 	{
715 715 
 		global $globalDBdriver;
 
@@ -743,11 +743,11 @@  discard block
 
 block discarded – undo
743 743 
 	}
744 744
745 745 
 	/**
746 
-	* Gets all number of flight over countries
747 
-	*
748 
-	* @return Array the airline country list
749 
-	*
750 
-	*/
746 
+	 * Gets all number of flight over countries
747 
+	 *
748 
+	 * @return Array the airline country list
749 
+	 *
750 
+	 */
751 751 
 	public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
752 752 
 	{
753 753 
 		global $globalDBdriver, $globalArchive;
 
@@ -817,11 +817,11 @@  discard block
 
 block discarded – undo
817 817 
 	}
818 818
819 819 
 	/**
820 
-	* Gets all callsigns that have flown over
821 
-	*
822 
-	* @return Array the callsign list
823 
-	*
824 
-	*/
820 
+	 * Gets all callsigns that have flown over
821 
+	 *
822 
+	 * @return Array the callsign list
823 
+	 *
824 
+	 */
825 825 
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
826 826 
 	{
827 827 
 		global $globalDBdriver;
 
@@ -888,11 +888,11 @@  discard block
 
 block discarded – undo
888 888
889 889
890 890 
 	/**
891 
-	* Counts all dates
892 
-	*
893 
-	* @return Array the date list
894 
-	*
895 
-	*/
891 
+	 * Counts all dates
892 
+	 *
893 
+	 * @return Array the date list
894 
+	 *
895 
+	 */
896 896 
 	public function countAllDates($filters = array())
897 897 
 	{
898 898 
 		global $globalTimezone, $globalDBdriver;
 
@@ -938,11 +938,11 @@  discard block
 
 block discarded – undo
938 938
939 939
940 940 
 	/**
941 
-	* Counts all dates during the last 7 days
942 
-	*
943 
-	* @return Array the date list
944 
-	*
945 
-	*/
941 
+	 * Counts all dates during the last 7 days
942 
+	 *
943 
+	 * @return Array the date list
944 
+	 *
945 
+	 */
946 946 
 	public function countAllDatesLast7Days($filters = array())
947 947 
 	{
948 948 
 		global $globalTimezone, $globalDBdriver;
 
@@ -964,7 +964,7 @@  discard block
 
 block discarded – undo
964 964 
 			$query .= " GROUP BY date_name
965 965 
 								ORDER BY date_name ASC";
966 966 
 			$query_data = array(':offset' => $offset);
967 
-    		}
967 
+			}
968 968
969 969 
 		$sth = $this->db->prepare($query);
970 970 
 		$sth->execute($query_data);
 
@@ -984,11 +984,11 @@  discard block
 
 block discarded – undo
984 984 
 	}
985 985
986 986 
 	/**
987 
-	* Counts all dates during the last month
988 
-	*
989 
-	* @return Array the date list
990 
-	*
991 
-	*/
987 
+	 * Counts all dates during the last month
988 
+	 *
989 
+	 * @return Array the date list
990 
+	 *
991 
+	 */
992 992 
 	public function countAllDatesLastMonth($filters = array())
993 993 
 	{
994 994 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1010,7 +1010,7 @@  discard block
 
 block discarded – undo
1010 1010 
 			$query .= " GROUP BY date_name
1011 1011 
 								ORDER BY date_name ASC";
1012 1012 
 			$query_data = array(':offset' => $offset);
1013 
-    		}
1013 
+			}
1014 1014
1015 1015 
 		$sth = $this->db->prepare($query);
1016 1016 
 		$sth->execute($query_data);
 
@@ -1032,11 +1032,11 @@  discard block
 
 block discarded – undo
1032 1032
1033 1033
1034 1034 
 	/**
1035 
-	* Counts all month
1036 
-	*
1037 
-	* @return Array the month list
1038 
-	*
1039 
-	*/
1035 
+	 * Counts all month
1036 
+	 *
1037 
+	 * @return Array the month list
1038 
+	 *
1039 
+	 */
1040 1040 
 	public function countAllMonths($filters = array())
1041 1041 
 	{
1042 1042 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1081,11 +1081,11 @@  discard block
 
 block discarded – undo
1081 1081
1082 1082
1083 1083 
 	/**
1084 
-	* Counts all dates during the last year
1085 
-	*
1086 
-	* @return Array the date list
1087 
-	*
1088 
-	*/
1084 
+	 * Counts all dates during the last year
1085 
+	 *
1086 
+	 * @return Array the date list
1087 
+	 *
1088 
+	 */
1089 1089 
 	public function countAllMonthsLastYear($filters)
1090 1090 
 	{
1091 1091 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1107,7 +1107,7 @@  discard block
 
 block discarded – undo
1107 1107 
 			$query .= " GROUP BY year_name, month_name
1108 1108 
 								ORDER BY year_name, month_name ASC";
1109 1109 
 			$query_data = array(':offset' => $offset);
1110 
-    		}
1110 
+			}
1111 1111
1112 1112 
 		$sth = $this->db->prepare($query);
1113 1113 
 		$sth->execute($query_data);
 
@@ -1130,11 +1130,11 @@  discard block
 
 block discarded – undo
1130 1130
1131 1131
1132 1132 
 	/**
1133 
-	* Counts all hours
1134 
-	*
1135 
-	* @return Array the hour list
1136 
-	*
1137 
-	*/
1133 
+	 * Counts all hours
1134 
+	 *
1135 
+	 * @return Array the hour list
1136 
+	 *
1137 
+	 */
1138 1138 
 	public function countAllHours($orderby,$filters = array())
1139 1139 
 	{
1140 1140 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1197,11 +1197,11 @@  discard block
 
 block discarded – undo
1197 1197
1198 1198
1199 1199 
 	/**
1200 
-	* Counts all hours by date
1201 
-	*
1202 
-	* @return Array the hour list
1203 
-	*
1204 
-	*/
1200 
+	 * Counts all hours by date
1201 
+	 *
1202 
+	 * @return Array the hour list
1203 
+	 *
1204 
+	 */
1205 1205 
 	public function countAllHoursByDate($date, $filters = array())
1206 1206 
 	{
1207 1207 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1245,11 +1245,11 @@  discard block
 
 block discarded – undo
1245 1245
1246 1246
1247 1247 
 	/**
1248 
-	* Counts all hours by a ident/callsign
1249 
-	*
1250 
-	* @return Array the hour list
1251 
-	*
1252 
-	*/
1248 
+	 * Counts all hours by a ident/callsign
1249 
+	 *
1250 
+	 * @return Array the hour list
1251 
+	 *
1252 
+	 */
1253 1253 
 	public function countAllHoursByIdent($ident, $filters = array())
1254 1254 
 	{
1255 1255 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1294,11 +1294,11 @@  discard block
 
 block discarded – undo
1294 1294
1295 1295
1296 1296 
 	/**
1297 
-	* Counts all trackers that have flown over
1298 
-	*
1299 
-	* @return Integer the number of trackers
1300 
-	*
1301 
-	*/
1297 
+	 * Counts all trackers that have flown over
1298 
+	 *
1299 
+	 * @return Integer the number of trackers
1300 
+	 *
1301 
+	 */
1302 1302 
 	public function countOverallTracker($filters = array(),$year = '',$month = '')
1303 1303 
 	{
1304 1304 
 		global $globalDBdriver;
 
@@ -1333,11 +1333,11 @@  discard block
 
 block discarded – undo
1333 1333 
 	}
1334 1334
1335 1335 
 	/**
1336 
-	* Counts all trackers type that have flown over
1337 
-	*
1338 
-	* @return Integer the number of flights
1339 
-	*
1340 
-	*/
1336 
+	 * Counts all trackers type that have flown over
1337 
+	 *
1338 
+	 * @return Integer the number of flights
1339 
+	 *
1340 
+	 */
1341 1341 
 	public function countOverallTrackerTypes($filters = array(),$year = '',$month = '')
1342 1342 
 	{
1343 1343 
 		global $globalDBdriver;
 
@@ -1372,11 +1372,11 @@  discard block
 
 block discarded – undo
1372 1372
1373 1373
1374 1374 
 	/**
1375 
-	* Counts all hours of today
1376 
-	*
1377 
-	* @return Array the hour list
1378 
-	*
1379 
-	*/
1375 
+	 * Counts all hours of today
1376 
+	 *
1377 
+	 * @return Array the hour list
1378 
+	 *
1379 
+	 */
1380 1380 
 	public function countAllHoursFromToday($filters = array())
1381 1381 
 	{
1382 1382 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1416,12 +1416,12 @@  discard block
 
 block discarded – undo
1416 1416 
 	}
1417 1417
1418 1418
1419 
-     /**
1420 
-	* Gets the Barrie Spotter ID based on the FlightAware ID
1421 
-	*
1422 
-	* @return Integer the Barrie Spotter ID
1419 
+	 /**
1420 
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
1421 
+	  *
1422 
+	  * @return Integer the Barrie Spotter ID
1423 1423 
 q	*
1424 
-	*/
1424 
+	  */
1425 1425 
 	public function getTrackerIDBasedOnFamTrackID($famtrackid)
1426 1426 
 	{
1427 1427 
 		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
 
@@ -1442,13 +1442,13 @@  discard block
 
 block discarded – undo
1442 1442
1443 1443
1444 1444 
 	/**
1445 
-	* Parses a date string
1446 
-	*
1447 
-	* @param String $dateString the date string
1448 
-	* @param String $timezone the timezone of a user
1449 
-	* @return Array the time information
1450 
-	*
1451 
-	*/
1445 
+	 * Parses a date string
1446 
+	 *
1447 
+	 * @param String $dateString the date string
1448 
+	 * @param String $timezone the timezone of a user
1449 
+	 * @return Array the time information
1450 
+	 *
1451 
+	 */
1452 1452 
 	public function parseDateString($dateString, $timezone = '')
1453 1453 
 	{
1454 1454 
 		$time_array = array();
 
@@ -1481,12 +1481,12 @@  discard block
 
 block discarded – undo
1481 1481 
 	}
1482 1482
1483 1483 
 	/**
1484 
-	* Parses the direction degrees to working
1485 
-	*
1486 
-	* @param Float $direction the direction in degrees
1487 
-	* @return Array the direction information
1488 
-	*
1489 
-	*/
1484 
+	 * Parses the direction degrees to working
1485 
+	 *
1486 
+	 * @param Float $direction the direction in degrees
1487 
+	 * @return Array the direction information
1488 
+	 *
1489 
+	 */
1490 1490 
 	public function parseDirection($direction = 0)
1491 1491 
 	{
1492 1492 
 		if ($direction == '') $direction = 0;
 
@@ -1565,12 +1565,12 @@  discard block
 
 block discarded – undo
1565 1565
1566 1566
1567 1567 
 	/**
1568 
-	* Gets Country from latitude/longitude
1569 
-	*
1570 
-	* @param Float $latitude latitute of the flight
1571 
-	* @param Float $longitude longitute of the flight
1572 
-	* @return String the countrie
1573 
-	*/
1568 
+	 * Gets Country from latitude/longitude
1569 
+	 *
1570 
+	 * @param Float $latitude latitute of the flight
1571 
+	 * @param Float $longitude longitute of the flight
1572 
+	 * @return String the countrie
1573 
+	 */
1574 1574 
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
1575 1575 
 	{
1576 1576 
 		global $globalDBdriver, $globalDebug;
 
@@ -1607,11 +1607,11 @@  discard block
 
 block discarded – undo
1607 1607 
 	}
1608 1608
1609 1609 
 	/**
1610 
-	* Gets Country from iso2
1611 
-	*
1612 
-	* @param String $iso2 ISO2 country code
1613 
-	* @return String the countrie
1614 
-	*/
1610 
+	 * Gets Country from iso2
1611 
+	 *
1612 
+	 * @param String $iso2 ISO2 country code
1613 
+	 * @return String the countrie
1614 
+	 */
1615 1615 
 	public function getCountryFromISO2($iso2)
1616 1616 
 	{
1617 1617 
 		global $globalDBdriver, $globalDebug;
 
@@ -1639,11 +1639,11 @@  discard block
 
 block discarded – undo
1639 1639 
 	}
1640 1640
1641 1641 
 	/**
1642 
-	* Gets all vessels types that have flown over
1643 
-	*
1644 
-	* @return Array the vessel type list
1645 
-	*
1646 
-	*/
1642 
+	 * Gets all vessels types that have flown over
1643 
+	 *
1644 
+	 * @return Array the vessel type list
1645 
+	 *
1646 
+	 */
1647 1647 
 	public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
1648 1648 
 	{
1649 1649 
 		global $globalDBdriver;
 
@@ -1708,11 +1708,11 @@  discard block
 
 block discarded – undo
1708 1708 
 	}
1709 1709
1710 1710 
 	/**
1711 
-	* Gets all the tracker information
1712 
-	*
1713 
-	* @return Array the tracker information
1714 
-	*
1715 
-	*/
1711 
+	 * Gets all the tracker information
1712 
+	 *
1713 
+	 * @return Array the tracker information
1714 
+	 *
1715 
+	 */
1716 1716 
 	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
1717 1717 
 	{
1718 1718 
 		global $globalTimezone, $globalDBdriver;
 
@@ -1817,12 +1817,12 @@  discard block
 
 block discarded – undo
1817 1817 
 	}
1818 1818
1819 1819 
 	/**
1820 
-	* Gets the short url from bit.ly
1821 
-	*
1822 
-	* @param String $url the full url
1823 
-	* @return String the bit.ly url
1824 
-	*
1825 
-	*/
1820 
+	 * Gets the short url from bit.ly
1821 
+	 *
1822 
+	 * @param String $url the full url
1823 
+	 * @return String the bit.ly url
1824 
+	 *
1825 
+	 */
1826 1826 
 	public function getBitlyURL($url)
1827 1827 
 	{
1828 1828 
 		global $globalBitlyAccessToken;
Please login to merge, or discard this patch.
Braces   +172 added lines, -61 removed lines patch added patch discarded remove patch 
@@ -10,7 +10,9 @@  discard block
 
 block discarded – undo
10 10 
 	public function __construct($dbc = null) {
11 11 
 		$Connection = new Connection($dbc);
12 12 
 		$this->db = $Connection->db();
13 
-		if ($this->db === null) die('Error: No DB connection. (Tracker)');
13 
+		if ($this->db === null) {
14 
+			die('Error: No DB connection. (Tracker)');
15 
+		}
14 16 
 	}
15 17
16 18 
 	/**
 
@@ -32,7 +34,9 @@  discard block
 
 block discarded – undo
32 34 
 		if (isset($filter[0]['source'])) {
33 35 
 			$filters = array_merge($filters,$filter);
34 36 
 		}
35 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
37 
+		if (is_array($globalFilter)) {
38 
+			$filter = array_merge($filter,$globalFilter);
39 
+		}
36 40 
 		$filter_query_join = '';
37 41 
 		$filter_query_where = '';
38 42 
 		foreach($filters as $flt) {
 
@@ -71,8 +75,11 @@  discard block
 
 block discarded – undo
71 75 
 				$filter_query_where .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'";
72 76 
 			}
73 77 
 		}
74 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
75 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
78 
+		if ($filter_query_where == '' && $where) {
79 
+			$filter_query_where = ' WHERE';
80 
+		} elseif ($filter_query_where != '' && $and) {
81 
+			$filter_query_where .= ' AND';
82 
+		}
76 83 
 		if ($filter_query_where != '') {
77 84 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
78 85 
 		}
 
@@ -126,26 +133,43 @@  discard block
 
 block discarded – undo
126 133 
 				$temp_array['tracker_id'] = $row['tracker_archive_id'];
127 134 
 			} elseif (isset($row['tracker_archive_output_id'])) {
128 135 
 				$temp_array['tracker_id'] = $row['tracker_archive_output_id'];
129 
-			*/}
130 
-			elseif (isset($row['trackerid'])) {
136 
+			*/} elseif (isset($row['trackerid'])) {
131 137 
 				$temp_array['trackerid'] = $row['trackerid'];
132 138 
 			} else {
133 139 
 				$temp_array['trackerid'] = '';
134 140 
 			}
135 
-			if (isset($row['famtrackid'])) $temp_array['famtrackid'] = $row['famtrackid'];
136 
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
137 
-			if (isset($row['comment'])) $temp_array['comment'] = $row['comment'];
141 
+			if (isset($row['famtrackid'])) {
142 
+				$temp_array['famtrackid'] = $row['famtrackid'];
143 
+			}
144 
+			if (isset($row['type'])) {
145 
+				$temp_array['type'] = $row['type'];
146 
+			}
147 
+			if (isset($row['comment'])) {
148 
+				$temp_array['comment'] = $row['comment'];
149 
+			}
138 150 
 			$temp_array['ident'] = $row['ident'];
139 
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
140 
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
141 
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
142 
-			if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude'];
151 
+			if (isset($row['latitude'])) {
152 
+				$temp_array['latitude'] = $row['latitude'];
153 
+			}
154 
+			if (isset($row['longitude'])) {
155 
+				$temp_array['longitude'] = $row['longitude'];
156 
+			}
157 
+			if (isset($row['format_source'])) {
158 
+				$temp_array['format_source'] = $row['format_source'];
159 
+			}
160 
+			if (isset($row['altitude'])) {
161 
+				$temp_array['altitude'] = $row['altitude'];
162 
+			}
143 163 
 			if (isset($row['heading'])) {
144 164 
 				$temp_array['heading'] = $row['heading'];
145 165 
 				$heading_direction = $this->parseDirection($row['heading']);
146 
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
166 
+				if (isset($heading_direction[0]['direction_fullname'])) {
167 
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
168 
+				}
169 
+			}
170 
+			if (isset($row['ground_speed'])) {
171 
+				$temp_array['ground_speed'] = $row['ground_speed'];
147 172 
 			}
148 
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
149 173
150 174 
 			if (isset($row['date'])) {
151 175 
 				$dateArray = $this->parseDateString($row['date']);
 
@@ -188,13 +212,21 @@  discard block
 
 block discarded – undo
188 212 
 			}
189 213
190 214 
 			$fromsource = NULL;
191 
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
192 
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
193 
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
215 
+			if (isset($row['source_name']) && $row['source_name'] != '') {
216 
+				$temp_array['source_name'] = $row['source_name'];
217 
+			}
218 
+			if (isset($row['over_country']) && $row['over_country'] != '') {
219 
+				$temp_array['over_country'] = $row['over_country'];
220 
+			}
221 
+			if (isset($row['distance']) && $row['distance'] != '') {
222 
+				$temp_array['distance'] = $row['distance'];
223 
+			}
194 224 
 			$temp_array['query_number_rows'] = $num_rows;
195 225 
 			$tracker_array[] = $temp_array;
196 226 
 		}
197 
-		if ($num_rows == 0) return array();
227 
+		if ($num_rows == 0) {
228 
+			return array();
229 
+		}
198 230 
 		$tracker_array[0]['query_number_rows'] = $num_rows;
199 231 
 		return $tracker_array;
200 232 
 	}	
@@ -225,8 +257,12 @@  discard block
 
 block discarded – undo
225 257 
 			{
226 258 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
227 259 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
228 
-			} else $limit_query = "";
229 
-		} else $limit_query = "";
260 
+			} else {
261 
+				$limit_query = "";
262 
+			}
263 
+		} else {
264 
+			$limit_query = "";
265 
+		}
230 266
231 267 
 		if ($sort != "")
232 268 
 		{
 
@@ -254,7 +290,9 @@  discard block
 
 block discarded – undo
254 290 
 		global $global_query;
255 291
256 292 
 		date_default_timezone_set('UTC');
257 
-		if ($id == '') return array();
293 
+		if ($id == '') {
294 
+			return array();
295 
+		}
258 296 
 		$additional_query = "tracker_output.famtrackid = :id";
259 297 
 		$query_values = array(':id' => $id);
260 298 
 		$query  = $global_query." WHERE ".$additional_query." ";
 
@@ -397,8 +435,11 @@  discard block
 
 block discarded – undo
397 435 
 		$query .= " ORDER BY tracker_output.source_name ASC";
398 436
399 437 
 		$sth = $this->db->prepare($query);
400 
-		if (!empty($query_values)) $sth->execute($query_values);
401 
-		else $sth->execute();
438 
+		if (!empty($query_values)) {
439 
+			$sth->execute($query_values);
440 
+		} else {
441 
+			$sth->execute();
442 
+		}
402 443
403 444 
 		$source_array = array();
404 445 
 		$temp_array = array();
 
@@ -453,7 +494,9 @@  discard block
 
 block discarded – undo
453 494 
 			date_default_timezone_set($globalTimezone);
454 495 
 			$datetime = new DateTime();
455 496 
 			$offset = $datetime->format('P');
456 
-		} else $offset = '+00:00';
497 
+		} else {
498 
+			$offset = '+00:00';
499 
+		}
457 500
458 501 
 		if ($globalDBdriver == 'mysql') {
459 502 
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
 
@@ -609,7 +652,9 @@  discard block
 
 block discarded – undo
609 652 
 			{
610 653 
 				return false;
611 654 
 			}
612 
-		} else $altitude = 0;
655 
+		} else {
656 
+			$altitude = 0;
657 
+		}
613 658
614 659 
 		if ($heading != "")
615 660 
 		{
 
@@ -648,8 +693,12 @@  discard block
 
 block discarded – undo
648 693 
             		$latitude = 0;
649 694 
             		$longitude = 0;
650 695 
             	}
651 
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
652 
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
696 
+                if ($heading == '' || $Common->isInteger($heading) === false) {
697 
+                	$heading = 0;
698 
+                }
699 
+                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
700 
+                	$groundspeed = 0;
701 
+                }
653 702 
                 $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type)
654 703 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
655 704 
 
@@ -753,7 +802,9 @@  discard block
 
 block discarded – undo
753 802 
 		global $globalDBdriver, $globalArchive;
754 803 
 		//$filter_query = $this->getFilter($filters,true,true);
755 804 
 		$Connection= new Connection($this->db);
756 
-		if (!$Connection->tableExists('countries')) return array();
805 
+		if (!$Connection->tableExists('countries')) {
806 
+			return array();
807 
+		}
757 808 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
758 809 
 			require_once('class.TrackerLive.php');
759 810 
 			$TrackerLive = new TrackerLive($this->db);
 
@@ -796,7 +847,9 @@  discard block
 
 block discarded – undo
796 847 
 			$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT famtrackid,over_country FROM tracker_archive".$filter_query.") l ON c.iso2 = l.over_country ";
797 848 
 		}
798 849 
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
799 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
850 
+		if ($limit) {
851 
+			$query .= " LIMIT 10 OFFSET 0";
852 
+		}
800 853
801 854
802 855 
 		$sth = $this->db->prepare($query);
 
@@ -829,12 +882,18 @@  discard block
 
 block discarded – undo
829 882 
 		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count
830 883 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
831 884 
 		 if ($olderthanmonths > 0) {
832 
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
833 
-			else $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
885 
+			if ($globalDBdriver == 'mysql') {
886 
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
887 
+			} else {
888 
+				$query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
889 
+			}
834 890 
 		}
835 891 
 		if ($sincedate != '') {
836 
-			if ($globalDBdriver == 'mysql') $query .= " AND tracker_output.date > '".$sincedate."'";
837 
-			else $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
892 
+			if ($globalDBdriver == 'mysql') {
893 
+				$query .= " AND tracker_output.date > '".$sincedate."'";
894 
+			} else {
895 
+				$query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
896 
+			}
838 897 
 		}
839 898 
 		$query_values = array();
840 899 
 		if ($year != '') {
 
@@ -865,7 +924,9 @@  discard block
 
 block discarded – undo
865 924 
 			}
866 925 
 		}
867 926 
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
868 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
927 
+		if ($limit) {
928 
+			$query .= " LIMIT 10 OFFSET 0";
929 
+		}
869 930
870 931 
 		$sth = $this->db->prepare($query);
871 932 
 		$sth->execute($query_values);
 
@@ -900,7 +961,9 @@  discard block
 
 block discarded – undo
900 961 
 			date_default_timezone_set($globalTimezone);
901 962 
 			$datetime = new DateTime();
902 963 
 			$offset = $datetime->format('P');
903 
-		} else $offset = '+00:00';
964 
+		} else {
965 
+			$offset = '+00:00';
966 
+		}
904 967
905 968 
 		if ($globalDBdriver == 'mysql') {
906 969 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -950,7 +1013,9 @@  discard block
 
 block discarded – undo
950 1013 
 			date_default_timezone_set($globalTimezone);
951 1014 
 			$datetime = new DateTime();
952 1015 
 			$offset = $datetime->format('P');
953 
-		} else $offset = '+00:00';
1016 
+		} else {
1017 
+			$offset = '+00:00';
1018 
+		}
954 1019 
 		$filter_query = $this->getFilter($filters,true,true);
955 1020 
 		if ($globalDBdriver == 'mysql') {
956 1021 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -996,7 +1061,9 @@  discard block
 
 block discarded – undo
996 1061 
 			date_default_timezone_set($globalTimezone);
997 1062 
 			$datetime = new DateTime();
998 1063 
 			$offset = $datetime->format('P');
999 
-		} else $offset = '+00:00';
1064 
+		} else {
1065 
+			$offset = '+00:00';
1066 
+		}
1000 1067 
 		$filter_query = $this->getFilter($filters,true,true);
1001 1068 
 		if ($globalDBdriver == 'mysql') {
1002 1069 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1044,7 +1111,9 @@  discard block
 
 block discarded – undo
1044 1111 
 			date_default_timezone_set($globalTimezone);
1045 1112 
 			$datetime = new DateTime();
1046 1113 
 			$offset = $datetime->format('P');
1047 
-		} else $offset = '+00:00';
1114 
+		} else {
1115 
+			$offset = '+00:00';
1116 
+		}
1048 1117
1049 1118 
 		if ($globalDBdriver == 'mysql') {
1050 1119 
 			$query  = "SELECT YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
 
@@ -1093,7 +1162,9 @@  discard block
 
 block discarded – undo
1093 1162 
 			date_default_timezone_set($globalTimezone);
1094 1163 
 			$datetime = new DateTime();
1095 1164 
 			$offset = $datetime->format('P');
1096 
-		} else $offset = '+00:00';
1165 
+		} else {
1166 
+			$offset = '+00:00';
1167 
+		}
1097 1168 
 		$filter_query = $this->getFilter($filters,true,true);
1098 1169 
 		if ($globalDBdriver == 'mysql') {
1099 1170 
 			$query  = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 
@@ -1142,7 +1213,9 @@  discard block
 
 block discarded – undo
1142 1213 
 			date_default_timezone_set($globalTimezone);
1143 1214 
 			$datetime = new DateTime();
1144 1215 
 			$offset = $datetime->format('P');
1145 
-		} else $offset = '+00:00';
1216 
+		} else {
1217 
+			$offset = '+00:00';
1218 
+		}
1146 1219
1147 1220 
 		$orderby_sql = '';
1148 1221 
 		if ($orderby == "hour")
 
@@ -1211,7 +1284,9 @@  discard block
 
 block discarded – undo
1211 1284 
 			date_default_timezone_set($globalTimezone);
1212 1285 
 			$datetime = new DateTime($date);
1213 1286 
 			$offset = $datetime->format('P');
1214 
-		} else $offset = '+00:00';
1287 
+		} else {
1288 
+			$offset = '+00:00';
1289 
+		}
1215 1290
1216 1291 
 		if ($globalDBdriver == 'mysql') {
1217 1292 
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1259,7 +1334,9 @@  discard block
 
 block discarded – undo
1259 1334 
 			date_default_timezone_set($globalTimezone);
1260 1335 
 			$datetime = new DateTime();
1261 1336 
 			$offset = $datetime->format('P');
1262 
-		} else $offset = '+00:00';
1337 
+		} else {
1338 
+			$offset = '+00:00';
1339 
+		}
1263 1340
1264 1341 
 		if ($globalDBdriver == 'mysql') {
1265 1342 
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1324,8 +1401,11 @@  discard block
 
 block discarded – undo
1324 1401 
 				$query_values = array_merge($query_values,array(':month' => $month));
1325 1402 
 			}
1326 1403 
 		}
1327 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1328 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1404 
+		if (empty($query_values)) {
1405 
+			$queryi .= $this->getFilter($filters);
1406 
+		} else {
1407 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1408 
+		}
1329 1409
1330 1410 
 		$sth = $this->db->prepare($queryi);
1331 1411 
 		$sth->execute($query_values);
 
@@ -1362,8 +1442,11 @@  discard block
 
 block discarded – undo
1362 1442 
 				$query_values = array_merge($query_values,array(':month' => $month));
1363 1443 
 			}
1364 1444 
 		}
1365 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1366 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1445 
+		if (empty($query_values)) {
1446 
+			$queryi .= $this->getFilter($filters);
1447 
+		} else {
1448 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1449 
+		}
1367 1450
1368 1451 
 		$sth = $this->db->prepare($queryi);
1369 1452 
 		$sth->execute($query_values);
 
@@ -1385,7 +1468,9 @@  discard block
 
 block discarded – undo
1385 1468 
 			date_default_timezone_set($globalTimezone);
1386 1469 
 			$datetime = new DateTime();
1387 1470 
 			$offset = $datetime->format('P');
1388 
-		} else $offset = '+00:00';
1471 
+		} else {
1472 
+			$offset = '+00:00';
1473 
+		}
1389 1474
1390 1475 
 		if ($globalDBdriver == 'mysql') {
1391 1476 
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1489,7 +1574,9 @@  discard block
 
 block discarded – undo
1489 1574 
 	*/
1490 1575 
 	public function parseDirection($direction = 0)
1491 1576 
 	{
1492 
-		if ($direction == '') $direction = 0;
1577 
+		if ($direction == '') {
1578 
+			$direction = 0;
1579 
+		}
1493 1580 
 		$direction_array = array();
1494 1581 
 		$temp_array = array();
1495 1582 
 
@@ -1578,7 +1665,9 @@  discard block
 
 block discarded – undo
1578 1665 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1579 1666
1580 1667 
 		$Connection = new Connection($this->db);
1581 
-		if (!$Connection->tableExists('countries')) return '';
1668 
+		if (!$Connection->tableExists('countries')) {
1669 
+			return '';
1670 
+		}
1582 1671
1583 1672 
 		try {
1584 1673 
 			/*
 
@@ -1598,9 +1687,13 @@  discard block
 
 block discarded – undo
1598 1687 
 			$sth->closeCursor();
1599 1688 
 			if (count($row) > 0) {
1600 1689 
 				return $row;
1601 
-			} else return '';
1690 
+			} else {
1691 
+				return '';
1692 
+			}
1602 1693 
 		} catch (PDOException $e) {
1603 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1694 
+			if (isset($globalDebug) && $globalDebug) {
1695 
+				echo 'Error : '.$e->getMessage()."\n";
1696 
+			}
1604 1697 
 			return '';
1605 1698 
 		}
1606 1699 
 	
@@ -1618,7 +1711,9 @@  discard block
 
 block discarded – undo
1618 1711 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1619 1712
1620 1713 
 		$Connection = new Connection($this->db);
1621 
-		if (!$Connection->tableExists('countries')) return '';
1714 
+		if (!$Connection->tableExists('countries')) {
1715 
+			return '';
1716 
+		}
1622 1717
1623 1718 
 		try {
1624 1719 
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
 
@@ -1630,9 +1725,13 @@  discard block
 
 block discarded – undo
1630 1725 
 			$sth->closeCursor();
1631 1726 
 			if (count($row) > 0) {
1632 1727 
 				return $row;
1633 
-			} else return '';
1728 
+			} else {
1729 
+				return '';
1730 
+			}
1634 1731 
 		} catch (PDOException $e) {
1635 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1732 
+			if (isset($globalDebug) && $globalDebug) {
1733 
+				echo 'Error : '.$e->getMessage()."\n";
1734 
+			}
1636 1735 
 			return '';
1637 1736 
 		}
1638 1737 
 	
@@ -1693,7 +1792,9 @@  discard block
 
 block discarded – undo
1693 1792 
 			}
1694 1793 
 		}
1695 1794 
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
1696 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
1795 
+		if ($limit) {
1796 
+			$query .= " LIMIT 10 OFFSET 0";
1797 
+		}
1697 1798 
 		$sth = $this->db->prepare($query);
1698 1799 
 		$sth->execute($query_values);
1699 1800 
 		$tracker_array = array();
 
@@ -1730,7 +1831,9 @@  discard block
 
 block discarded – undo
1730 1831 
 				foreach ($q_array as $q_item){
1731 1832 
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
1732 1833 
 					$additional_query .= " AND (";
1733 
-					if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
1834 
+					if (is_int($q_item)) {
1835 
+						$additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
1836 
+					}
1734 1837 
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%') OR ";
1735 1838 
 					$additional_query .= ")";
1736 1839 
 				}
 
@@ -1756,7 +1859,9 @@  discard block
 
 block discarded – undo
1756 1859 
 				date_default_timezone_set($globalTimezone);
1757 1860 
 				$datetime = new DateTime();
1758 1861 
 				$offset = $datetime->format('P');
1759 
-			} else $offset = '+00:00';
1862 
+			} else {
1863 
+				$offset = '+00:00';
1864 
+			}
1760 1865 
 			if ($date_array[1] != "")
1761 1866 
 			{
1762 1867 
 				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 
@@ -1783,8 +1888,12 @@  discard block
 
 block discarded – undo
1783 1888 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1784 1889 
 			{
1785 1890 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1786 
-			} else $limit_query = "";
1787 
-		} else $limit_query = "";
1891 
+			} else {
1892 
+				$limit_query = "";
1893 
+			}
1894 
+		} else {
1895 
+			$limit_query = "";
1896 
+		}
1788 1897 
 		if ($sort != "")
1789 1898 
 		{
1790 1899 
 			$search_orderby_array = $this->getOrderBy();
 
@@ -1827,7 +1936,9 @@  discard block
 
 block discarded – undo
1827 1936 
 	{
1828 1937 
 		global $globalBitlyAccessToken;
1829 1938
1830 
-		if ($globalBitlyAccessToken == '') return $url;
1939 
+		if ($globalBitlyAccessToken == '') {
1940 
+			return $url;
1941 
+		}
1831 1942 
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
1832 1943 
 		$ch = curl_init();
1833 1944 
 		curl_setopt($ch, CURLOPT_HEADER, 0);
Please login to merge, or discard this patch.
Spacing   +176 added lines, -176 removed lines patch added patch discarded remove patch 
@@ -4,7 +4,7 @@  discard block
 
 block discarded – undo
4 4 
 require_once(dirname(__FILE__).'/class.Image.php');
5 5 
 $global_query = "SELECT tracker_output.* FROM tracker_output";
6 6
7 
-class Tracker{
7 
+class Tracker {
8 8 
 	public $db;
9 9
10 10 
 	public function __construct($dbc = null) {
 
@@ -19,33 +19,33 @@  discard block
 
 block discarded – undo
19 19 
 	* @return Array the SQL part
20 20 
 	*/
21 21
22 
-	public function getFilter($filter = array(),$where = false,$and = false) {
22 
+	public function getFilter($filter = array(), $where = false, $and = false) {
23 23 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
24 24 
 		$filters = array();
25 25 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
26 26 
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
27 27 
 				$filters = $globalStatsFilters[$globalFilterName];
28 28 
 			} else {
29 
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
29 
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
30 30 
 			}
31 31 
 		}
32 32 
 		if (isset($filter[0]['source'])) {
33 
-			$filters = array_merge($filters,$filter);
33 
+			$filters = array_merge($filters, $filter);
34 34 
 		}
35 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
35 
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
36 36 
 		$filter_query_join = '';
37 37 
 		$filter_query_where = '';
38 
-		foreach($filters as $flt) {
38 
+		foreach ($filters as $flt) {
39 39 
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
40 40 
 				if (isset($flt['source'])) {
41 
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
41 
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
42 42 
 				} else {
43 
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
43 
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
44 44 
 				}
45 45 
 			}
46 46 
 		}
47 47 
 		if (isset($filter['source']) && !empty($filter['source'])) {
48 
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
48 
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
49 49 
 		}
50 50 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
51 51 
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
 
@@ -74,7 +74,7 @@  discard block
 
 block discarded – undo
74 74 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
75 75 
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
76 76 
 		if ($filter_query_where != '') {
77 
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
77 
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
78 78 
 		}
79 79 
 		$filter_query = $filter_query_join.$filter_query_where;
80 80 
 		return $filter_query;
 
@@ -89,7 +89,7 @@  discard block
 
 block discarded – undo
89 89 
 	* @return Array the tracker information
90 90 
 	*
91 91 
 	*/
92 
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
92 
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
93 93 
 	{
94 94 
 		date_default_timezone_set('UTC');
95 95 
 		if (!is_string($query))
 
@@ -109,13 +109,13 @@  discard block
 
 block discarded – undo
109 109 
 			$sth = $this->db->prepare($query.$limitQuery);
110 110 
 			$sth->execute($params);
111 111 
 		} catch (PDOException $e) {
112 
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
112 
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
113 113 
 			exit();
114 114 
 		}
115 115
116 116 
 		$num_rows = 0;
117 117 
 		$tracker_array = array();
118 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
118 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
119 119 
 		{
120 120 
 			$num_rows++;
121 121 
 			$temp_array = array();
 
@@ -171,17 +171,17 @@  discard block
 
 block discarded – undo
171 171 
 				{
172 172 
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
173 173 
 				} else {
174 
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
174 
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
175 175 
 				}
176 176 
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
177 
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
178 
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
177 
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
178 
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
179 179 
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
180 180 
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
181 181 
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
182 182 
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
183 
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
184 
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
183 
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
184 
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
185 185 
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
186 186 
 					}
187 187 
 				}
 
@@ -218,8 +218,8 @@  discard block
 
 block discarded – undo
218 218 
 		{
219 219 
 			$limit_array = explode(",", $limit);
220 220
221 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
222 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
221 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
222 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
223 223
224 224 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
225 225 
 			{
 
@@ -236,9 +236,9 @@  discard block
 
 block discarded – undo
236 236 
 			$orderby_query = " ORDER BY tracker_output.date DESC";
237 237 
 		}
238 238
239 
-		$query  = $global_query.$filter_query." ".$orderby_query;
239 
+		$query = $global_query.$filter_query." ".$orderby_query;
240 240
241 
-		$tracker_array = $this->getDataFromDB($query, array(),$limit_query,true);
241 
+		$tracker_array = $this->getDataFromDB($query, array(), $limit_query, true);
242 242
243 243 
 		return $tracker_array;
244 244 
 	}
 
@@ -257,8 +257,8 @@  discard block
 
 block discarded – undo
257 257 
 		if ($id == '') return array();
258 258 
 		$additional_query = "tracker_output.famtrackid = :id";
259 259 
 		$query_values = array(':id' => $id);
260 
-		$query  = $global_query." WHERE ".$additional_query." ";
261 
-		$tracker_array = $this->getDataFromDB($query,$query_values);
260 
+		$query = $global_query." WHERE ".$additional_query." ";
261 
+		$tracker_array = $this->getDataFromDB($query, $query_values);
262 262 
 		return $tracker_array;
263 263 
 	}
264 264 
 
@@ -277,7 +277,7 @@  discard block
 
 block discarded – undo
277 277 
 		$query_values = array();
278 278 
 		$limit_query = '';
279 279 
 		$additional_query = '';
280 
-		$filter_query = $this->getFilter($filter,true,true);
280 
+		$filter_query = $this->getFilter($filter, true, true);
281 281 
 		if ($ident != "")
282 282 
 		{
283 283 
 			if (!is_string($ident))
 
@@ -293,8 +293,8 @@  discard block
 
 block discarded – undo
293 293 
 		{
294 294 
 			$limit_array = explode(",", $limit);
295 295
296 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
297 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
296 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
297 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
298 298
299 299 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
300 300 
 			{
 
@@ -318,7 +318,7 @@  discard block
 
 block discarded – undo
318 318 
 		return $tracker_array;
319 319 
 	}
320 320
321 
-	public function getTrackerDataByDate($date = '', $limit = '', $sort = '',$filter = array())
321 
+	public function getTrackerDataByDate($date = '', $limit = '', $sort = '', $filter = array())
322 322 
 	{
323 323 
 		global $global_query, $globalTimezone, $globalDBdriver;
324 324 
 		
@@ -326,7 +326,7 @@  discard block
 
 block discarded – undo
326 326 
 		$limit_query = '';
327 327 
 		$additional_query = '';
328 328
329 
-		$filter_query = $this->getFilter($filter,true,true);
329 
+		$filter_query = $this->getFilter($filter, true, true);
330 330
331 331 
 		if ($date != "")
332 332 
 		{
 
@@ -352,8 +352,8 @@  discard block
 
 block discarded – undo
352 352 
 		{
353 353 
 			$limit_array = explode(",", $limit);
354 354
355 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
356 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
355 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
356 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
357 357
358 358 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
359 359 
 			{
 
@@ -384,11 +384,11 @@  discard block
 
 block discarded – undo
384 384 
 	* @return Array list of source name
385 385 
 	*
386 386 
 	*/
387 
-	public function getAllSourceName($type = '',$filters = array())
387 
+	public function getAllSourceName($type = '', $filters = array())
388 388 
 	{
389 
-		$filter_query = $this->getFilter($filters,true,true);
389 
+		$filter_query = $this->getFilter($filters, true, true);
390 390 
 		$query_values = array();
391 
-		$query  = "SELECT DISTINCT tracker_output.source_name
391 
+		$query = "SELECT DISTINCT tracker_output.source_name
392 392 
 				FROM tracker_output".$filter_query." tracker_output.source_name <> ''";
393 393 
 		if ($type != '') {
394 394 
 			$query_values = array(':type' => $type);
 
@@ -403,7 +403,7 @@  discard block
 
 block discarded – undo
403 403 
 		$source_array = array();
404 404 
 		$temp_array = array();
405 405
406 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
406 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
407 407 
 		{
408 408 
 			$temp_array['source_name'] = $row['source_name'];
409 409 
 			$source_array[] = $temp_array;
 
@@ -420,8 +420,8 @@  discard block
 
 block discarded – undo
420 420 
 	*/
421 421 
 	public function getAllIdents($filters = array())
422 422 
 	{
423 
-		$filter_query = $this->getFilter($filters,true,true);
424 
-		$query  = "SELECT DISTINCT tracker_output.ident
423 
+		$filter_query = $this->getFilter($filters, true, true);
424 
+		$query = "SELECT DISTINCT tracker_output.ident
425 425 
 								FROM tracker_output".$filter_query." tracker_output.ident <> ''
426 426 
 								ORDER BY tracker_output.date ASC LIMIT 700 OFFSET 0";
427 427 
 
@@ -431,7 +431,7 @@  discard block
 
 block discarded – undo
431 431 
 		$ident_array = array();
432 432 
 		$temp_array = array();
433 433
434 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
434 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
435 435 
 		{
436 436 
 			$temp_array['ident'] = $row['ident'];
437 437 
 			$ident_array[] = $temp_array;
 
@@ -456,12 +456,12 @@  discard block
 
 block discarded – undo
456 456 
 		} else $offset = '+00:00';
457 457
458 458 
 		if ($globalDBdriver == 'mysql') {
459 
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
459 
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
460 460 
 								FROM tracker_output
461 461 
 								WHERE tracker_output.date <> ''
462 462 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
463 463 
 		} else {
464 
-			$query  = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
464 
+			$query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
465 465 
 								FROM tracker_output
466 466 
 								WHERE tracker_output.date <> ''
467 467 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
 
@@ -473,7 +473,7 @@  discard block
 
 block discarded – undo
473 473 
 		$date_array = array();
474 474 
 		$temp_array = array();
475 475
476 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
476 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
477 477 
 		{
478 478 
 			$temp_array['date'] = $row['date'];
479 479 
 
@@ -492,11 +492,11 @@  discard block
 
 block discarded – undo
492 492 
 	* @return String success or false
493 493 
 	*
494 494 
 	*/
495 
-	public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL)
495 
+	public function updateIdentTrackerData($famtrackid = '', $ident = '', $fromsource = NULL)
496 496 
 	{
497 497
498 498 
 		$query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid';
499 
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
499 
+                $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident);
500 500
501 501 
 		try {
502 502 
 			$sth = $this->db->prepare($query);
 
@@ -520,7 +520,7 @@  discard block
 
 block discarded – undo
520 520 
 	public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '')
521 521 
 	{
522 522 
 		$query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid';
523 
-                $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
523 
+                $query_values = array(':famtrackid' => $famtrackid, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident);
524 524
525 525 
 		try {
526 526 
 			$sth = $this->db->prepare($query);
 
@@ -560,7 +560,7 @@  discard block
 
 block discarded – undo
560 560 
 	* @param String $verticalrate vertival rate of flight
561 561 
 	* @return String success or false
562 562 
 	*/
563 
-	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '')
563 
+	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '', $format_source = '', $source_name = '')
564 564 
 	{
565 565 
 		global $globalURL;
566 566 
 		
@@ -628,21 +628,21 @@  discard block
 
 block discarded – undo
628 628 
 		}
629 629
630 630
631 
-		if ($date == "" || strtotime($date) < time()-20*60)
631 
+		if ($date == "" || strtotime($date) < time() - 20*60)
632 632 
 		{
633 633 
 			$date = date("Y-m-d H:i:s", time());
634 634 
 		}
635 635
636 
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
637 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
638 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
639 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
640 
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
641 
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
642 
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
643 
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
644 
-		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
645 
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
636 
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
637 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
638 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
639 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
640 
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
641 
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
642 
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
643 
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
644 
+		$comment = filter_var($comment, FILTER_SANITIZE_STRING);
645 
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
646 646
647 647 
                 if ($latitude == '' && $longitude == '') {
648 648 
             		$latitude = 0;
 
@@ -650,10 +650,10 @@  discard block
 
 block discarded – undo
650 650 
             	}
651 651 
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
652 652 
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
653 
-                $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type)
653 
+                $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type)
654 654 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
655 655
656 
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type);
656 
+                $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':comment' => $comment, ':type' => $type);
657 657
658 658 
 		try {
659 659 
 		        
@@ -679,13 +679,13 @@  discard block
 
 block discarded – undo
679 679 
 	{
680 680 
 		global $globalDBdriver, $globalTimezone;
681 681 
 		if ($globalDBdriver == 'mysql') {
682 
-			$query  = "SELECT tracker_output.ident FROM tracker_output
682 
+			$query = "SELECT tracker_output.ident FROM tracker_output
683 683 
 								WHERE tracker_output.ident = :ident
684 684 
 								AND tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR)
685 685 
 								AND tracker_output.date < UTC_TIMESTAMP()";
686 686 
 			$query_data = array(':ident' => $ident);
687 687 
 		} else {
688 
-			$query  = "SELECT tracker_output.ident FROM tracker_output
688 
+			$query = "SELECT tracker_output.ident FROM tracker_output
689 689 
 								WHERE tracker_output.ident = :ident
690 690 
 								AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
691 691 
 								AND tracker_output.date < now() AT TIME ZONE 'UTC'";
 
@@ -694,8 +694,8 @@  discard block
 
 block discarded – undo
694 694
695 695 
 		$sth = $this->db->prepare($query);
696 696 
 		$sth->execute($query_data);
697 
-    		$ident_result='';
698 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
697 
+    		$ident_result = '';
698 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
699 699 
 		{
700 700 
 			$ident_result = $row['ident'];
701 701 
 		}
 
@@ -721,8 +721,8 @@  discard block
 
 block discarded – undo
721 721 
 				return false;
722 722 
 			} else {
723 723 
 				$q_array = explode(" ", $q);
724 
-				foreach ($q_array as $q_item){
725 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
724 
+				foreach ($q_array as $q_item) {
725 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
726 726 
 					$additional_query .= " AND (";
727 727 
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%')";
728 728 
 					$additional_query .= ")";
 
@@ -730,11 +730,11 @@  discard block
 
 block discarded – undo
730 730 
 			}
731 731 
 		}
732 732 
 		if ($globalDBdriver == 'mysql') {
733 
-			$query  = "SELECT tracker_output.* FROM tracker_output
733 
+			$query = "SELECT tracker_output.* FROM tracker_output
734 734 
 				WHERE tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query."
735 735 
 				AND tracker_output.date < UTC_TIMESTAMP()";
736 736 
 		} else {
737 
-			$query  = "SELECT tracker_output.* FROM tracker_output
737 
+			$query = "SELECT tracker_output.* FROM tracker_output
738 738 
 				WHERE tracker_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query."
739 739 
 				AND tracker_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
740 740 
 		}
 
@@ -748,16 +748,16 @@  discard block
 
 block discarded – undo
748 748 
 	* @return Array the airline country list
749 749 
 	*
750 750 
 	*/
751 
-	public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
751 
+	public function countAllTrackerOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
752 752 
 	{
753 753 
 		global $globalDBdriver, $globalArchive;
754 754 
 		//$filter_query = $this->getFilter($filters,true,true);
755 
-		$Connection= new Connection($this->db);
755 
+		$Connection = new Connection($this->db);
756 756 
 		if (!$Connection->tableExists('countries')) return array();
757 757 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
758 758 
 			require_once('class.TrackerLive.php');
759 759 
 			$TrackerLive = new TrackerLive($this->db);
760 
-			$filter_query = $TrackerLive->getFilter($filters,true,true);
760 
+			$filter_query = $TrackerLive->getFilter($filters, true, true);
761 761 
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
762 762 
 			if ($olderthanmonths > 0) {
763 763 
 				if ($globalDBdriver == 'mysql') {
 
@@ -777,7 +777,7 @@  discard block
 
 block discarded – undo
777 777 
 		} else {
778 778 
 			require_once('class.TrackerArchive.php');
779 779 
 			$TrackerArchive = new TrackerArchive($this->db);
780 
-			$filter_query = $TrackerArchive->getFilter($filters,true,true);
780 
+			$filter_query = $TrackerArchive->getFilter($filters, true, true);
781 781 
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
782 782 
 			if ($olderthanmonths > 0) {
783 783 
 				if ($globalDBdriver == 'mysql') {
 
@@ -805,7 +805,7 @@  discard block
 
 block discarded – undo
805 805 
 		$flight_array = array();
806 806 
 		$temp_array = array();
807 807
808 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
808 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
809 809 
 		{
810 810 
 			$temp_array['tracker_count'] = $row['nb'];
811 811 
 			$temp_array['tracker_country'] = $row['name'];
 
@@ -822,11 +822,11 @@  discard block
 
 block discarded – undo
822 822 
 	* @return Array the callsign list
823 823 
 	*
824 824 
 	*/
825 
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
825 
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
826 826 
 	{
827 827 
 		global $globalDBdriver;
828 
-		$filter_query = $this->getFilter($filters,true,true);
829 
-		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count
828 
+		$filter_query = $this->getFilter($filters, true, true);
829 
+		$query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count
830 830 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
831 831 
 		 if ($olderthanmonths > 0) {
832 832 
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
 
@@ -840,28 +840,28 @@  discard block
 
 block discarded – undo
840 840 
 		if ($year != '') {
841 841 
 			if ($globalDBdriver == 'mysql') {
842 842 
 				$query .= " AND YEAR(tracker_output.date) = :year";
843 
-				$query_values = array_merge($query_values,array(':year' => $year));
843 
+				$query_values = array_merge($query_values, array(':year' => $year));
844 844 
 			} else {
845 845 
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
846 
-				$query_values = array_merge($query_values,array(':year' => $year));
846 
+				$query_values = array_merge($query_values, array(':year' => $year));
847 847 
 			}
848 848 
 		}
849 849 
 		if ($month != '') {
850 850 
 			if ($globalDBdriver == 'mysql') {
851 851 
 				$query .= " AND MONTH(tracker_output.date) = :month";
852 
-				$query_values = array_merge($query_values,array(':month' => $month));
852 
+				$query_values = array_merge($query_values, array(':month' => $month));
853 853 
 			} else {
854 854 
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
855 
-				$query_values = array_merge($query_values,array(':month' => $month));
855 
+				$query_values = array_merge($query_values, array(':month' => $month));
856 856 
 			}
857 857 
 		}
858 858 
 		if ($day != '') {
859 859 
 			if ($globalDBdriver == 'mysql') {
860 860 
 				$query .= " AND DAY(tracker_output.date) = :day";
861 
-				$query_values = array_merge($query_values,array(':day' => $day));
861 
+				$query_values = array_merge($query_values, array(':day' => $day));
862 862 
 			} else {
863 863 
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
864 
-				$query_values = array_merge($query_values,array(':day' => $day));
864 
+				$query_values = array_merge($query_values, array(':day' => $day));
865 865 
 			}
866 866 
 		}
867 867 
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
 
@@ -873,7 +873,7 @@  discard block
 
 block discarded – undo
873 873 
 		$callsign_array = array();
874 874 
 		$temp_array = array();
875 875
876 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
876 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
877 877 
 		{
878 878 
 			$temp_array['callsign_icao'] = $row['ident'];
879 879 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -925,7 +925,7 @@  discard block
 
 block discarded – undo
925 925 
 		$date_array = array();
926 926 
 		$temp_array = array();
927 927
928 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
928 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
929 929 
 		{
930 930 
 			$temp_array['date_name'] = $row['date_name'];
931 931 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -951,7 +951,7 @@  discard block
 
 block discarded – undo
951 951 
 			$datetime = new DateTime();
952 952 
 			$offset = $datetime->format('P');
953 953 
 		} else $offset = '+00:00';
954 
-		$filter_query = $this->getFilter($filters,true,true);
954 
+		$filter_query = $this->getFilter($filters, true, true);
955 955 
 		if ($globalDBdriver == 'mysql') {
956 956 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
957 957 
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
 
@@ -972,7 +972,7 @@  discard block
 
 block discarded – undo
972 972 
 		$date_array = array();
973 973 
 		$temp_array = array();
974 974
975 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
975 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
976 976 
 		{
977 977 
 			$temp_array['date_name'] = $row['date_name'];
978 978 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -997,7 +997,7 @@  discard block
 
 block discarded – undo
997 997 
 			$datetime = new DateTime();
998 998 
 			$offset = $datetime->format('P');
999 999 
 		} else $offset = '+00:00';
1000 
-		$filter_query = $this->getFilter($filters,true,true);
1000 
+		$filter_query = $this->getFilter($filters, true, true);
1001 1001 
 		if ($globalDBdriver == 'mysql') {
1002 1002 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
1003 1003 
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
 
@@ -1018,7 +1018,7 @@  discard block
 
 block discarded – undo
1018 1018 
 		$date_array = array();
1019 1019 
 		$temp_array = array();
1020 1020
1021 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1021 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1022 1022 
 		{
1023 1023 
 			$temp_array['date_name'] = $row['date_name'];
1024 1024 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -1065,7 +1065,7 @@  discard block
 
 block discarded – undo
1065 1065 
 		$date_array = array();
1066 1066 
 		$temp_array = array();
1067 1067
1068 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1068 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1069 1069 
 		{
1070 1070 
 			$temp_array['month_name'] = $row['month_name'];
1071 1071 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -1094,7 +1094,7 @@  discard block
 
 block discarded – undo
1094 1094 
 			$datetime = new DateTime();
1095 1095 
 			$offset = $datetime->format('P');
1096 1096 
 		} else $offset = '+00:00';
1097 
-		$filter_query = $this->getFilter($filters,true,true);
1097 
+		$filter_query = $this->getFilter($filters, true, true);
1098 1098 
 		if ($globalDBdriver == 'mysql') {
1099 1099 
 			$query  = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
1100 1100 
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
 
@@ -1115,7 +1115,7 @@  discard block
 
 block discarded – undo
1115 1115 
 		$date_array = array();
1116 1116 
 		$temp_array = array();
1117 1117
1118 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1118 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1119 1119 
 		{
1120 1120 
 			$temp_array['year_name'] = $row['year_name'];
1121 1121 
 			$temp_array['month_name'] = $row['month_name'];
 
@@ -1135,7 +1135,7 @@  discard block
 
 block discarded – undo
1135 1135 
 	* @return Array the hour list
1136 1136 
 	*
1137 1137 
 	*/
1138 
-	public function countAllHours($orderby,$filters = array())
1138 
+	public function countAllHours($orderby, $filters = array())
1139 1139 
 	{
1140 1140 
 		global $globalTimezone, $globalDBdriver;
1141 1141 
 		if ($globalTimezone != '') {
 
@@ -1183,7 +1183,7 @@  discard block
 
 block discarded – undo
1183 1183 
 		$hour_array = array();
1184 1184 
 		$temp_array = array();
1185 1185
1186 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1186 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1187 1187 
 		{
1188 1188 
 			$temp_array['hour_name'] = $row['hour_name'];
1189 1189 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1205,8 +1205,8 @@  discard block
 
 block discarded – undo
1205 1205 
 	public function countAllHoursByDate($date, $filters = array())
1206 1206 
 	{
1207 1207 
 		global $globalTimezone, $globalDBdriver;
1208 
-		$filter_query = $this->getFilter($filters,true,true);
1209 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
1208 
+		$filter_query = $this->getFilter($filters, true, true);
1209 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
1210 1210 
 		if ($globalTimezone != '') {
1211 1211 
 			date_default_timezone_set($globalTimezone);
1212 1212 
 			$datetime = new DateTime($date);
 
@@ -1214,12 +1214,12 @@  discard block
 
 block discarded – undo
1214 1214 
 		} else $offset = '+00:00';
1215 1215
1216 1216 
 		if ($globalDBdriver == 'mysql') {
1217 
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1217 
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1218 1218 
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = :date
1219 1219 
 								GROUP BY hour_name
1220 1220 
 								ORDER BY hour_name ASC";
1221 1221 
 		} else {
1222 
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1222 
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1223 1223 
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
1224 1224 
 								GROUP BY hour_name
1225 1225 
 								ORDER BY hour_name ASC";
 
@@ -1231,7 +1231,7 @@  discard block
 
 block discarded – undo
1231 1231 
 		$hour_array = array();
1232 1232 
 		$temp_array = array();
1233 1233
1234 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1234 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1235 1235 
 		{
1236 1236 
 			$temp_array['hour_name'] = $row['hour_name'];
1237 1237 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1253,8 +1253,8 @@  discard block
 
 block discarded – undo
1253 1253 
 	public function countAllHoursByIdent($ident, $filters = array())
1254 1254 
 	{
1255 1255 
 		global $globalTimezone, $globalDBdriver;
1256 
-		$filter_query = $this->getFilter($filters,true,true);
1257 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
1256 
+		$filter_query = $this->getFilter($filters, true, true);
1257 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1258 1258 
 		if ($globalTimezone != '') {
1259 1259 
 			date_default_timezone_set($globalTimezone);
1260 1260 
 			$datetime = new DateTime();
 
@@ -1262,12 +1262,12 @@  discard block
 
 block discarded – undo
1262 1262 
 		} else $offset = '+00:00';
1263 1263
1264 1264 
 		if ($globalDBdriver == 'mysql') {
1265 
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1265 
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1266 1266 
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident
1267 1267 
 								GROUP BY hour_name
1268 1268 
 								ORDER BY hour_name ASC";
1269 1269 
 		} else {
1270 
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1270 
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1271 1271 
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident
1272 1272 
 								GROUP BY hour_name
1273 1273 
 								ORDER BY hour_name ASC";
 
@@ -1275,12 +1275,12 @@  discard block
 
 block discarded – undo
1275 1275
1276 1276
1277 1277 
 		$sth = $this->db->prepare($query);
1278 
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
1278 
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
1279 1279
1280 1280 
 		$hour_array = array();
1281 1281 
 		$temp_array = array();
1282 1282
1283 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1283 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1284 1284 
 		{
1285 1285 
 			$temp_array['hour_name'] = $row['hour_name'];
1286 1286 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1299,33 +1299,33 @@  discard block
 
 block discarded – undo
1299 1299 
 	* @return Integer the number of trackers
1300 1300 
 	*
1301 1301 
 	*/
1302 
-	public function countOverallTracker($filters = array(),$year = '',$month = '')
1302 
+	public function countOverallTracker($filters = array(), $year = '', $month = '')
1303 1303 
 	{
1304 1304 
 		global $globalDBdriver;
1305 1305 
 		//$queryi  = "SELECT COUNT(tracker_output.tracker_id) AS flight_count FROM tracker_output";
1306 
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
1306 
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
1307 1307 
 		$query_values = array();
1308 1308 
 		$query = '';
1309 1309 
 		if ($year != '') {
1310 1310 
 			if ($globalDBdriver == 'mysql') {
1311 1311 
 				$query .= " AND YEAR(tracker_output.date) = :year";
1312 
-				$query_values = array_merge($query_values,array(':year' => $year));
1312 
+				$query_values = array_merge($query_values, array(':year' => $year));
1313 1313 
 			} else {
1314 1314 
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
1315 
-				$query_values = array_merge($query_values,array(':year' => $year));
1315 
+				$query_values = array_merge($query_values, array(':year' => $year));
1316 1316 
 			}
1317 1317 
 		}
1318 1318 
 		if ($month != '') {
1319 1319 
 			if ($globalDBdriver == 'mysql') {
1320 1320 
 				$query .= " AND MONTH(tracker_output.date) = :month";
1321 
-				$query_values = array_merge($query_values,array(':month' => $month));
1321 
+				$query_values = array_merge($query_values, array(':month' => $month));
1322 1322 
 			} else {
1323 1323 
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
1324 
-				$query_values = array_merge($query_values,array(':month' => $month));
1324 
+				$query_values = array_merge($query_values, array(':month' => $month));
1325 1325 
 			}
1326 1326 
 		}
1327 1327 
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1328 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1328 
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
1329 1329
1330 1330 
 		$sth = $this->db->prepare($queryi);
1331 1331 
 		$sth->execute($query_values);
 
@@ -1338,32 +1338,32 @@  discard block
 
 block discarded – undo
1338 1338 
 	* @return Integer the number of flights
1339 1339 
 	*
1340 1340 
 	*/
1341 
-	public function countOverallTrackerTypes($filters = array(),$year = '',$month = '')
1341 
+	public function countOverallTrackerTypes($filters = array(), $year = '', $month = '')
1342 1342 
 	{
1343 1343 
 		global $globalDBdriver;
1344 
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
1344 
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
1345 1345 
 		$query_values = array();
1346 1346 
 		$query = '';
1347 1347 
 		if ($year != '') {
1348 1348 
 			if ($globalDBdriver == 'mysql') {
1349 1349 
 				$query .= " AND YEAR(tracker_output.date) = :year";
1350 
-				$query_values = array_merge($query_values,array(':year' => $year));
1350 
+				$query_values = array_merge($query_values, array(':year' => $year));
1351 1351 
 			} else {
1352 1352 
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
1353 
-				$query_values = array_merge($query_values,array(':year' => $year));
1353 
+				$query_values = array_merge($query_values, array(':year' => $year));
1354 1354 
 			}
1355 1355 
 		}
1356 1356 
 		if ($month != '') {
1357 1357 
 			if ($globalDBdriver == 'mysql') {
1358 1358 
 				$query .= " AND MONTH(tracker_output.date) = :month";
1359 
-				$query_values = array_merge($query_values,array(':month' => $month));
1359 
+				$query_values = array_merge($query_values, array(':month' => $month));
1360 1360 
 			} else {
1361 1361 
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
1362 
-				$query_values = array_merge($query_values,array(':month' => $month));
1362 
+				$query_values = array_merge($query_values, array(':month' => $month));
1363 1363 
 			}
1364 1364 
 		}
1365 1365 
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1366 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1366 
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
1367 1367
1368 1368 
 		$sth = $this->db->prepare($queryi);
1369 1369 
 		$sth->execute($query_values);
 
@@ -1380,7 +1380,7 @@  discard block
 
 block discarded – undo
1380 1380 
 	public function countAllHoursFromToday($filters = array())
1381 1381 
 	{
1382 1382 
 		global $globalTimezone, $globalDBdriver;
1383 
-		$filter_query = $this->getFilter($filters,true,true);
1383 
+		$filter_query = $this->getFilter($filters, true, true);
1384 1384 
 		if ($globalTimezone != '') {
1385 1385 
 			date_default_timezone_set($globalTimezone);
1386 1386 
 			$datetime = new DateTime();
 
@@ -1388,12 +1388,12 @@  discard block
 
 block discarded – undo
1388 1388 
 		} else $offset = '+00:00';
1389 1389
1390 1390 
 		if ($globalDBdriver == 'mysql') {
1391 
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1391 
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1392 1392 
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = CURDATE()
1393 1393 
 								GROUP BY hour_name
1394 1394 
 								ORDER BY hour_name ASC";
1395 1395 
 		} else {
1396 
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1396 
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1397 1397 
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
1398 1398 
 								GROUP BY hour_name
1399 1399 
 								ORDER BY hour_name ASC";
 
@@ -1405,7 +1405,7 @@  discard block
 
 block discarded – undo
1405 1405 
 		$hour_array = array();
1406 1406 
 		$temp_array = array();
1407 1407
1408 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1408 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1409 1409 
 		{
1410 1410 
 			$temp_array['hour_name'] = $row['hour_name'];
1411 1411 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1424,9 +1424,9 @@  discard block
 
 block discarded – undo
1424 1424 
 	*/
1425 1425 
 	public function getTrackerIDBasedOnFamTrackID($famtrackid)
1426 1426 
 	{
1427 
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
1427 
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
1428 1428
1429 
-		$query  = "SELECT tracker_output.tracker_id
1429 
+		$query = "SELECT tracker_output.tracker_id
1430 1430 
 				FROM tracker_output
1431 1431 
 				WHERE tracker_output.famtrackid = '".$famtrackid."'";
1432 1432 
         
@@ -1434,7 +1434,7 @@  discard block
 
 block discarded – undo
1434 1434 
 		$sth = $this->db->prepare($query);
1435 1435 
 		$sth->execute();
1436 1436
1437 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1437 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1438 1438 
 		{
1439 1439 
 			return $row['tracker_id'];
1440 1440 
 		}
 
@@ -1459,23 +1459,23 @@  discard block
 
 block discarded – undo
1459 1459 
 		}
1460 1460
1461 1461 
 		$current_date = date("Y-m-d H:i:s");
1462 
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
1462 
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
1463 1463
1464 1464 
 		$diff = abs(strtotime($current_date) - strtotime($date));
1465 1465
1466 
-		$time_array['years'] = floor($diff / (365*60*60*24));
1466 
+		$time_array['years'] = floor($diff/(365*60*60*24));
1467 1467 
 		$years = $time_array['years'];
1468 1468
1469 
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
1469 
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
1470 1470 
 		$months = $time_array['months'];
1471 1471
1472 
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
1472 
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
1473 1473 
 		$days = $time_array['days'];
1474 
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
1474 
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
1475 1475 
 		$hours = $time_array['hours'];
1476 
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
1476 
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
1477 1477 
 		$minutes = $time_array['minutes'];
1478 
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
1478 
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
1479 1479
1480 1480 
 		return $time_array;
1481 1481 
 	}
 
@@ -1498,63 +1498,63 @@  discard block
 
 block discarded – undo
1498 1498 
 			$temp_array['direction_degree'] = $direction;
1499 1499 
 			$temp_array['direction_shortname'] = "N";
1500 1500 
 			$temp_array['direction_fullname'] = "North";
1501 
-		} elseif ($direction >= 22.5 && $direction < 45){
1501 
+		} elseif ($direction >= 22.5 && $direction < 45) {
1502 1502 
 			$temp_array['direction_degree'] = $direction;
1503 1503 
 			$temp_array['direction_shortname'] = "NNE";
1504 1504 
 			$temp_array['direction_fullname'] = "North-Northeast";
1505 
-		} elseif ($direction >= 45 && $direction < 67.5){
1505 
+		} elseif ($direction >= 45 && $direction < 67.5) {
1506 1506 
 			$temp_array['direction_degree'] = $direction;
1507 1507 
 			$temp_array['direction_shortname'] = "NE";
1508 1508 
 			$temp_array['direction_fullname'] = "Northeast";
1509 
-		} elseif ($direction >= 67.5 && $direction < 90){
1509 
+		} elseif ($direction >= 67.5 && $direction < 90) {
1510 1510 
 			$temp_array['direction_degree'] = $direction;
1511 1511 
 			$temp_array['direction_shortname'] = "ENE";
1512 1512 
 			$temp_array['direction_fullname'] = "East-Northeast";
1513 
-		} elseif ($direction >= 90 && $direction < 112.5){
1513 
+		} elseif ($direction >= 90 && $direction < 112.5) {
1514 1514 
 			$temp_array['direction_degree'] = $direction;
1515 1515 
 			$temp_array['direction_shortname'] = "E";
1516 1516 
 			$temp_array['direction_fullname'] = "East";
1517 
-		} elseif ($direction >= 112.5 && $direction < 135){
1517 
+		} elseif ($direction >= 112.5 && $direction < 135) {
1518 1518 
 			$temp_array['direction_degree'] = $direction;
1519 1519 
 			$temp_array['direction_shortname'] = "ESE";
1520 1520 
 			$temp_array['direction_fullname'] = "East-Southeast";
1521 
-		} elseif ($direction >= 135 && $direction < 157.5){
1521 
+		} elseif ($direction >= 135 && $direction < 157.5) {
1522 1522 
 			$temp_array['direction_degree'] = $direction;
1523 1523 
 			$temp_array['direction_shortname'] = "SE";
1524 1524 
 			$temp_array['direction_fullname'] = "Southeast";
1525 
-		} elseif ($direction >= 157.5 && $direction < 180){
1525 
+		} elseif ($direction >= 157.5 && $direction < 180) {
1526 1526 
 			$temp_array['direction_degree'] = $direction;
1527 1527 
 			$temp_array['direction_shortname'] = "SSE";
1528 1528 
 			$temp_array['direction_fullname'] = "South-Southeast";
1529 
-		} elseif ($direction >= 180 && $direction < 202.5){
1529 
+		} elseif ($direction >= 180 && $direction < 202.5) {
1530 1530 
 			$temp_array['direction_degree'] = $direction;
1531 1531 
 			$temp_array['direction_shortname'] = "S";
1532 1532 
 			$temp_array['direction_fullname'] = "South";
1533 
-		} elseif ($direction >= 202.5 && $direction < 225){
1533 
+		} elseif ($direction >= 202.5 && $direction < 225) {
1534 1534 
 			$temp_array['direction_degree'] = $direction;
1535 1535 
 			$temp_array['direction_shortname'] = "SSW";
1536 1536 
 			$temp_array['direction_fullname'] = "South-Southwest";
1537 
-		} elseif ($direction >= 225 && $direction < 247.5){
1537 
+		} elseif ($direction >= 225 && $direction < 247.5) {
1538 1538 
 			$temp_array['direction_degree'] = $direction;
1539 1539 
 			$temp_array['direction_shortname'] = "SW";
1540 1540 
 			$temp_array['direction_fullname'] = "Southwest";
1541 
-		} elseif ($direction >= 247.5 && $direction < 270){
1541 
+		} elseif ($direction >= 247.5 && $direction < 270) {
1542 1542 
 			$temp_array['direction_degree'] = $direction;
1543 1543 
 			$temp_array['direction_shortname'] = "WSW";
1544 1544 
 			$temp_array['direction_fullname'] = "West-Southwest";
1545 
-		} elseif ($direction >= 270 && $direction < 292.5){
1545 
+		} elseif ($direction >= 270 && $direction < 292.5) {
1546 1546 
 			$temp_array['direction_degree'] = $direction;
1547 1547 
 			$temp_array['direction_shortname'] = "W";
1548 1548 
 			$temp_array['direction_fullname'] = "West";
1549 
-		} elseif ($direction >= 292.5 && $direction < 315){
1549 
+		} elseif ($direction >= 292.5 && $direction < 315) {
1550 1550 
 			$temp_array['direction_degree'] = $direction;
1551 1551 
 			$temp_array['direction_shortname'] = "WNW";
1552 1552 
 			$temp_array['direction_fullname'] = "West-Northwest";
1553 
-		} elseif ($direction >= 315 && $direction < 337.5){
1553 
+		} elseif ($direction >= 315 && $direction < 337.5) {
1554 1554 
 			$temp_array['direction_degree'] = $direction;
1555 1555 
 			$temp_array['direction_shortname'] = "NW";
1556 1556 
 			$temp_array['direction_fullname'] = "Northwest";
1557 
-		} elseif ($direction >= 337.5 && $direction < 360){
1557 
+		} elseif ($direction >= 337.5 && $direction < 360) {
1558 1558 
 			$temp_array['direction_degree'] = $direction;
1559 1559 
 			$temp_array['direction_shortname'] = "NNW";
1560 1560 
 			$temp_array['direction_fullname'] = "North-Northwest";
 
@@ -1571,11 +1571,11 @@  discard block
 
 block discarded – undo
1571 1571 
 	* @param Float $longitude longitute of the flight
1572 1572 
 	* @return String the countrie
1573 1573 
 	*/
1574 
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
1574 
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
1575 1575 
 	{
1576 1576 
 		global $globalDBdriver, $globalDebug;
1577 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1578 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1577 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1578 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1579 1579
1580 1580 
 		$Connection = new Connection($this->db);
1581 1581 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -1615,7 +1615,7 @@  discard block
 
 block discarded – undo
1615 1615 
 	public function getCountryFromISO2($iso2)
1616 1616 
 	{
1617 1617 
 		global $globalDBdriver, $globalDebug;
1618 
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1618 
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
1619 1619
1620 1620 
 		$Connection = new Connection($this->db);
1621 1621 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -1644,11 +1644,11 @@  discard block
 
 block discarded – undo
1644 1644 
 	* @return Array the vessel type list
1645 1645 
 	*
1646 1646 
 	*/
1647 
-	public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
1647 
+	public function countAllTrackerTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
1648 1648 
 	{
1649 1649 
 		global $globalDBdriver;
1650 
-		$filter_query = $this->getFilter($filters,true,true);
1651 
-		$query  = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count
1650 
+		$filter_query = $this->getFilter($filters, true, true);
1651 
+		$query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count
1652 1652 
 		    FROM tracker_output ".$filter_query." tracker_output.type  <> ''";
1653 1653 
 		if ($olderthanmonths > 0) {
1654 1654 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1668,28 +1668,28 @@  discard block
 
 block discarded – undo
1668 1668 
 		if ($year != '') {
1669 1669 
 			if ($globalDBdriver == 'mysql') {
1670 1670 
 				$query .= " AND YEAR(tracker_output.date) = :year";
1671 
-				$query_values = array_merge($query_values,array(':year' => $year));
1671 
+				$query_values = array_merge($query_values, array(':year' => $year));
1672 1672 
 			} else {
1673 1673 
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
1674 
-				$query_values = array_merge($query_values,array(':year' => $year));
1674 
+				$query_values = array_merge($query_values, array(':year' => $year));
1675 1675 
 			}
1676 1676 
 		}
1677 1677 
 		if ($month != '') {
1678 1678 
 			if ($globalDBdriver == 'mysql') {
1679 1679 
 				$query .= " AND MONTH(tracker_output.date) = :month";
1680 
-				$query_values = array_merge($query_values,array(':month' => $month));
1680 
+				$query_values = array_merge($query_values, array(':month' => $month));
1681 1681 
 			} else {
1682 1682 
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
1683 
-				$query_values = array_merge($query_values,array(':month' => $month));
1683 
+				$query_values = array_merge($query_values, array(':month' => $month));
1684 1684 
 			}
1685 1685 
 		}
1686 1686 
 		if ($day != '') {
1687 1687 
 			if ($globalDBdriver == 'mysql') {
1688 1688 
 				$query .= " AND DAY(tracker_output.date) = :day";
1689 
-				$query_values = array_merge($query_values,array(':day' => $day));
1689 
+				$query_values = array_merge($query_values, array(':day' => $day));
1690 1690 
 			} else {
1691 1691 
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
1692 
-				$query_values = array_merge($query_values,array(':day' => $day));
1692 
+				$query_values = array_merge($query_values, array(':day' => $day));
1693 1693 
 			}
1694 1694 
 		}
1695 1695 
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
 
@@ -1698,7 +1698,7 @@  discard block
 
 block discarded – undo
1698 1698 
 		$sth->execute($query_values);
1699 1699 
 		$tracker_array = array();
1700 1700 
 		$temp_array = array();
1701 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1701 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1702 1702 
 		{
1703 1703 
 			$temp_array['tracker_type'] = $row['tracker_type'];
1704 1704 
 			$temp_array['tracker_type_count'] = $row['tracker_type_count'];
 
@@ -1713,13 +1713,13 @@  discard block
 
 block discarded – undo
1713 1713 
 	* @return Array the tracker information
1714 1714 
 	*
1715 1715 
 	*/
1716 
-	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
1716 
+	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
1717 1717 
 	{
1718 1718 
 		global $globalTimezone, $globalDBdriver;
1719 1719 
 		date_default_timezone_set('UTC');
1720 1720 
 		$query_values = array();
1721 1721 
 		$additional_query = '';
1722 
-		$filter_query = $this->getFilter($filters,true,true);
1722 
+		$filter_query = $this->getFilter($filters, true, true);
1723 1723 
 		if ($q != "")
1724 1724 
 		{
1725 1725 
 			if (!is_string($q))
 
@@ -1727,8 +1727,8 @@  discard block
 
 block discarded – undo
1727 1727 
 				return false;
1728 1728 
 			} else {
1729 1729 
 				$q_array = explode(" ", $q);
1730 
-				foreach ($q_array as $q_item){
1731 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
1730 
+				foreach ($q_array as $q_item) {
1731 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
1732 1732 
 					$additional_query .= " AND (";
1733 1733 
 					if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
1734 1734 
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%') OR ";
 
@@ -1738,20 +1738,20 @@  discard block
 
 block discarded – undo
1738 1738 
 		}
1739 1739 
 		if ($callsign != "")
1740 1740 
 		{
1741 
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
1741 
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
1742 1742 
 			if (!is_string($callsign))
1743 1743 
 			{
1744 1744 
 				return false;
1745 1745 
 			} else {
1746 1746 
 				$additional_query .= " AND tracker_output.ident = :callsign";
1747 
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
1747 
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
1748 1748 
 			}
1749 1749 
 		}
1750 1750 
 		if ($date_posted != "")
1751 1751 
 		{
1752 1752 
 			$date_array = explode(",", $date_posted);
1753 
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
1754 
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
1753 
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
1754 
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
1755 1755 
 			if ($globalTimezone != '') {
1756 1756 
 				date_default_timezone_set($globalTimezone);
1757 1757 
 				$datetime = new DateTime();
 
@@ -1778,8 +1778,8 @@  discard block
 
 block discarded – undo
1778 1778 
 		if ($limit != "")
1779 1779 
 		{
1780 1780 
 			$limit_array = explode(",", $limit);
1781 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1782 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1781 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1782 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1783 1783 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1784 1784 
 			{
1785 1785 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
 
@@ -1797,22 +1797,22 @@  discard block
 
 block discarded – undo
1797 1797 
 			}
1798 1798 
 		}
1799 1799 
 		if ($origLat != "" && $origLon != "" && $dist != "") {
1800 
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
1800 
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
1801 1801 
 			if ($globalDBdriver == 'mysql') {
1802 
-				$query="SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance
1802 
+				$query = "SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance
1803 1803 
 				    FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND tracker_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and tracker_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
1804 1804 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
1805 1805 
 			} else {
1806 
-				$query="SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance
1806 
+				$query = "SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance
1807 1807 
 				    FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
1808 1808 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query;
1809 1809 
 			}
1810 1810 
 		} else {
1811 
-			$query  = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> ''
1811 
+			$query = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> ''
1812 1812 
 			    ".$additional_query."
1813 1813 
 			    ".$orderby_query;
1814 1814 
 		}
1815 
-		$tracker_array = $this->getDataFromDB($query, $query_values,$limit_query);
1815 
+		$tracker_array = $this->getDataFromDB($query, $query_values, $limit_query);
1816 1816 
 		return $tracker_array;
1817 1817 
 	}
1818 1818 
 
@@ -1837,7 +1837,7 @@  discard block
 
 block discarded – undo
1837 1837 
 		curl_close($ch);
1838 1838 
 		$bitly_data = json_decode($bitly_data);
1839 1839 
 		$bitly_url = '';
1840 
-		if ($bitly_data->status_txt = "OK"){
1840 
+		if ($bitly_data->status_txt = "OK") {
1841 1841 
 			$bitly_url = $bitly_data->data->url;
1842 1842 
 		}
1843 1843 
 		return $bitly_url;
 
@@ -1845,7 +1845,7 @@  discard block
 
 block discarded – undo
1845 1845
1846 1846 
 	public function getOrderBy()
1847 1847 
 	{
1848 
-		$orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY tracker_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY tracker_output.type DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
1848 
+		$orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY tracker_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY tracker_output.type DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
1849 1849
1850 1850 
 		return $orderby;
1851 1851
Please login to merge, or discard this patch.