View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( f4eedb...76be65 )
by Yannick
126:35 queued 101:17
created
Status
Category
Toggle Patches
require/class.Stats.php 2 patches
Doc Comments   +35 added lines patch added patch discarded remove patch 
@@ -19,6 +19,10 @@  discard block
 
 block discarded – undo
19 19 
 		if ($this->db === null) die('Error: No DB connection.');
20 20 
 	}
21 21
22 
+	/**
23 
+	 * @param string $type
24 
+	 * @param string $stats_date
25 
+	 */
22 26 
 	public function addLastStatsUpdate($type,$stats_date) {
23 27 
 		$query = "DELETE FROM config WHERE name = :type;
24 28 
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
 
@@ -1369,6 +1373,10 @@  discard block
 
 block discarded – undo
1369 1373 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1370 1374 
 		return $all;
1371 1375 
 	}
1376 
+
1377 
+	/**
1378 
+	 * @param string $type
1379 
+	 */
1372 1380 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1373 1381 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1374 1382 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1380,6 +1388,11 @@  discard block
 
 block discarded – undo
1380 1388 
 			echo "error : ".$e->getMessage();
1381 1389 
 		}
1382 1390 
 	}
1391 
+
1392 
+	/**
1393 
+	 * @param string $type
1394 
+	 * @param string $year
1395 
+	 */
1383 1396 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1384 1397 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1385 1398 
 		global $globalArchiveMonths, $globalDBdriver;
 
@@ -1579,6 +1592,10 @@  discard block
 
 block discarded – undo
1579 1592 
 		else return 0;
1580 1593 
 	}
1581 1594
1595 
+	/**
1596 
+	 * @param string $type
1597 
+	 * @param string $stats_date
1598 
+	 */
1582 1599 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1583 1600 
 		global $globalDBdriver;
1584 1601 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 
@@ -1632,6 +1649,9 @@  discard block
 
 block discarded – undo
1632 1649 
         }
1633 1650 
         */
1634 1651
1652 
+	/**
1653 
+	 * @param string $stats_type
1654 
+	 */
1635 1655 
 	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1636 1656 
 		global $globalDBdriver;
1637 1657 
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
 
@@ -1675,6 +1695,9 @@  discard block
 
 block discarded – undo
1675 1695 
 		return $all;
1676 1696 
 	}
1677 1697
1698 
+	/**
1699 
+	 * @param string $stats_type
1700 
+	 */
1678 1701 
 	public function addStatSource($data,$source_name,$stats_type,$date) {
1679 1702 
 		global $globalDBdriver;
1680 1703 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1690,6 +1713,10 @@  discard block
 
 block discarded – undo
1690 1713 
 			return "error : ".$e->getMessage();
1691 1714 
 		}
1692 1715 
 	}
1716 
+
1717 
+	/**
1718 
+	 * @param string $type
1719 
+	 */
1693 1720 
 	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1694 1721 
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1695 1722 
 		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 
@@ -1956,6 +1983,10 @@  discard block
 
 block discarded – undo
1956 1983 
 			return "error : ".$e->getMessage();
1957 1984 
 		}
1958 1985 
 	}
1986 
+
1987 
+	/**
1988 
+	 * @param string $type
1989 
+	 */
1959 1990 
 	public function deleteStatFlight($type) {
1960 1991 
 		$query = "DELETE FROM stats_flight WHERE stats_type = :type";
1961 1992 
 		$query_values = array(':type' => $type);
 
@@ -1966,6 +1997,10 @@  discard block
 
 block discarded – undo
1966 1997 
 			return "error : ".$e->getMessage();
1967 1998 
 		}
1968 1999 
 	}
2000 
+
2001 
+	/**
2002 
+	 * @param string $type
2003 
+	 */
1969 2004 
 	public function deleteStatAirport($type) {
1970 2005 
 		$query = "DELETE FROM stats_airport WHERE stats_type = :type";
1971 2006 
 		$query_values = array(':type' => $type);
Please login to merge, or discard this patch.
Braces   +583 added lines, -205 removed lines patch added patch discarded remove patch 
@@ -13,10 +13,14 @@  discard block
 
 block discarded – undo
13 13
14 14 
 	public function __construct($dbc = null) {
15 15 
 		global $globalFilterName;
16 
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
16 
+		if (isset($globalFilterName)) {
17 
+			$this->filter_name = $globalFilterName;
18 
+		}
17 19 
 		$Connection = new Connection($dbc);
18 20 
 		$this->db = $Connection->db();
19 
-		if ($this->db === null) die('Error: No DB connection.');
21 
+		if ($this->db === null) {
22 
+			die('Error: No DB connection.');
23 
+		}
20 24 
 	}
21 25
22 26 
 	public function addLastStatsUpdate($type,$stats_date) {
 
@@ -84,7 +88,9 @@  discard block
 
 block discarded – undo
84 88
85 89 
 	public function getAllAirlineNames($filter_name = '') {
86 90 
 		global $globalStatsFilters;
87 
-		if ($filter_name == '') $filter_name = $this->filter_name;
91 
+		if ($filter_name == '') {
92 
+			$filter_name = $this->filter_name;
93 
+		}
88 94 
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
89 95 
 		 try {
90 96 
 			$sth = $this->db->prepare($query);
 
@@ -104,7 +110,9 @@  discard block
 
 block discarded – undo
104 110 
 		return $all;
105 111 
 	}
106 112 
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
107 
-		if ($filter_name == '') $filter_name = $this->filter_name;
113 
+		if ($filter_name == '') {
114 
+			$filter_name = $this->filter_name;
115 
+		}
108 116 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
109 117 
 		try {
110 118 
 			$sth = $this->db->prepare($query);
 
@@ -116,7 +124,9 @@  discard block
 
 block discarded – undo
116 124 
 		return $all;
117 125 
 	}
118 126 
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
119 
-		if ($filter_name == '') $filter_name = $this->filter_name;
127 
+		if ($filter_name == '') {
128 
+			$filter_name = $this->filter_name;
129 
+		}
120 130 
 		$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";
121 131 
 		try {
122 132 
 			$sth = $this->db->prepare($query);
 
@@ -128,7 +138,9 @@  discard block
 
 block discarded – undo
128 138 
 		return $all;
129 139 
 	}
130 140 
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
131 
-		if ($filter_name == '') $filter_name = $this->filter_name;
141 
+		if ($filter_name == '') {
142 
+			$filter_name = $this->filter_name;
143 
+		}
132 144 
 		$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";
133 145 
 		try {
134 146 
 			$sth = $this->db->prepare($query);
 
@@ -141,7 +153,9 @@  discard block
 
 block discarded – undo
141 153 
 	}
142 154
143 155 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
144 
-		if ($filter_name == '') $filter_name = $this->filter_name;
156 
+		if ($filter_name == '') {
157 
+			$filter_name = $this->filter_name;
158 
+		}
145 159 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
146 160 
 		try {
147 161 
 			$sth = $this->db->prepare($query);
 
@@ -154,7 +168,9 @@  discard block
 
 block discarded – undo
154 168 
 	}
155 169
156 170 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
157 
-		if ($filter_name == '') $filter_name = $this->filter_name;
171 
+		if ($filter_name == '') {
172 
+			$filter_name = $this->filter_name;
173 
+		}
158 174 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
159 175 
 		try {
160 176 
 			$sth = $this->db->prepare($query);
 
@@ -169,7 +185,9 @@  discard block
 
 block discarded – undo
169 185
170 186 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
171 187 
 		global $globalStatsFilters;
172 
-		if ($filter_name == '') $filter_name = $this->filter_name;
188 
+		if ($filter_name == '') {
189 
+			$filter_name = $this->filter_name;
190 
+		}
173 191 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
174 192 
 			$Spotter = new Spotter($this->db);
175 193 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -178,8 +196,11 @@  discard block
 
 block discarded – undo
178 196 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
179 197 
 			}
180 198 
 			if ($year == '' && $month == '') {
181 
-				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 stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
199 
+				if ($limit) {
200 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
201 
+				} else {
202 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
203 
+				}
183 204 
 				try {
184 205 
 					$sth = $this->db->prepare($query);
185 206 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -187,11 +208,16 @@  discard block
 
 block discarded – undo
187 208 
 					echo "error : ".$e->getMessage();
188 209 
 				}
189 210 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
190 
-			} else $all = array();
211 
+			} else {
212 
+				$all = array();
213 
+			}
191 214 
 		} else {
192 215 
 			if ($year == '' && $month == '') {
193 
-				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 stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
194 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
216 
+				if ($limit) {
217 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
218 
+				} else {
219 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
220 
+				}
195 221 
 				try {
196 222 
 					$sth = $this->db->prepare($query);
197 223 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -199,7 +225,9 @@  discard block
 
 block discarded – undo
199 225 
 					echo "error : ".$e->getMessage();
200 226 
 				}
201 227 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
202 
-			} else $all = array();
228 
+			} else {
229 
+				$all = array();
230 
+			}
203 231 
 		}
204 232 
 		if (empty($all)) {
205 233 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -218,10 +246,15 @@  discard block
 
 block discarded – undo
218 246 
 	}
219 247 
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
220 248 
 		global $globalStatsFilters;
221 
-		if ($filter_name == '') $filter_name = $this->filter_name;
249 
+		if ($filter_name == '') {
250 
+			$filter_name = $this->filter_name;
251 
+		}
222 252 
 		if ($year == '' && $month == '') {
223 
-			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";
224 
-			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";
253 
+			if ($limit) {
254 
+				$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";
255 
+			} else {
256 
+				$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";
257 
+			}
225 258 
 			try {
226 259 
 				$sth = $this->db->prepare($query);
227 260 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -229,7 +262,9 @@  discard block
 
 block discarded – undo
229 262 
 				echo "error : ".$e->getMessage();
230 263 
 			}
231 264 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
232 
-		} else $all = array();
265 
+		} else {
266 
+			$all = array();
267 
+		}
233 268 
 		if (empty($all)) {
234 269 
 			$Spotter = new Spotter($this->db);
235 270 
 			$filters = array();
 
@@ -244,7 +279,9 @@  discard block
 
 block discarded – undo
244 279 
 	}
245 280 
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
246 281 
 		global $globalStatsFilters;
247 
-		if ($filter_name == '') $filter_name = $this->filter_name;
282 
+		if ($filter_name == '') {
283 
+			$filter_name = $this->filter_name;
284 
+		}
248 285 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
249 286 
 			$Spotter = new Spotter($this->db);
250 287 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -253,8 +290,11 @@  discard block
 
 block discarded – undo
253 290 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
254 291 
 			}
255 292 
 			if ($year == '' && $month == '') {
256 
-				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";
257 
-				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";
293 
+				if ($limit) {
294 
+					$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";
295 
+				} else {
296 
+					$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";
297 
+				}
258 298 
 				try {
259 299 
 					$sth = $this->db->prepare($query);
260 300 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -262,11 +302,16 @@  discard block
 
 block discarded – undo
262 302 
 					echo "error : ".$e->getMessage();
263 303 
 				}
264 304 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
265 
-			} else $all = array();
305 
+			} else {
306 
+				$all = array();
307 
+			}
266 308 
 		} else {
267 309 
 			if ($year == '' && $month == '') {
268 
-				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";
269 
-				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";
310 
+				if ($limit) {
311 
+					$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";
312 
+				} else {
313 
+					$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";
314 
+				}
270 315 
 				try {
271 316 
 					$sth = $this->db->prepare($query);
272 317 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -274,7 +319,9 @@  discard block
 
 block discarded – undo
274 319 
 					echo "error : ".$e->getMessage();
275 320 
 				}
276 321 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
277 
-			} else $all = array();
322 
+			} else {
323 
+				$all = array();
324 
+			}
278 325 
 		}
279 326 
 		if (empty($all)) {
280 327 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -294,7 +341,9 @@  discard block
 
 block discarded – undo
294 341
295 342 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
296 343 
 		global $globalStatsFilters;
297 
-		if ($filter_name == '') $filter_name = $this->filter_name;
344 
+		if ($filter_name == '') {
345 
+			$filter_name = $this->filter_name;
346 
+		}
298 347 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
299 348 
 			$Spotter = new Spotter($this->db);
300 349 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -303,8 +352,11 @@  discard block
 
 block discarded – undo
303 352 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
304 353 
 			}
305 354 
 			if ($year == '' && $month == '') {
306 
-				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";
307 
-				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";
355 
+				if ($limit) {
356 
+					$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";
357 
+				} else {
358 
+					$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";
359 
+				}
308 360 
 				try {
309 361 
 					$sth = $this->db->prepare($query);
310 362 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -312,11 +364,16 @@  discard block
 
 block discarded – undo
312 364 
 					echo "error : ".$e->getMessage();
313 365 
 				}
314 366 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
315 
-			} else $all = array();
367 
+			} else {
368 
+				$all = array();
369 
+			}
316 370 
 		} else {
317 371 
 			if ($year == '' && $month == '') {
318 
-				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";
319 
-				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";
372 
+				if ($limit) {
373 
+					$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";
374 
+				} else {
375 
+					$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";
376 
+				}
320 377 
 				try {
321 378 
 					$sth = $this->db->prepare($query);
322 379 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -324,7 +381,9 @@  discard block
 
 block discarded – undo
324 381 
 					echo "error : ".$e->getMessage();
325 382 
 				}
326 383 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
327 
-			} else $all = array();
384 
+			} else {
385 
+				$all = array();
386 
+			}
328 387 
 		}
329 388 
 		if (empty($all)) {
330 389 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -343,7 +402,9 @@  discard block
 
 block discarded – undo
343 402 
 	}
344 403 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
345 404 
 		global $globalStatsFilters;
346 
-		if ($filter_name == '') $filter_name = $this->filter_name;
405 
+		if ($filter_name == '') {
406 
+			$filter_name = $this->filter_name;
407 
+		}
347 408 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
348 409 
 			$Spotter = new Spotter($this->db);
349 410 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -351,12 +412,18 @@  discard block
 
 block discarded – undo
351 412 
 			foreach ($airlines as $airline) {
352 413 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
353 414 
 			}
354 
-			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";
355 
-			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";
415 
+			if ($limit) {
416 
+				$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";
417 
+			} else {
418 
+				$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";
419 
+			}
356 420 
 			$query_values = array(':filter_name' => $filter_name);
357 421 
 		} else {
358 
-			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";
359 
-			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";
422 
+			if ($limit) {
423 
+				$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";
424 
+			} else {
425 
+				$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";
426 
+			}
360 427 
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
361 428 
 		}
362 429 
 		try {
 
@@ -384,17 +451,29 @@  discard block
 
 block discarded – undo
384 451
385 452 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
386 453 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
387 
-		if ($filter_name == '') $filter_name = $this->filter_name;
454 
+		if ($filter_name == '') {
455 
+			$filter_name = $this->filter_name;
456 
+		}
388 457 
 		if ($year == '' && $month == '') {
389 
-			if ($globalVATSIM) $forsource = 'vatsim';
390 
-			if ($globalIVAO) $forsource = 'ivao';
458 
+			if ($globalVATSIM) {
459 
+				$forsource = 'vatsim';
460 
+			}
461 
+			if ($globalIVAO) {
462 
+				$forsource = 'ivao';
463 
+			}
391 464 
 			if (isset($forsource)) {
392 
-				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";
393 
-				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";
465 
+				if ($limit) {
466 
+					$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";
467 
+				} else {
468 
+					$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";
469 
+				}
394 470 
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
395 471 
 			} else {
396 
-				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";
397 
-				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";
472 
+				if ($limit) {
473 
+					$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";
474 
+				} else {
475 
+					$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";
476 
+				}
398 477 
 				$query_values = array(':filter_name' => $filter_name);
399 478 
 			}
400 479 
 			try {
 
@@ -404,7 +483,9 @@  discard block
 
 block discarded – undo
404 483 
 				echo "error : ".$e->getMessage();
405 484 
 			}
406 485 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
407 
-		} else $all = array();
486 
+		} else {
487 
+			$all = array();
488 
+		}
408 489 
                 if (empty($all)) {
409 490 
 	                $Spotter = new Spotter($this->db);
410 491 
             		$filters = array();
 
@@ -419,7 +500,9 @@  discard block
 
 block discarded – undo
419 500 
 	}
420 501 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
421 502 
 		global $globalStatsFilters;
422 
-		if ($filter_name == '') $filter_name = $this->filter_name;
503 
+		if ($filter_name == '') {
504 
+			$filter_name = $this->filter_name;
505 
+		}
423 506 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
424 507 
 			$Spotter = new Spotter($this->db);
425 508 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -428,8 +511,11 @@  discard block
 
 block discarded – undo
428 511 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
429 512 
 			}
430 513 
 			if ($year == '' && $month == '') {
431 
-				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";
432 
-				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";
514 
+				if ($limit) {
515 
+					$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";
516 
+				} else {
517 
+					$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";
518 
+				}
433 519 
 				try {
434 520 
 					$sth = $this->db->prepare($query);
435 521 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -437,11 +523,16 @@  discard block
 
 block discarded – undo
437 523 
 					echo "error : ".$e->getMessage();
438 524 
 				}
439 525 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
440 
-			} else $all = array();
526 
+			} else {
527 
+				$all = array();
528 
+			}
441 529 
 		} else {
442 530 
 			if ($year == '' && $month == '') {
443 
-				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";
444 
-				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";
531 
+				if ($limit) {
532 
+					$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";
533 
+				} else {
534 
+					$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";
535 
+				}
445 536 
 				try {
446 537 
 					$sth = $this->db->prepare($query);
447 538 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -449,7 +540,9 @@  discard block
 
 block discarded – undo
449 540 
 					echo "error : ".$e->getMessage();
450 541 
 				}
451 542 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
452 
-			} else $all = array();
543 
+			} else {
544 
+				$all = array();
545 
+			}
453 546 
 		}
454 547 
 		if (empty($all)) {
455 548 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -468,7 +561,9 @@  discard block
 
 block discarded – undo
468 561 
 	}
469 562 
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
470 563 
 		global $globalStatsFilters;
471 
-		if ($filter_name == '') $filter_name = $this->filter_name;
564 
+		if ($filter_name == '') {
565 
+			$filter_name = $this->filter_name;
566 
+		}
472 567 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
473 568 
 			$Spotter = new Spotter($this->db);
474 569 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -477,8 +572,11 @@  discard block
 
 block discarded – undo
477 572 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
478 573 
 			}
479 574 
 			if ($year == '' && $month == '') {
480 
-				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";
481 
-				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";
575 
+				if ($limit) {
576 
+					$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";
577 
+				} else {
578 
+					$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";
579 
+				}
482 580 
 				 try {
483 581 
 					$sth = $this->db->prepare($query);
484 582 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -486,11 +584,16 @@  discard block
 
 block discarded – undo
486 584 
 					echo "error : ".$e->getMessage();
487 585 
 				}
488 586 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
489 
-			} else $all = array();
587 
+			} else {
588 
+				$all = array();
589 
+			}
490 590 
 		} else {
491 591 
 			if ($year == '' && $month == '') {
492 
-				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";
493 
-				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";
592 
+				if ($limit) {
593 
+					$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";
594 
+				} else {
595 
+					$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";
596 
+				}
494 597 
 				 try {
495 598 
 					$sth = $this->db->prepare($query);
496 599 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -498,7 +601,9 @@  discard block
 
 block discarded – undo
498 601 
 					echo "error : ".$e->getMessage();
499 602 
 				}
500 603 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
501 
-			} else $all = array();
604 
+			} else {
605 
+				$all = array();
606 
+			}
502 607 
 		}
503 608 
 		if (empty($all)) {
504 609 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -517,7 +622,9 @@  discard block
 
 block discarded – undo
517 622 
 	}
518 623 
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
519 624 
 		$Connection = new Connection();
520 
-		if ($filter_name == '') $filter_name = $this->filter_name;
625 
+		if ($filter_name == '') {
626 
+			$filter_name = $this->filter_name;
627 
+		}
521 628 
 		if ($Connection->tableExists('countries')) {
522 629 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
523 630 
 				$Spotter = new Spotter($this->db);
 
@@ -527,8 +634,11 @@  discard block
 
 block discarded – undo
527 634 
 					foreach ($airlines as $airline) {
528 635 
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
529 636 
 					}
530 
-					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";
531 
-					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";
637 
+					if ($limit) {
638 
+						$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";
639 
+					} else {
640 
+						$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";
641 
+					}
532 642 
 					 try {
533 643 
 						$sth = $this->db->prepare($query);
534 644 
 						$sth->execute(array(':filter_name' => $filter_name));
 
@@ -537,11 +647,16 @@  discard block
 
 block discarded – undo
537 647 
 					}
538 648 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
539 649 
 					return $all;
540 
-				} else return array();
650 
+				} else {
651 
+					return array();
652 
+				}
541 653 
 			} else {
542 654 
 				if ($year == '' && $month == '') {
543 
-					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";
544 
-					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";
655 
+					if ($limit) {
656 
+						$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";
657 
+					} else {
658 
+						$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";
659 
+					}
545 660 
 					 try {
546 661 
 						$sth = $this->db->prepare($query);
547 662 
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -550,7 +665,9 @@  discard block
 
 block discarded – undo
550 665 
 					}
551 666 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
552 667 
 					return $all;
553 
-				} else return array();
668 
+				} else {
669 
+					return array();
670 
+				}
554 671 
 			}
555 672 
 		} else {
556 673 
 			/*
 
@@ -564,10 +681,15 @@  discard block
 
 block discarded – undo
564 681 
 	}
565 682 
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
566 683 
 		global $globalStatsFilters;
567 
-		if ($filter_name == '') $filter_name = $this->filter_name;
684 
+		if ($filter_name == '') {
685 
+			$filter_name = $this->filter_name;
686 
+		}
568 687 
 		if ($year == '' && $month == '') {
569 
-			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";
570 
-			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";
688 
+			if ($limit) {
689 
+				$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";
690 
+			} else {
691 
+				$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";
692 
+			}
571 693 
 			try {
572 694 
 				$sth = $this->db->prepare($query);
573 695 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -575,7 +697,9 @@  discard block
 
 block discarded – undo
575 697 
 				echo "error : ".$e->getMessage();
576 698 
 			}
577 699 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 
-		} else $all = array();
700 
+		} else {
701 
+			$all = array();
702 
+		}
579 703 
 		if (empty($all)) {
580 704 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
581 705 
 			if ($filter_name != '') {
 
@@ -590,7 +714,9 @@  discard block
 
 block discarded – undo
590 714
591 715 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
592 716 
 		global $globalStatsFilters;
593 
-		if ($filter_name == '') $filter_name = $this->filter_name;
717 
+		if ($filter_name == '') {
718 
+			$filter_name = $this->filter_name;
719 
+		}
594 720 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
595 721 
 			$Spotter = new Spotter($this->db);
596 722 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -599,8 +725,11 @@  discard block
 
 block discarded – undo
599 725 
 				foreach ($airlines as $airline) {
600 726 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
601 727 
 				}
602 
-				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";
603 
-				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";
728 
+				if ($limit) {
729 
+					$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";
730 
+				} else {
731 
+					$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";
732 
+				}
604 733 
 				try {
605 734 
 					$sth = $this->db->prepare($query);
606 735 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -608,11 +737,16 @@  discard block
 
 block discarded – undo
608 737 
 					echo "error : ".$e->getMessage();
609 738 
 				}
610 739 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
611 
-			} else $all = array();
740 
+			} else {
741 
+				$all = array();
742 
+			}
612 743 
 		} else {
613 744 
 			if ($year == '' && $month == '') {
614 
-				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";
615 
-				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";
745 
+				if ($limit) {
746 
+					$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";
747 
+				} else {
748 
+					$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";
749 
+				}
616 750 
 				try {
617 751 
 					$sth = $this->db->prepare($query);
618 752 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -620,7 +754,9 @@  discard block
 
 block discarded – undo
620 754 
 					echo "error : ".$e->getMessage();
621 755 
 				}
622 756 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623 
-			} else $all = array();
757 
+			} else {
758 
+				$all = array();
759 
+			}
624 760 
 		}
625 761 
 		if (empty($all)) {
626 762 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -639,7 +775,9 @@  discard block
 
 block discarded – undo
639 775 
 	}
640 776 
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
641 777 
 		global $globalStatsFilters;
642 
-		if ($filter_name == '') $filter_name = $this->filter_name;
778 
+		if ($filter_name == '') {
779 
+			$filter_name = $this->filter_name;
780 
+		}
643 781 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
644 782 
 			$Spotter = new Spotter($this->db);
645 783 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -648,8 +786,11 @@  discard block
 
 block discarded – undo
648 786 
 				foreach ($airlines as $airline) {
649 787 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
650 788 
 				}
651 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, 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";
652 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, 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";
789 
+				if ($limit) {
790 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, 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";
791 
+				} else {
792 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, 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";
793 
+				}
653 794 
 				try {
654 795 
 					$sth = $this->db->prepare($query);
655 796 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -657,11 +798,16 @@  discard block
 
 block discarded – undo
657 798 
 					echo "error : ".$e->getMessage();
658 799 
 				}
659 800 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
660 
-			} else $all = array();
801 
+			} else {
802 
+				$all = array();
803 
+			}
661 804 
 		} else {
662 805 
 			if ($year == '' && $month == '') {
663 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, 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";
664 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, 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";
806 
+				if ($limit) {
807 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, 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";
808 
+				} else {
809 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, 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";
810 
+				}
665 811 
 				try {
666 812 
 					$sth = $this->db->prepare($query);
667 813 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -669,7 +815,9 @@  discard block
 
 block discarded – undo
669 815 
 					echo "error : ".$e->getMessage();
670 816 
 				}
671 817 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
672 
-			} else $all = array();
818 
+			} else {
819 
+				$all = array();
820 
+			}
673 821 
 		}
674 822 
 		if (empty($all)) {
675 823 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -694,7 +842,9 @@  discard block
 
 block discarded – undo
694 842 
 				$icao = $value['airport_departure_icao'];
695 843 
 				if (isset($all[$icao])) {
696 844 
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
697 
-				} else $all[$icao] = $value;
845 
+				} else {
846 
+					$all[$icao] = $value;
847 
+				}
698 848 
 			}
699 849 
 			$count = array();
700 850 
 			foreach ($all as $key => $row) {
 
@@ -706,7 +856,9 @@  discard block
 
 block discarded – undo
706 856 
 	}
707 857 
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
708 858 
 		global $globalStatsFilters;
709 
-		if ($filter_name == '') $filter_name = $this->filter_name;
859 
+		if ($filter_name == '') {
860 
+			$filter_name = $this->filter_name;
861 
+		}
710 862 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
711 863 
 			$Spotter = new Spotter($this->db);
712 864 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -715,8 +867,11 @@  discard block
 
 block discarded – undo
715 867 
 				foreach ($airlines as $airline) {
716 868 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
717 869 
 				}
718 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,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";
719 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,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";
870 
+				if ($limit) {
871 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,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";
872 
+				} else {
873 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,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";
874 
+				}
720 875 
 				try {
721 876 
 					$sth = $this->db->prepare($query);
722 877 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -724,11 +879,16 @@  discard block
 
 block discarded – undo
724 879 
 					echo "error : ".$e->getMessage();
725 880 
 				}
726 881 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
727 
-			} else $all = array();
882 
+			} else {
883 
+				$all = array();
884 
+			}
728 885 
 		} else {
729 886 
 			if ($year == '' && $month == '') {
730 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,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";
731 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,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";
887 
+				if ($limit) {
888 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,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";
889 
+				} else {
890 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,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";
891 
+				}
732 892 
 				try {
733 893 
 					$sth = $this->db->prepare($query);
734 894 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -736,7 +896,9 @@  discard block
 
 block discarded – undo
736 896 
 					echo "error : ".$e->getMessage();
737 897 
 				}
738 898 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
739 
-			} else $all = array();
899 
+			} else {
900 
+				$all = array();
901 
+			}
740 902 
 		}
741 903 
 		if (empty($all)) {
742 904 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -761,7 +923,9 @@  discard block
 
 block discarded – undo
761 923 
 				$icao = $value['airport_arrival_icao'];
762 924 
 				if (isset($all[$icao])) {
763 925 
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
764 
-				} else $all[$icao] = $value;
926 
+				} else {
927 
+					$all[$icao] = $value;
928 
+				}
765 929 
 			}
766 930 
 			$count = array();
767 931 
 			foreach ($all as $key => $row) {
 
@@ -773,7 +937,9 @@  discard block
 
 block discarded – undo
773 937 
 	}
774 938 
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
775 939 
 		global $globalDBdriver, $globalStatsFilters;
776 
-		if ($filter_name == '') $filter_name = $this->filter_name;
940 
+		if ($filter_name == '') {
941 
+			$filter_name = $this->filter_name;
942 
+		}
777 943 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
778 944 
 			$Spotter = new Spotter($this->db);
779 945 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -782,20 +948,32 @@  discard block
 
 block discarded – undo
782 948 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
783 949 
 			}
784 950 
 			if ($globalDBdriver == 'mysql') {
785 
-				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";
786 
-				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";
951 
+				if ($limit) {
952 
+					$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";
953 
+				} else {
954 
+					$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";
955 
+				}
787 956 
 			} else {
788 
-				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";
789 
-				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";
957 
+				if ($limit) {
958 
+					$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";
959 
+				} else {
960 
+					$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";
961 
+				}
790 962 
 			}
791 963 
 			$query_data = array(':filter_name' => $filter_name);
792 964 
 		} else {
793 965 
 			if ($globalDBdriver == 'mysql') {
794 
-				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";
795 
-				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";
966 
+				if ($limit) {
967 
+					$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";
968 
+				} else {
969 
+					$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";
970 
+				}
796 971 
 			} else {
797 
-				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";
798 
-				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";
972 
+				if ($limit) {
973 
+					$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";
974 
+				} else {
975 
+					$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";
976 
+				}
799 977 
 			}
800 978 
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
801 979 
 		}
 
@@ -823,7 +1001,9 @@  discard block
 
 block discarded – undo
823 1001
824 1002 
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
825 1003 
 		global $globalStatsFilters;
826 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1004 
+		if ($filter_name == '') {
1005 
+			$filter_name = $this->filter_name;
1006 
+		}
827 1007 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
828 1008 
 			$Spotter = new Spotter($this->db);
829 1009 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -860,7 +1040,9 @@  discard block
 
 block discarded – undo
860 1040 
 	}
861 1041 
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
862 1042 
 		global $globalDBdriver, $globalStatsFilters;
863 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1043 
+		if ($filter_name == '') {
1044 
+			$filter_name = $this->filter_name;
1045 
+		}
864 1046 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
865 1047 
 			$Spotter = new Spotter($this->db);
866 1048 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -905,7 +1087,9 @@  discard block
 
 block discarded – undo
905 1087 
 	}
906 1088 
 	public function countAllDates($stats_airline = '',$filter_name = '') {
907 1089 
 		global $globalStatsFilters;
908 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1090 
+		if ($filter_name == '') {
1091 
+			$filter_name = $this->filter_name;
1092 
+		}
909 1093 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
910 1094 
 			$Spotter = new Spotter($this->db);
911 1095 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -942,7 +1126,9 @@  discard block
 
 block discarded – undo
942 1126 
 	}
943 1127 
 	public function countAllDatesByAirlines($filter_name = '') {
944 1128 
 		global $globalStatsFilters;
945 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1129 
+		if ($filter_name == '') {
1130 
+			$filter_name = $this->filter_name;
1131 
+		}
946 1132 
 		$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";
947 1133 
 		$query_data = array('filter_name' => $filter_name);
948 1134 
 		try {
 
@@ -964,7 +1150,9 @@  discard block
 
 block discarded – undo
964 1150 
 	}
965 1151 
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
966 1152 
 		global $globalStatsFilters, $globalDBdriver;
967 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1153 
+		if ($filter_name == '') {
1154 
+			$filter_name = $this->filter_name;
1155 
+		}
968 1156 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
969 1157 
 			$Spotter = new Spotter($this->db);
970 1158 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1049,7 +1237,9 @@  discard block
 
 block discarded – undo
1049 1237 
 	}
1050 1238 
 	public function countAllMilitaryMonths($filter_name = '') {
1051 1239 
 		global $globalStatsFilters;
1052 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1240 
+		if ($filter_name == '') {
1241 
+			$filter_name = $this->filter_name;
1242 
+		}
1053 1243 
 		$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";
1054 1244 
 		try {
1055 1245 
 			$sth = $this->db->prepare($query);
 
@@ -1070,7 +1260,9 @@  discard block
 
 block discarded – undo
1070 1260 
 	}
1071 1261 
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1072 1262 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1073 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1263 
+		if ($filter_name == '') {
1264 
+			$filter_name = $this->filter_name;
1265 
+		}
1074 1266 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1075 1267 
 			$Spotter = new Spotter($this->db);
1076 1268 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1078,12 +1270,18 @@  discard block
 
 block discarded – undo
1078 1270 
 			foreach ($airlines as $airline) {
1079 1271 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1080 1272 
 			}
1081 
-			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";
1082 
-			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";
1273 
+			if ($limit) {
1274 
+				$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";
1275 
+			} else {
1276 
+				$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";
1277 
+			}
1083 1278 
 			$query_data = array(':filter_name' => $filter_name);
1084 1279 
 		} else {
1085 
-			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";
1086 
-			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";
1280 
+			if ($limit) {
1281 
+				$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";
1282 
+			} else {
1283 
+				$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";
1284 
+			}
1087 1285 
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1088 1286 
 		}
1089 1287 
 		if ($orderby == 'hour') {
 
@@ -1093,7 +1291,9 @@  discard block
 
 block discarded – undo
1093 1291 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
1094 1292 
 			}
1095 1293 
 		}
1096 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1294 
+		if ($orderby == 'count') {
1295 
+			$query .= " ORDER BY hour_count DESC";
1296 
+		}
1097 1297 
 		try {
1098 1298 
 			$sth = $this->db->prepare($query);
1099 1299 
 			$sth->execute($query_data);
 
@@ -1117,8 +1317,12 @@  discard block
 
 block discarded – undo
1117 1317 
 	}
1118 1318 
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1119 1319 
 		global $globalStatsFilters;
1120 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1121 
-		if ($year == '') $year = date('Y');
1320 
+		if ($filter_name == '') {
1321 
+			$filter_name = $this->filter_name;
1322 
+		}
1323 
+		if ($year == '') {
1324 
+			$year = date('Y');
1325 
+		}
1122 1326 
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1123 1327 
 		if (empty($all)) {
1124 1328 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1137,8 +1341,12 @@  discard block
 
 block discarded – undo
1137 1341 
 	}
1138 1342 
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1139 1343 
 		global $globalStatsFilters;
1140 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1141 
-		if ($year == '') $year = date('Y');
1344 
+		if ($filter_name == '') {
1345 
+			$filter_name = $this->filter_name;
1346 
+		}
1347 
+		if ($year == '') {
1348 
+			$year = date('Y');
1349 
+		}
1142 1350 
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1143 1351 
 		if (empty($all)) {
1144 1352 
 			$filters = array();
 
@@ -1154,8 +1362,12 @@  discard block
 
 block discarded – undo
1154 1362 
 	}
1155 1363 
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1156 1364 
 		global $globalStatsFilters;
1157 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1158 
-		if ($year == '') $year = date('Y');
1365 
+		if ($filter_name == '') {
1366 
+			$filter_name = $this->filter_name;
1367 
+		}
1368 
+		if ($year == '') {
1369 
+			$year = date('Y');
1370 
+		}
1159 1371 
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1160 1372 
 		if (empty($all)) {
1161 1373 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1174,7 +1386,9 @@  discard block
 
 block discarded – undo
1174 1386 
 	}
1175 1387 
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1176 1388 
 		global $globalStatsFilters;
1177 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1389 
+		if ($filter_name == '') {
1390 
+			$filter_name = $this->filter_name;
1391 
+		}
1178 1392 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1179 1393 
 			$Spotter = new Spotter($this->db);
1180 1394 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1192,7 +1406,9 @@  discard block
 
 block discarded – undo
1192 1406 
 				}
1193 1407 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1194 1408 
 				$all = $result[0]['nb'];
1195 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1409 
+			} else {
1410 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1411 
+			}
1196 1412 
 		} else {
1197 1413 
 			if ($year == '' && $month == '') {
1198 1414 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1204,7 +1420,9 @@  discard block
 
 block discarded – undo
1204 1420 
 				}
1205 1421 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1206 1422 
 				$all = $result[0]['nb'];
1207 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1423 
+			} else {
1424 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1425 
+			}
1208 1426 
 		}
1209 1427 
 		if (empty($all)) {
1210 1428 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1223,7 +1441,9 @@  discard block
 
 block discarded – undo
1223 1441 
 	}
1224 1442 
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1225 1443 
 		global $globalStatsFilters;
1226 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1444 
+		if ($filter_name == '') {
1445 
+			$filter_name = $this->filter_name;
1446 
+		}
1227 1447 
 		if ($year == '' && $month == '') {
1228 1448 
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
1229 1449 
 			try {
 
@@ -1234,7 +1454,9 @@  discard block
 
 block discarded – undo
1234 1454 
 			}
1235 1455 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1236 1456 
 			$all = $result[0]['nb_airline'];
1237 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1457 
+		} else {
1458 
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1459 
+		}
1238 1460 
 		if (empty($all)) {
1239 1461 
 			$filters = array();
1240 1462 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1249,7 +1471,9 @@  discard block
 
 block discarded – undo
1249 1471 
 	}
1250 1472 
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1251 1473 
 		global $globalStatsFilters;
1252 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1474 
+		if ($filter_name == '') {
1475 
+			$filter_name = $this->filter_name;
1476 
+		}
1253 1477 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1254 1478 
 			$Spotter = new Spotter($this->db);
1255 1479 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1304,7 +1528,9 @@  discard block
 
 block discarded – undo
1304 1528 
 	}
1305 1529 
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1306 1530 
 		global $globalStatsFilters;
1307 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1531 
+		if ($filter_name == '') {
1532 
+			$filter_name = $this->filter_name;
1533 
+		}
1308 1534 
 		//if ($year == '') $year = date('Y');
1309 1535 
 		if ($year == '' && $month == '') {
1310 1536 
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1333,7 +1559,9 @@  discard block
 
 block discarded – undo
1333 1559 
 	}
1334 1560
1335 1561 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1336 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1562 
+		if ($filter_name == '') {
1563 
+			$filter_name = $this->filter_name;
1564 
+		}
1337 1565 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1338 1566 
 			$Spotter = new Spotter($this->db);
1339 1567 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1357,7 +1585,9 @@  discard block
 
 block discarded – undo
1357 1585 
 		return $all;
1358 1586 
 	}
1359 1587 
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
1360 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1588 
+		if ($filter_name == '') {
1589 
+			$filter_name = $this->filter_name;
1590 
+		}
1361 1591 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1362 1592 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1363 1593 
 		try {
 
@@ -1370,7 +1600,9 @@  discard block
 
 block discarded – undo
1370 1600 
 		return $all;
1371 1601 
 	}
1372 1602 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1373 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1603 
+		if ($filter_name == '') {
1604 
+			$filter_name = $this->filter_name;
1605 
+		}
1374 1606 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1375 1607 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1376 1608 
 		try {
 
@@ -1381,7 +1613,9 @@  discard block
 
 block discarded – undo
1381 1613 
 		}
1382 1614 
 	}
1383 1615 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1384 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1616 
+		if ($filter_name == '') {
1617 
+			$filter_name = $this->filter_name;
1618 
+		}
1385 1619 
 		global $globalArchiveMonths, $globalDBdriver;
1386 1620 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1387 1621 
 			$Spotter = new Spotter($this->db);
 
@@ -1437,7 +1671,9 @@  discard block
 
 block discarded – undo
1437 1671 
 	}
1438 1672 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1439 1673 
 		global $globalArchiveMonths, $globalDBdriver;
1440 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1674 
+		if ($filter_name == '') {
1675 
+			$filter_name = $this->filter_name;
1676 
+		}
1441 1677 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1442 1678 
 			$Spotter = new Spotter($this->db);
1443 1679 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1470,7 +1706,9 @@  discard block
 
 block discarded – undo
1470 1706 
 	}
1471 1707 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1472 1708 
 		global $globalArchiveMonths, $globalDBdriver;
1473 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1709 
+		if ($filter_name == '') {
1710 
+			$filter_name = $this->filter_name;
1711 
+		}
1474 1712 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1475 1713 
 			$Spotter = new Spotter($this->db);
1476 1714 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1501,7 +1739,9 @@  discard block
 
 block discarded – undo
1501 1739 
 	}
1502 1740 
 	public function getStatsAirlineTotal($filter_name = '') {
1503 1741 
 		global $globalArchiveMonths, $globalDBdriver;
1504 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1742 
+		if ($filter_name == '') {
1743 
+			$filter_name = $this->filter_name;
1744 
+		}
1505 1745 
 		if ($globalDBdriver == 'mysql') {
1506 1746 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1507 1747 
 		} else {
 
@@ -1518,7 +1758,9 @@  discard block
 
 block discarded – undo
1518 1758 
 	}
1519 1759 
 	public function getStatsOwnerTotal($filter_name = '') {
1520 1760 
 		global $globalArchiveMonths, $globalDBdriver;
1521 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1761 
+		if ($filter_name == '') {
1762 
+			$filter_name = $this->filter_name;
1763 
+		}
1522 1764 
 		if ($globalDBdriver == 'mysql') {
1523 1765 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1524 1766 
 		} else {
 
@@ -1535,7 +1777,9 @@  discard block
 
 block discarded – undo
1535 1777 
 	}
1536 1778 
 	public function getStatsOwner($owner_name,$filter_name = '') {
1537 1779 
 		global $globalArchiveMonths, $globalDBdriver;
1538 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1780 
+		if ($filter_name == '') {
1781 
+			$filter_name = $this->filter_name;
1782 
+		}
1539 1783 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1540 1784 
 		try {
1541 1785 
 			$sth = $this->db->prepare($query);
 
@@ -1544,12 +1788,17 @@  discard block
 
 block discarded – undo
1544 1788 
 			echo "error : ".$e->getMessage();
1545 1789 
 		}
1546 1790 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1547 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1548 
-		else return 0;
1791 
+		if (isset($all[0]['cnt'])) {
1792 
+			return $all[0]['cnt'];
1793 
+		} else {
1794 
+			return 0;
1795 
+		}
1549 1796 
 	}
1550 1797 
 	public function getStatsPilotTotal($filter_name = '') {
1551 1798 
 		global $globalArchiveMonths, $globalDBdriver;
1552 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1799 
+		if ($filter_name == '') {
1800 
+			$filter_name = $this->filter_name;
1801 
+		}
1553 1802 
 		if ($globalDBdriver == 'mysql') {
1554 1803 
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1555 1804 
 		} else {
 
@@ -1566,7 +1815,9 @@  discard block
 
 block discarded – undo
1566 1815 
 	}
1567 1816 
 	public function getStatsPilot($pilot,$filter_name = '') {
1568 1817 
 		global $globalArchiveMonths, $globalDBdriver;
1569 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1818 
+		if ($filter_name == '') {
1819 
+			$filter_name = $this->filter_name;
1820 
+		}
1570 1821 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1571 1822 
 		try {
1572 1823 
 			$sth = $this->db->prepare($query);
 
@@ -1575,13 +1826,18 @@  discard block
 
 block discarded – undo
1575 1826 
 			echo "error : ".$e->getMessage();
1576 1827 
 		}
1577 1828 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1578 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1579 
-		else return 0;
1829 
+		if (isset($all[0]['cnt'])) {
1830 
+			return $all[0]['cnt'];
1831 
+		} else {
1832 
+			return 0;
1833 
+		}
1580 1834 
 	}
1581 1835
1582 1836 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1583 1837 
 		global $globalDBdriver;
1584 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1838 
+		if ($filter_name == '') {
1839 
+			$filter_name = $this->filter_name;
1840 
+		}
1585 1841 
 		if ($globalDBdriver == 'mysql') {
1586 1842 
 			$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";
1587 1843 
 		} else {
 
@@ -1597,7 +1853,9 @@  discard block
 
 block discarded – undo
1597 1853 
 	}
1598 1854 
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1599 1855 
 		global $globalDBdriver;
1600 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1856 
+		if ($filter_name == '') {
1857 
+			$filter_name = $this->filter_name;
1858 
+		}
1601 1859 
 		if ($globalDBdriver == 'mysql') {
1602 1860 
 			$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";
1603 1861 
 		} else {
 
@@ -1983,10 +2241,14 @@  discard block
 
 block discarded – undo
1983 2241 
 		$Connection = new Connection();
1984 2242 
 		date_default_timezone_set('UTC');
1985 2243 
 		$last_update = $this->getLastStatsUpdate('last_update_stats');
1986 
-			if ($globalDebug) echo 'Update stats !'."\n";
2244 
+			if ($globalDebug) {
2245 
+				echo 'Update stats !'."\n";
2246 
+			}
1987 2247 
 			if (isset($last_update[0]['value'])) {
1988 2248 
 				$last_update_day = $last_update[0]['value'];
1989 
-			} else $last_update_day = '2012-12-12 12:12:12';
2249 
+			} else {
2250 
+				$last_update_day = '2012-12-12 12:12:12';
2251 
+			}
1990 2252 
 			$reset = false;
1991 2253 
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
1992 2254 
 			if ($globalStatsResetYear) {
 
@@ -1995,43 +2257,63 @@  discard block
 
 block discarded – undo
1995 2257 
 			}
1996 2258 
 			$Spotter = new Spotter($this->db);
1997 2259
1998 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2260 
+			if ($globalDebug) {
2261 
+				echo 'Count all aircraft types...'."\n";
2262 
+			}
1999 2263 
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2000 2264 
 			foreach ($alldata as $number) {
2001 2265 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2002 2266 
 			}
2003 
-			if ($globalDebug) echo 'Count all airlines...'."\n";
2267 
+			if ($globalDebug) {
2268 
+				echo 'Count all airlines...'."\n";
2269 
+			}
2004 2270 
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2005 2271 
 			foreach ($alldata as $number) {
2006 2272 
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2007 2273 
 			}
2008 
-			if ($globalDebug) echo 'Count all registrations...'."\n";
2274 
+			if ($globalDebug) {
2275 
+				echo 'Count all registrations...'."\n";
2276 
+			}
2009 2277 
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2010 2278 
 			foreach ($alldata as $number) {
2011 2279 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2012 2280 
 			}
2013 
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
2281 
+			if ($globalDebug) {
2282 
+				echo 'Count all callsigns...'."\n";
2283 
+			}
2014 2284 
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2015 2285 
 			foreach ($alldata as $number) {
2016 2286 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2017 2287 
 			}
2018 
-			if ($globalDebug) echo 'Count all owners...'."\n";
2288 
+			if ($globalDebug) {
2289 
+				echo 'Count all owners...'."\n";
2290 
+			}
2019 2291 
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2020 2292 
 			foreach ($alldata as $number) {
2021 2293 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2022 2294 
 			}
2023 
-			if ($globalDebug) echo 'Count all pilots...'."\n";
2295 
+			if ($globalDebug) {
2296 
+				echo 'Count all pilots...'."\n";
2297 
+			}
2024 2298 
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2025 2299 
 			foreach ($alldata as $number) {
2026 
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2300 
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
2301 
+					$number['pilot_id'] = $number['pilot_name'];
2302 
+				}
2027 2303 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2028 2304 
 			}
2029 2305
2030 
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
2306 
+			if ($globalDebug) {
2307 
+				echo 'Count all departure airports...'."\n";
2308 
+			}
2031 2309 
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2032 
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2310 
+			if ($globalDebug) {
2311 
+				echo 'Count all detected departure airports...'."\n";
2312 
+			}
2033 2313 
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2034 
-			if ($globalDebug) echo 'Order departure airports...'."\n";
2314 
+			if ($globalDebug) {
2315 
+				echo 'Order departure airports...'."\n";
2316 
+			}
2035 2317 
 			$alldata = array();
2036 2318 
 			foreach ($pall as $value) {
2037 2319 
 				$icao = $value['airport_departure_icao'];
 
@@ -2041,7 +2323,9 @@  discard block
 
 block discarded – undo
2041 2323 
 				$icao = $value['airport_departure_icao'];
2042 2324 
 				if (isset($alldata[$icao])) {
2043 2325 
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2044 
-				} else $alldata[$icao] = $value;
2326 
+				} else {
2327 
+					$alldata[$icao] = $value;
2328 
+				}
2045 2329 
 			}
2046 2330 
 			$count = array();
2047 2331 
 			foreach ($alldata as $key => $row) {
 
@@ -2051,11 +2335,17 @@  discard block
 
 block discarded – undo
2051 2335 
 			foreach ($alldata as $number) {
2052 2336 
 				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);
2053 2337 
 			}
2054 
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2338 
+			if ($globalDebug) {
2339 
+				echo 'Count all arrival airports...'."\n";
2340 
+			}
2055 2341 
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2056 
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2342 
+			if ($globalDebug) {
2343 
+				echo 'Count all detected arrival airports...'."\n";
2344 
+			}
2057 2345 
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2058 
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
2346 
+			if ($globalDebug) {
2347 
+				echo 'Order arrival airports...'."\n";
2348 
+			}
2059 2349 
 			$alldata = array();
2060 2350 
 			foreach ($pall as $value) {
2061 2351 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2065,7 +2355,9 @@  discard block
 
 block discarded – undo
2065 2355 
 				$icao = $value['airport_arrival_icao'];
2066 2356 
 				if (isset($alldata[$icao])) {
2067 2357 
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2068 
-				} else $alldata[$icao] = $value;
2358 
+				} else {
2359 
+					$alldata[$icao] = $value;
2360 
+				}
2069 2361 
 			}
2070 2362 
 			$count = array();
2071 2363 
 			foreach ($alldata as $key => $row) {
 
@@ -2076,7 +2368,9 @@  discard block
 
 block discarded – undo
2076 2368 
 				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);
2077 2369 
 			}
2078 2370 
 			if ($Connection->tableExists('countries')) {
2079 
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2371 
+				if ($globalDebug) {
2372 
+					echo 'Count all flights by countries...'."\n";
2373 
+				}
2080 2374 
 				//$SpotterArchive = new SpotterArchive();
2081 2375 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2082 2376 
 				$Spotter = new Spotter($this->db);
 
@@ -2087,7 +2381,9 @@  discard block
 
 block discarded – undo
2087 2381 
 			}
2088 2382
2089 2383 
 			if (isset($globalAccidents) && $globalAccidents) {
2090 
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
2384 
+				if ($globalDebug) {
2385 
+					echo 'Count fatalities stats...'."\n";
2386 
+				}
2091 2387 
 				$Accident = new Accident();
2092 2388 
 				$this->deleteStatsByType('fatalities_byyear');
2093 2389 
 				$alldata = $Accident->countFatalitiesByYear();
 
@@ -2103,48 +2399,68 @@  discard block
 
 block discarded – undo
2103 2399
2104 2400 
 			// Add by month using getstat if month finish...
2105 2401 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
2106 
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
2402 
+			if ($globalDebug) {
2403 
+				echo 'Count all flights by months...'."\n";
2404 
+			}
2107 2405 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2108 2406 
 			$filter_last_month = array('since_date' => $last_month);
2109 2407 
 			$Spotter = new Spotter($this->db);
2110 2408 
 			$alldata = $Spotter->countAllMonths($filter_last_month);
2111 2409 
 			$lastyear = false;
2112 2410 
 			foreach ($alldata as $number) {
2113 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2411 
+				if ($number['year_name'] != date('Y')) {
2412 
+					$lastyear = true;
2413 
+				}
2114 2414 
 				$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'])));
2115 2415 
 			}
2116 
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2416 
+			if ($globalDebug) {
2417 
+				echo 'Count all military flights by months...'."\n";
2418 
+			}
2117 2419 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2118 2420 
 			foreach ($alldata as $number) {
2119 2421 
 				$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'])));
2120 2422 
 			}
2121 
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
2423 
+			if ($globalDebug) {
2424 
+				echo 'Count all owners by months...'."\n";
2425 
+			}
2122 2426 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2123 2427 
 			foreach ($alldata as $number) {
2124 2428 
 				$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'])));
2125 2429 
 			}
2126 
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2430 
+			if ($globalDebug) {
2431 
+				echo 'Count all pilots by months...'."\n";
2432 
+			}
2127 2433 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2128 2434 
 			foreach ($alldata as $number) {
2129 2435 
 				$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'])));
2130 2436 
 			}
2131 
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2437 
+			if ($globalDebug) {
2438 
+				echo 'Count all airlines by months...'."\n";
2439 
+			}
2132 2440 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2133 2441 
 			foreach ($alldata as $number) {
2134 2442 
 				$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'])));
2135 2443 
 			}
2136 
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2444 
+			if ($globalDebug) {
2445 
+				echo 'Count all aircrafts by months...'."\n";
2446 
+			}
2137 2447 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2138 2448 
 			foreach ($alldata as $number) {
2139 2449 
 				$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'])));
2140 2450 
 			}
2141 
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2451 
+			if ($globalDebug) {
2452 
+				echo 'Count all real arrivals by months...'."\n";
2453 
+			}
2142 2454 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2143 2455 
 			foreach ($alldata as $number) {
2144 2456 
 				$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'])));
2145 2457 
 			}
2146 
-			if ($globalDebug) echo 'Airports data...'."\n";
2147 
-			if ($globalDebug) echo '...Departure'."\n";
2458 
+			if ($globalDebug) {
2459 
+				echo 'Airports data...'."\n";
2460 
+			}
2461 
+			if ($globalDebug) {
2462 
+				echo '...Departure'."\n";
2463 
+			}
2148 2464 
 			$this->deleteStatAirport('daily');
2149 2465 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
2150 2466 
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 
@@ -2262,7 +2578,9 @@  discard block
 
 block discarded – undo
2262 2578 
 			// Count by airlines
2263 2579 
 			echo '--- Stats by airlines ---'."\n";
2264 2580 
 			if ($Connection->tableExists('countries')) {
2265 
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2581 
+				if ($globalDebug) {
2582 
+					echo 'Count all flights by countries by airlines...'."\n";
2583 
+				}
2266 2584 
 				$SpotterArchive = new SpotterArchive();
2267 2585 
 				//$Spotter = new Spotter($this->db);
2268 2586 
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 
@@ -2271,37 +2589,53 @@  discard block
 
 block discarded – undo
2271 2589 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2272 2590 
 				}
2273 2591 
 			}
2274 
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2592 
+			if ($globalDebug) {
2593 
+				echo 'Count all aircraft types by airlines...'."\n";
2594 
+			}
2275 2595 
 			$Spotter = new Spotter($this->db);
2276 2596 
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2277 2597 
 			foreach ($alldata as $number) {
2278 2598 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2279 2599 
 			}
2280 
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2600 
+			if ($globalDebug) {
2601 
+				echo 'Count all aircraft registrations by airlines...'."\n";
2602 
+			}
2281 2603 
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2282 2604 
 			foreach ($alldata as $number) {
2283 2605 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2284 2606 
 			}
2285 
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2607 
+			if ($globalDebug) {
2608 
+				echo 'Count all callsigns by airlines...'."\n";
2609 
+			}
2286 2610 
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2287 2611 
 			foreach ($alldata as $number) {
2288 2612 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2289 2613 
 			}
2290 
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2614 
+			if ($globalDebug) {
2615 
+				echo 'Count all owners by airlines...'."\n";
2616 
+			}
2291 2617 
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2292 2618 
 			foreach ($alldata as $number) {
2293 2619 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2294 2620 
 			}
2295 
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2621 
+			if ($globalDebug) {
2622 
+				echo 'Count all pilots by airlines...'."\n";
2623 
+			}
2296 2624 
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2297 2625 
 			foreach ($alldata as $number) {
2298 2626 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2299 2627 
 			}
2300 
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2628 
+			if ($globalDebug) {
2629 
+				echo 'Count all departure airports by airlines...'."\n";
2630 
+			}
2301 2631 
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2302 
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2632 
+			if ($globalDebug) {
2633 
+				echo 'Count all detected departure airports by airlines...'."\n";
2634 
+			}
2303 2635 
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2304 
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2636 
+			if ($globalDebug) {
2637 
+				echo 'Order detected departure airports by airlines...'."\n";
2638 
+			}
2305 2639 
 			//$alldata = array();
2306 2640 
 			foreach ($dall as $value) {
2307 2641 
 				$icao = $value['airport_departure_icao'];
 
@@ -2322,11 +2656,17 @@  discard block
 
 block discarded – undo
2322 2656 
 			foreach ($alldata as $number) {
2323 2657 
 				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);
2324 2658 
 			}
2325 
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2659 
+			if ($globalDebug) {
2660 
+				echo 'Count all arrival airports by airlines...'."\n";
2661 
+			}
2326 2662 
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2327 
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2663 
+			if ($globalDebug) {
2664 
+				echo 'Count all detected arrival airports by airlines...'."\n";
2665 
+			}
2328 2666 
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2329 
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2667 
+			if ($globalDebug) {
2668 
+				echo 'Order arrival airports by airlines...'."\n";
2669 
+			}
2330 2670 
 			//$alldata = array();
2331 2671 
 			foreach ($dall as $value) {
2332 2672 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2345,37 +2685,53 @@  discard block
 
 block discarded – undo
2345 2685 
 			}
2346 2686 
 			$alldata = $pall;
2347 2687 
 			foreach ($alldata as $number) {
2348 
-				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);
2688 
+				if ($number['airline_icao'] != '') {
2689 
+					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);
2690 
+				}
2691 
+			}
2692 
+			if ($globalDebug) {
2693 
+				echo 'Count all flights by months by airlines...'."\n";
2349 2694 
 			}
2350 
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2351 2695 
 			$Spotter = new Spotter($this->db);
2352 2696 
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
2353 2697 
 			$lastyear = false;
2354 2698 
 			foreach ($alldata as $number) {
2355 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2699 
+				if ($number['year_name'] != date('Y')) {
2700 
+					$lastyear = true;
2701 
+				}
2356 2702 
 				$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']);
2357 2703 
 			}
2358 
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2704 
+			if ($globalDebug) {
2705 
+				echo 'Count all owners by months by airlines...'."\n";
2706 
+			}
2359 2707 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2360 2708 
 			foreach ($alldata as $number) {
2361 2709 
 				$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']);
2362 2710 
 			}
2363 
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2711 
+			if ($globalDebug) {
2712 
+				echo 'Count all pilots by months by airlines...'."\n";
2713 
+			}
2364 2714 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2365 2715 
 			foreach ($alldata as $number) {
2366 2716 
 				$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']);
2367 2717 
 			}
2368 
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2718 
+			if ($globalDebug) {
2719 
+				echo 'Count all aircrafts by months by airlines...'."\n";
2720 
+			}
2369 2721 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2370 2722 
 			foreach ($alldata as $number) {
2371 2723 
 				$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']);
2372 2724 
 			}
2373 
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2725 
+			if ($globalDebug) {
2726 
+				echo 'Count all real arrivals by months by airlines...'."\n";
2727 
+			}
2374 2728 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2375 2729 
 			foreach ($alldata as $number) {
2376 2730 
 				$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']);
2377 2731 
 			}
2378 
-			if ($globalDebug) echo '...Departure'."\n";
2732 
+			if ($globalDebug) {
2733 
+				echo '...Departure'."\n";
2734 
+			}
2379 2735 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
2380 2736 
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
2381 2737 
 			foreach ($dall as $value) {
 
@@ -2398,7 +2754,9 @@  discard block
 
 block discarded – undo
2398 2754 
 			foreach ($alldata as $number) {
2399 2755 
 				$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']);
2400 2756 
 			}
2401 
-			if ($globalDebug) echo '...Arrival'."\n";
2757 
+			if ($globalDebug) {
2758 
+				echo '...Arrival'."\n";
2759 
+			}
2402 2760 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
2403 2761 
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
2404 2762 
 			foreach ($dall as $value) {
 
@@ -2422,13 +2780,19 @@  discard block
 
 block discarded – undo
2422 2780 
 				$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']);
2423 2781 
 			}
2424 2782
2425 
-			if ($globalDebug) echo 'Flights data...'."\n";
2426 
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2783 
+			if ($globalDebug) {
2784 
+				echo 'Flights data...'."\n";
2785 
+			}
2786 
+			if ($globalDebug) {
2787 
+				echo '-> countAllDatesLastMonth...'."\n";
2788 
+			}
2427 2789 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2428 2790 
 			foreach ($alldata as $number) {
2429 2791 
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2430 2792 
 			}
2431 
-			if ($globalDebug) echo '-> countAllDates...'."\n";
2793 
+			if ($globalDebug) {
2794 
+				echo '-> countAllDates...'."\n";
2795 
+			}
2432 2796 
 			//$previousdata = $this->countAllDatesByAirlines();
2433 2797 
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2434 2798 
 			$values = array();
 
@@ -2441,21 +2805,27 @@  discard block
 
 block discarded – undo
2441 2805 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2442 2806 
 			}
2443 2807
2444 
-			if ($globalDebug) echo '-> countAllHours...'."\n";
2808 
+			if ($globalDebug) {
2809 
+				echo '-> countAllHours...'."\n";
2810 
+			}
2445 2811 
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2446 2812 
 			foreach ($alldata as $number) {
2447 2813 
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2448 2814 
 			}
2449 2815
2450 2816 
 			// Stats by filters
2451 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
2817 
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
2818 
+				$globalStatsFilters = array();
2819 
+			}
2452 2820 
 			foreach ($globalStatsFilters as $name => $filter) {
2453 2821 
 				//$filter_name = $filter['name'];
2454 2822 
 				$filter_name = $name;
2455 2823 
 				$reset = false;
2456 2824 
 				$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
2457 2825 
 				if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
2458 
-					if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2826 
+					if ($globalDebug) {
2827 
+						echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2828 
+					}
2459 2829 
 					$this->deleteOldStats($filter_name);
2460 2830 
 					unset($last_update);
2461 2831 
 				}
 
@@ -2474,7 +2844,9 @@  discard block
 
 block discarded – undo
2474 2844
2475 2845
2476 2846 
 				// Count by filter
2477 
-				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2847 
+				if ($globalDebug) {
2848 
+					echo '--- Stats for filter '.$filter_name.' ---'."\n";
2849 
+				}
2478 2850 
 				$Spotter = new Spotter($this->db);
2479 2851 
 				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2480 2852 
 				foreach ($alldata as $number) {
 
@@ -2511,7 +2883,9 @@  discard block
 
 block discarded – undo
2511 2883 
 					$icao = $value['airport_departure_icao'];
2512 2884 
 					if (isset($alldata[$icao])) {
2513 2885 
 						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2514 
-					} else $alldata[$icao] = $value;
2886 
+					} else {
2887 
+						$alldata[$icao] = $value;
2888 
+					}
2515 2889 
 				}
2516 2890 
 				$count = array();
2517 2891 
 				foreach ($alldata as $key => $row) {
 
@@ -2532,7 +2906,9 @@  discard block
 
 block discarded – undo
2532 2906 
 					$icao = $value['airport_arrival_icao'];
2533 2907 
 					if (isset($alldata[$icao])) {
2534 2908 
 						$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2535 
-					} else $alldata[$icao] = $value;
2909 
+					} else {
2910 
+						$alldata[$icao] = $value;
2911 
+					}
2536 2912 
 				}
2537 2913 
 				$count = array();
2538 2914 
 				foreach ($alldata as $key => $row) {
 
@@ -2546,7 +2922,9 @@  discard block
 
 block discarded – undo
2546 2922 
 				$alldata = $Spotter->countAllMonths($filter);
2547 2923 
 				$lastyear = false;
2548 2924 
 				foreach ($alldata as $number) {
2549 
-					if ($number['year_name'] != date('Y')) $lastyear = true;
2925 
+					if ($number['year_name'] != date('Y')) {
2926 
+						$lastyear = true;
2927 
+					}
2550 2928 
 					$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);
2551 2929 
 				}
2552 2930 
 				$alldata = $Spotter->countAllMonthsOwners($filter);
Please login to merge, or discard this patch.
require/class.SpotterLive.php 1 patch
Braces   +89 added lines, -30 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.');
11 
+		if ($this->db === null) {
12 
+			die('Error: No DB connection.');
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) {
 
@@ -119,8 +123,11 @@  discard block
 
 block discarded – undo
119 123 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
120 124 
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
121 125 
 		}
122 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
123 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
126 
+		if ($filter_query_where == '' && $where) {
127 
+			$filter_query_where = ' WHERE';
128 
+		} elseif ($filter_query_where != '' && $and) {
129 
+			$filter_query_where .= ' AND';
130 
+		}
124 131 
 		if ($filter_query_where != '') {
125 132 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
126 133 
 		}
 
@@ -161,9 +168,13 @@  discard block
 
 block discarded – undo
161 168 
 				$orderby_query = ' '.$search_orderby_array[$sort]['sql'];
162 169 
 			}
163 170 
 		}
164 
-		if ($orderby_query == '') $orderby_query = ' ORDER BY date DESC';
171 
+		if ($orderby_query == '') {
172 
+			$orderby_query = ' ORDER BY date DESC';
173 
+		}
165 174
166 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
175 
+		if (!isset($globalLiveInterval)) {
176 
+			$globalLiveInterval = '200';
177 
+		}
167 178 
 		if ($globalDBdriver == 'mysql') {
168 179 
 			//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
169 180 
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query.$orderby_query;
 
@@ -186,7 +197,9 @@  discard block
 
 block discarded – undo
186 197 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
187 198 
 		date_default_timezone_set('UTC');
188 199 
 		$filter_query = $this->getFilter($filter,true,true);
189 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
200 
+		if (!isset($globalLiveInterval)) {
201 
+			$globalLiveInterval = '200';
202 
+		}
190 203 
 		if ($globalDBdriver == 'mysql') {
191 204 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
192 205 
 				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
@@ -229,7 +242,9 @@  discard block
 
 block discarded – undo
229 242
230 243 
 		$filter_query = $this->getFilter($filter,true,true);
231 244
232 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
245 
+		if (!isset($globalLiveInterval)) {
246 
+			$globalLiveInterval = '200';
247 
+		}
233 248 
 		if ($globalDBdriver == 'mysql') {
234 249 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
235 250 
 				/*
 
@@ -297,7 +312,9 @@  discard block
 
 block discarded – undo
297 312 
 		global $globalDBdriver, $globalLiveInterval;
298 313 
 		$filter_query = $this->getFilter($filter,true,true);
299 314
300 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
315 
+		if (!isset($globalLiveInterval)) {
316 
+			$globalLiveInterval = '200';
317 
+		}
301 318 
 		if ($globalDBdriver == 'mysql') {
302 319 
 			//$query  = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query;
303 320 
 			$query = 'SELECT COUNT(DISTINCT spotter_live.flightaware_id) as nb FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
 
@@ -327,7 +344,9 @@  discard block
 
 block discarded – undo
327 344 
 	{
328 345 
 		global $globalDBdriver, $globalLiveInterval;
329 346 
 		$Spotter = new Spotter($this->db);
330 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
347 
+		if (!isset($globalLiveInterval)) {
348 
+			$globalLiveInterval = '200';
349 
+		}
331 350 
 		$filter_query = $this->getFilter($filter);
332 351
333 352 
 		if (is_array($coord)) {
 
@@ -335,7 +354,9 @@  discard block
 
 block discarded – undo
335 354 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
336 355 
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
337 356 
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
338 
-		} else return array();
357 
+		} else {
358 
+			return array();
359 
+		}
339 360 
 		if ($globalDBdriver == 'mysql') {
340 361 
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query;
341 362 
 		} else {
 
@@ -356,7 +377,9 @@  discard block
 
 block discarded – undo
356 377 
 	{
357 378 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
358 379 
 		$Spotter = new Spotter($this->db);
359 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
380 
+		if (!isset($globalLiveInterval)) {
381 
+			$globalLiveInterval = '200';
382 
+		}
360 383 
 		$filter_query = $this->getFilter($filter,true,true);
361 384
362 385 
 		if (is_array($coord)) {
 
@@ -364,7 +387,9 @@  discard block
 
 block discarded – undo
364 387 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
365 388 
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
366 389 
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
367 
-		} else return array();
390 
+		} else {
391 
+			return array();
392 
+		}
368 393 
 		if ($globalDBdriver == 'mysql') {
369 394 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
370 395 
 				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
@@ -591,11 +616,15 @@  discard block
 
 block discarded – undo
591 616 
 		//$query  = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date';
592 617 
 		if ($globalDBdriver == 'mysql') {
593 618 
 			$query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id';
594 
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
619 
+			if ($liveinterval) {
620 
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
621 
+			}
595 622 
 			$query .= ' ORDER BY date';
596 623 
 		} else {
597 624 
 			$query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id';
598 
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
625 
+			if ($liveinterval) {
626 
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
627 
+			}
599 628 
 			$query .= ' ORDER BY date';
600 629 
 		}
601 630 
 
@@ -690,7 +719,9 @@  discard block
 
 block discarded – undo
690 719 
 				$i++;
691 720 
 				$j++;
692 721 
 				if ($j == 30) {
693 
-					if ($globalDebug) echo ".";
722 
+					if ($globalDebug) {
723 
+						echo ".";
724 
+					}
694 725 
 				    	try {
695 726
696 727 
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 
@@ -997,7 +1028,9 @@  discard block
 
 block discarded – undo
997 1028 
 			{
998 1029 
 				return false;
999 1030 
 			}
1000 
-		} else return '';
1031 
+		} else {
1032 
+			return '';
1033 
+		}
1001 1034
1002 1035 
 		if ($longitude != '')
1003 1036 
 		{
 
@@ -1005,7 +1038,9 @@  discard block
 
 block discarded – undo
1005 1038 
 			{
1006 1039 
 				return false;
1007 1040 
 			}
1008 
-		} else return '';
1041 
+		} else {
1042 
+			return '';
1043 
+		}
1009 1044
1010 1045 
 		if ($waypoints != '')
1011 1046 
 		{
 
@@ -1021,14 +1056,18 @@  discard block
 
 block discarded – undo
1021 1056 
 			{
1022 1057 
 				return false;
1023 1058 
 			}
1024 
-		} else $altitude = 0;
1059 
+		} else {
1060 
+			$altitude = 0;
1061 
+		}
1025 1062 
 		if ($altitude_real != '')
1026 1063 
 		{
1027 1064 
 			if (!is_numeric($altitude_real))
1028 1065 
 			{
1029 1066 
 				return false;
1030 1067 
 			}
1031 
-		} else $altitude_real = 0;
1068 
+		} else {
1069 
+			$altitude_real = 0;
1070 
+		}
1032 1071
1033 1072 
 		if ($heading != '')
1034 1073 
 		{
 
@@ -1036,7 +1075,9 @@  discard block
 
 block discarded – undo
1036 1075 
 			{
1037 1076 
 				return false;
1038 1077 
 			}
1039 
-		} else $heading = 0;
1078 
+		} else {
1079 
+			$heading = 0;
1080 
+		}
1040 1081
1041 1082 
 		if ($groundspeed != '')
1042 1083 
 		{
 
@@ -1044,9 +1085,13 @@  discard block
 
 block discarded – undo
1044 1085 
 			{
1045 1086 
 				return false;
1046 1087 
 			}
1047 
-		} else $groundspeed = 0;
1088 
+		} else {
1089 
+			$groundspeed = 0;
1090 
+		}
1048 1091 
 		date_default_timezone_set('UTC');
1049 
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
1092 
+		if ($date == '') {
1093 
+			$date = date("Y-m-d H:i:s", time());
1094 
+		}
1050 1095
1051 1096
1052 1097 
 		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
 
@@ -1091,14 +1136,24 @@  discard block
 
 block discarded – undo
1091 1136 
 		$arrival_airport_country = '';
1092 1137
1093 1138
1094 
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
1095 
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
1096 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
1097 
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
1139 
+            	if ($squawk == '' || $Common->isInteger($squawk) === false ) {
1140 
+            		$squawk = NULL;
1141 
+            	}
1142 
+            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) {
1143 
+            		$verticalrate = NULL;
1144 
+            	}
1145 
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
1146 
+            		$groundspeed = 0;
1147 
+            	}
1148 
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
1149 
+            		$heading = 0;
1150 
+            	}
1098 1151
1099 1152 
 		$query = '';
1100 1153 
 		if ($globalArchive) {
1101 
-			if ($globalDebug) echo '-- Delete previous data -- ';
1154 
+			if ($globalDebug) {
1155 
+				echo '-- Delete previous data -- ';
1156 
+			}
1102 1157 
 			$query .= 'DELETE FROM spotter_live WHERE flightaware_id = :flightaware_id;';
1103 1158 
 		}
1104 1159 
 
@@ -1115,10 +1170,14 @@  discard block
 
 block discarded – undo
1115 1170 
 			return "error : ".$e->getMessage();
1116 1171 
 		}
1117 1172 
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
1118 
-		    if ($globalDebug) echo '(Add to SBS archive : ';
1173 
+		    if ($globalDebug) {
1174 
+		    	echo '(Add to SBS archive : ';
1175 
+		    }
1119 1176 
 		    $SpotterArchive = new SpotterArchive($this->db);
1120 1177 
 		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
1121 
-		    if ($globalDebug) echo $result.')';
1178 
+		    if ($globalDebug) {
1179 
+		    	echo $result.')';
1180 
+		    }
1122 1181 
 		} elseif ($globalDebug && $putinarchive !== true) {
1123 1182 
 			echo '(Not adding to archive)';
1124 1183 
 		} elseif ($globalDebug && $noarchive === true) {
Please login to merge, or discard this patch.
require/class.Satellite.php 1 patch
Braces   +58 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -12,7 +12,9 @@  discard block
 
 block discarded – undo
12 12 
 	public function __construct($dbc = null) {
13 13 
 		$Connection = new Connection($dbc);
14 14 
 		$this->db = $Connection->db();
15 
-		if ($this->db === null) die('Error: No DB connection.');
15 
+		if ($this->db === null) {
16 
+			die('Error: No DB connection.');
17 
+		}
16 18 
 	}
17 19
18 20 
 	public function get_tle($name) {
 
@@ -24,8 +26,11 @@  discard block
 
 block discarded – undo
24 26 
 			echo $e->getMessage();
25 27 
 		}
26 28 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
27 
-		if (isset($result[0])) return $result[0];
28 
-		else return array();
29 
+		if (isset($result[0])) {
30 
+			return $result[0];
31 
+		} else {
32 
+			return array();
33 
+		}
29 34 
 	}
30 35 
 	public function get_tle_types() {
31 36 
 		$query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type';
 
@@ -36,8 +41,11 @@  discard block
 
 block discarded – undo
36 41 
 			echo $e->getMessage();
37 42 
 		}
38 43 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
39 
-		if (isset($result[0])) return $result;
40 
-		else return array();
44 
+		if (isset($result[0])) {
45 
+			return $result;
46 
+		} else {
47 
+			return array();
48 
+		}
41 49 
 	}
42 50 
 	public function get_tle_names() {
43 51 
 		$query = 'SELECT DISTINCT tle_name, tle_type FROM tle';
 
@@ -48,8 +56,11 @@  discard block
 
 block discarded – undo
48 56 
 			echo $e->getMessage();
49 57 
 		}
50 58 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
51 
-		if (isset($result[0])) return $result;
52 
-		else return array();
59 
+		if (isset($result[0])) {
60 
+			return $result;
61 
+		} else {
62 
+			return array();
63 
+		}
53 64 
 	}
54 65 
 	public function get_tle_names_type($type) {
55 66 
 		$query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name';
 
@@ -60,8 +71,11 @@  discard block
 
 block discarded – undo
60 71 
 			echo $e->getMessage();
61 72 
 		}
62 73 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
63 
-		if (isset($result[0])) return $result;
64 
-		else return array();
74 
+		if (isset($result[0])) {
75 
+			return $result;
76 
+		} else {
77 
+			return array();
78 
+		}
65 79 
 	}
66 80
67 81 
 	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
 
@@ -95,7 +109,9 @@  discard block
 
 block discarded – undo
95 109 
 		$sat = new Predict_Sat($tle);
96 110 
 		$predict = new Predict();
97 111 
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
98 
-		if ($timestamp_begin == '') $timestamp_begin = time();
112 
+		if ($timestamp_begin == '') {
113 
+			$timestamp_begin = time();
114 
+		}
99 115 
 		if ($timestamp_end == '') {
100 116 
 			$now = Predict_Time::unix2daynum($timestamp_begin);
101 117 
 			$predict->predict_calc($sat,$qth,$now);
 
@@ -120,8 +136,11 @@  discard block
 
 block discarded – undo
120 136 
 			echo $e->getMessage();
121 137 
 		}
122 138 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
123 
-		if (isset($result[0])) return $result[0];
124 
-		else return array();
139 
+		if (isset($result[0])) {
140 
+			return $result[0];
141 
+		} else {
142 
+			return array();
143 
+		}
125 144 
 	}
126 145
127 146 
 	/**
 
@@ -139,7 +158,9 @@  discard block
 
 block discarded – undo
139 158 
 		    FROM satellite".$filter_query." satellite.launch_site <> '' AND satellite.launch_site IS NOT NULL";
140 159 
 		$query_values = array();
141 160 
 		$query .= " GROUP BY satellite.launch_site ORDER BY launch_site_count DESC";
142 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
161 
+		if ($limit) {
162 
+			$query .= " LIMIT 10 OFFSET 0";
163 
+		}
143 164 
 		$sth = $this->db->prepare($query);
144 165 
 		$sth->execute($query_values);
145 166 
 		$launch_site_array = array();
 
@@ -168,7 +189,9 @@  discard block
 
 block discarded – undo
168 189 
 		    FROM satellite".$filter_query." satellite.owner <> '' AND satellite.owner IS NOT NULL";
169 190 
 		$query_values = array();
170 191 
 		$query .= " GROUP BY satellite.owner ORDER BY owner_count DESC";
171 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
192 
+		if ($limit) {
193 
+			$query .= " LIMIT 10 OFFSET 0";
194 
+		}
172 195 
 		$sth = $this->db->prepare($query);
173 196 
 		$sth->execute($query_values);
174 197 
 		$owner_array = array();
 
@@ -197,7 +220,9 @@  discard block
 
 block discarded – undo
197 220 
 		    FROM satellite".$filter_query." satellite.country_owner <> '' AND satellite.country_owner IS NOT NULL";
198 221 
 		$query_values = array();
199 222 
 		$query .= " GROUP BY satellite.country_owner ORDER BY country_count DESC";
200 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
223 
+		if ($limit) {
224 
+			$query .= " LIMIT 10 OFFSET 0";
225 
+		}
201 226 
 		$sth = $this->db->prepare($query);
202 227 
 		$sth->execute($query_values);
203 228 
 		$owner_array = array();
 
@@ -224,20 +249,26 @@  discard block
 
 block discarded – undo
224 249 
 			date_default_timezone_set($globalTimezone);
225 250 
 			$datetime = new DateTime();
226 251 
 			$offset = $datetime->format('P');
227 
-		} else $offset = '+00:00';
252 
+		} else {
253 
+			$offset = '+00:00';
254 
+		}
228 255 
 		//$filter_query = $this->getFilter($filters,true,true);
229 256 
 		$filter_query = ' WHERE';
230 257 
 		if ($globalDBdriver == 'mysql') {
231 258 
 			$query  = "SELECT MONTH(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
232 259 
 				FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
233 
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
260 
+			if ($sincedate != '') {
261 
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
262 
+			}
234 263 
 			$query .= " GROUP BY year_name, month_name
235 264 
 				ORDER BY year_name, month_name ASC";
236 265 
 			$query_data = array(':offset' => $offset);
237 266 
 		} else {
238 267 
 			$query  = "SELECT EXTRACT(MONTH FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS month_name, EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
239 268 
 				FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 YEARS'";
240 
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
269 
+			if ($sincedate != '') {
270 
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
271 
+			}
241 272 
 			$query .= " GROUP BY year_name, month_name
242 273 
 				ORDER BY year_name, month_name ASC";
243 274 
 			$query_data = array(':offset' => $offset);
 
@@ -269,20 +300,26 @@  discard block
 
 block discarded – undo
269 300 
 			date_default_timezone_set($globalTimezone);
270 301 
 			$datetime = new DateTime();
271 302 
 			$offset = $datetime->format('P');
272 
-		} else $offset = '+00:00';
303 
+		} else {
304 
+			$offset = '+00:00';
305 
+		}
273 306 
 		//$filter_query = $this->getFilter($filters,true,true);
274 307 
 		$filter_query = ' WHERE';
275 308 
 		if ($globalDBdriver == 'mysql') {
276 309 
 			$query  = "SELECT YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
277 310 
 				FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 YEAR)";
278 
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
311 
+			if ($sincedate != '') {
312 
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
313 
+			}
279 314 
 			$query .= " GROUP BY year_name
280 315 
 				ORDER BY year_name ASC";
281 316 
 			$query_data = array(':offset' => $offset);
282 317 
 		} else {
283 318 
 			$query  = "SELECT EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
284 319 
 				FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '10 YEARS'";
285 
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
320 
+			if ($sincedate != '') {
321 
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
322 
+			}
286 323 
 			$query .= " GROUP BY year_name
287 324 
 				ORDER BY year_name ASC";
288 325 
 			$query_data = array(':offset' => $offset);
Please login to merge, or discard this patch.
require/class.Accident.php 1 patch
Braces   +87 added lines, -31 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.');
13 
+		if ($this->db === null) {
14 
+			die('Error: No DB connection.');
15 
+		}
14 16 
 	}
15 17
16 18 
 	public function get() {
 
@@ -111,8 +113,11 @@  discard block
 
 block discarded – undo
111 113 
 				$data = array();
112 114 
 				if ($row['registration'] != '') {
113 115 
 					$image_array = $Image->getSpotterImage($row['registration']);
114 
-					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']));
115 
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
116 
+					if (count($image_array) > 0) {
117 
+						$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']));
118 
+					} else {
119 
+						$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
120 
+					}
116 121 
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
117 122 
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
118 123 
 					if (!empty($aircraft_info)) {
 
@@ -128,17 +133,30 @@  discard block
 
 block discarded – undo
128 133 
 						$data['aircraft_base'] = $owner_data['base'];
129 134 
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
130 135 
 					}
131 
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
132 
-				if ($row['registration'] == '') $row['registration'] = 'NA';
133 
-				if ($row['ident'] == '') $row['ident'] = 'NA';
136 
+				} else {
137 
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
138 
+				}
139 
+				if ($row['registration'] == '') {
140 
+					$row['registration'] = 'NA';
141 
+				}
142 
+				if ($row['ident'] == '') {
143 
+					$row['ident'] = 'NA';
144 
+				}
134 145 
 				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
135 146 
 				if (isset($identicao[0])) {
136 147 
 					if (substr($row['ident'],0,2) == 'AF') {
137 
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
138 
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
139 
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
148 
+						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
149 
+							$icao = $row['ident'];
150 
+						} else {
151 
+							$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
152 
+						}
153 
+					} else {
154 
+						$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
155 
+					}
140 156 
 					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
141 
-				} else $icao = $row['ident'];
157 
+				} else {
158 
+					$icao = $row['ident'];
159 
+				}
142 160 
 				$icao = $Translation->checkTranslation($icao,false);
143 161 
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
144 162 
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
 
@@ -153,10 +171,14 @@  discard block
 
 block discarded – undo
153 171 
 					//else echo 'No data...'."\n";
154 172 
 				}
155 173 
 				$data = array_merge($row,$data);
156 
-				if ($data['ident'] == null) $data['ident'] = $icao;
174 
+				if ($data['ident'] == null) {
175 
+					$data['ident'] = $icao;
176 
+				}
157 177 
 				if ($data['title'] == null) {
158 178 
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
159 
-				} else $data['message'] = strtolower($data['title']);
179 
+				} else {
180 
+					$data['message'] = strtolower($data['title']);
181 
+				}
160 182 
 				$ids = $Spotter->getAllIDByRegistration($data['registration']);
161 183 
 				$date = $data['date'];
162 184 
 				if (isset($ids[$date])) {
 
@@ -175,8 +197,9 @@  discard block
 
 block discarded – undo
175 197 
 		if (isset($result)) {
176 198 
 			$result[0]['query_number_rows'] = $i;
177 199 
 			return $result;
200 
+		} else {
201 
+			return array();
178 202 
 		}
179 
-		else return array();
180 203 
 	}
181 204
182 205 
 	/*
 
@@ -221,7 +244,9 @@  discard block
 
 block discarded – undo
221 244 
 	*/
222 245 
 	public function import($file) {
223 246 
 		global $globalTransaction, $globalDebug;
224 
-		if ($globalDebug) echo 'Import '.$file."\n";
247 
+		if ($globalDebug) {
248 
+			echo 'Import '.$file."\n";
249 
+		}
225 250 
 		$result = array();
226 251 
 		if (file_exists($file)) {
227 252 
 			if (($handle = fopen($file,'r')) !== FALSE) {
 
@@ -232,8 +257,11 @@  discard block
 
 block discarded – undo
232 257 
 				}
233 258 
 				fclose($handle);
234 259 
 			}
235 
-			if (!empty($result)) $this->add($result,true);
236 
-			elseif ($globalDebug) echo 'Nothing to import';
260 
+			if (!empty($result)) {
261 
+				$this->add($result,true);
262 
+			} elseif ($globalDebug) {
263 
+				echo 'Nothing to import';
264 
+			}
237 265 
 		}
238 266 
 	}
239 267 
 
@@ -269,14 +297,23 @@  discard block
 
 block discarded – undo
269 297 
 					}
270 298 
 				}
271 299 
 				fclose($handle);
272 
-			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
273 
-		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
300 
+			} elseif ($globalDebug) {
301 
+				echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
302 
+			}
303 
+		} elseif ($globalDebug) {
304 
+			echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
305 
+		}
274 306 
 		$result = $Common->arr_diff($all_md5_new,$all_md5);
275 
-		if (empty($result) && $globalDebug) echo 'Nothing to update';
307 
+		if (empty($result) && $globalDebug) {
308 
+			echo 'Nothing to update';
309 
+		}
276 310 
 		foreach ($result as $file => $md5) {
277 311 
 			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
278 
-			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
279 
-			elseif ($globalDebug) echo 'Download '.$file.' failed';
312 
+			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
313 
+				$this->import(dirname(__FILE__).'/../install/tmp/'.$file);
314 
+			} elseif ($globalDebug) {
315 
+				echo 'Download '.$file.' failed';
316 
+			}
280 317 
 		}
281 318 
 	}
282 319 
 
@@ -293,13 +330,17 @@  discard block
 
 block discarded – undo
293 330 
 		$Image = new Image();
294 331 
 		$Spotter = new Spotter();
295 332
296 
-		if (empty($crash)) return false;
333 
+		if (empty($crash)) {
334 
+			return false;
335 
+		}
297 336 
 		if (!$new) {
298 337 
 			$query_delete = 'DELETE FROM accidents WHERE source = :source';
299 338 
 			$sthd = $Connection->db->prepare($query_delete);
300 339 
 			$sthd->execute(array(':source' => $crash[0]['source']));
301 340 
 		}
302 
-		if ($globalTransaction) $Connection->db->beginTransaction();
341 
+		if ($globalTransaction) {
342 
+			$Connection->db->beginTransaction();
343 
+		}
303 344 
 		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
304 345 
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
305 346 
 		$sth_check = $Connection->db->prepare($query_check);
 
@@ -314,7 +355,9 @@  discard block
 
 block discarded – undo
314 355 
 					return $value === "" ? NULL : $value;
315 356 
 				}, $cr);
316 357 
 				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
317 
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
358 
+					if (strpos($cr['registration'],'-') === FALSE) {
359 
+						$cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
360 
+					}
318 361 
 					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
319 362 
 					$sth_check->execute($query_check_values);
320 363 
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
 
@@ -323,13 +366,19 @@  discard block
 
 block discarded – undo
323 366 
 						$sth->execute($query_values);
324 367 
 						if ($cr['date'] > time()-(30*86400)) {
325 368 
 							if (empty($Image->getSpotterImage($cr['registration']))) {
326 
-								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
369 
+								if ($globalDebug) {
370 
+									echo "\t".'Get image for '.$cr['registration'].'...';
371 
+								}
327 372 
 								$Image->addSpotterImage($cr['registration']);
328 
-								if ($globalDebug) echo "\t".'Done'."\n";
373 
+								if ($globalDebug) {
374 
+									echo "\t".'Done'."\n";
375 
+								}
329 376 
 							}
330 377 
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
331 378 
 						}
332 
-						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
379 
+						if ($cr['title'] == '') {
380 
+							$cr['title'] = $cr['registration'].' '.$cr['type'];
381 
+						}
333 382 
 						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
334 383 
 					}
335 384 
 				}
 
@@ -338,9 +387,13 @@  discard block
 
 block discarded – undo
338 387 
 					$Connection->db->beginTransaction();
339 388 
 				}
340 389 
 			}
341 
-			if ($globalTransaction) $Connection->db->commit();
390 
+			if ($globalTransaction) {
391 
+				$Connection->db->commit();
392 
+			}
342 393 
 		} catch(PDOException $e) {
343 
-			if ($globalTransaction) $Connection->db->rollBack();
394 
+			if ($globalTransaction) {
395 
+				$Connection->db->rollBack();
396 
+			}
344 397 
 			echo $e->getMessage();
345 398 
 		}
346 399 
 		$sth_check->closeCursor();
 
@@ -379,8 +432,11 @@  discard block
 
 block discarded – undo
379 432 
 			return "error : ".$e->getMessage();
380 433 
 		}
381 434 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
382 
-		if ($row['nb'] > 0) return false;
383 
-		else return true;
435 
+		if ($row['nb'] > 0) {
436 
+			return false;
437 
+		} else {
438 
+			return true;
439 
+		}
384 440 
 	}
385 441
386 442 
 	public static function insert_last_accidents_update() {
Please login to merge, or discard this patch.
require/class.SpotterArchive.php 1 patch
Braces   +40 added lines, -14 removed lines patch added patch discarded remove patch 
@@ -6,7 +6,9 @@  discard block
 
 block discarded – undo
6 6 
 	public function __construct($dbc = null) {
7 7 
 		$Connection = new Connection($dbc);
8 8 
 		$this->db = $Connection->db;
9 
-		if ($this->db === null) die('Error: No DB connection.');
9 
+		if ($this->db === null) {
10 
+			die('Error: No DB connection.');
11 
+		}
10 12 
 	}
11 13
12 14 
     /**
 
@@ -27,7 +29,9 @@  discard block
 
 block discarded – undo
27 29 
 	if (isset($filter[0]['source'])) {
28 30 
 		$filters = array_merge($filters,$filter);
29 31 
 	}
30 
-	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
32 
+	if (is_array($globalFilter)) {
33 
+		$filter = array_merge($filter,$globalFilter);
34 
+	}
31 35 
 	$filter_query_join = '';
32 36 
 	$filter_query_where = '';
33 37 
 	foreach($filters as $flt) {
 
@@ -114,8 +118,11 @@  discard block
 
 block discarded – undo
114 118 
 	    }
115 119 
 	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
116 120 
 	}
117 
-	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
118 
-	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
121 
+	if ($filter_query_where == '' && $where) {
122 
+		$filter_query_where = ' WHERE';
123 
+	} elseif ($filter_query_where != '' && $and) {
124 
+		$filter_query_where .= ' AND';
125 
+	}
119 126 
 	if ($filter_query_where != '') {
120 127 
 		$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
121 128 
 	}
 
@@ -129,10 +136,17 @@  discard block
 
 block discarded – undo
129 136 
 		if ($over_country == '') {
130 137 
 			$Spotter = new Spotter($this->db);
131 138 
 			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
132 
-			if (!empty($data_country)) $country = $data_country['iso2'];
133 
-			else $country = '';
134 
-		} else $country = $over_country;
135 
-		if ($airline_type === NULL) $airline_type ='';
139 
+			if (!empty($data_country)) {
140 
+				$country = $data_country['iso2'];
141 
+			} else {
142 
+				$country = '';
143 
+			}
144 
+		} else {
145 
+			$country = $over_country;
146 
+		}
147 
+		if ($airline_type === NULL) {
148 
+			$airline_type ='';
149 
+		}
136 150
137 151 
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
138 152 
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
 
@@ -639,7 +653,9 @@  discard block
 
 block discarded – undo
639 653 
 		    $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
640 654 
 		    $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
641 655 
 		    $translate = $Translation->ident2icao($q_item);
642 
-		    if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
656 
+		    if ($translate != $q_item) {
657 
+		    	$additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
658 
+		    }
643 659 
 		    $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
644 660 
 		    $additional_query .= ")";
645 661 
 		}
 
@@ -857,7 +873,9 @@  discard block
 
 block discarded – undo
857 873 
 		date_default_timezone_set($globalTimezone);
858 874 
 		$datetime = new DateTime();
859 875 
 		$offset = $datetime->format('P');
860 
-	    } else $offset = '+00:00';
876 
+	    } else {
877 
+	    	$offset = '+00:00';
878 
+	    }
861 879
862 880
863 881 
 	    if ($date_array[1] != "")
 
@@ -1133,9 +1151,13 @@  discard block
 
 block discarded – undo
1133 1151 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1134 1152 
 			}
1135 1153 
 		}
1136 
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1154 
+                if ($sincedate != '') {
1155 
+                	$query .= "AND date > '".$sincedate."' ";
1156 
+                }
1137 1157 
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1138 
-	if ($limit) $query .= " LIMIT 0,10";
1158 
+	if ($limit) {
1159 
+		$query .= " LIMIT 0,10";
1160 
+	}
1139 1161
1140 1162
1141 1163 
 	$sth = $this->db->prepare($query);
 
@@ -1179,9 +1201,13 @@  discard block
 
 block discarded – undo
1179 1201 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1180 1202 
 			}
1181 1203 
 		}
1182 
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1204 
+                if ($sincedate != '') {
1205 
+                	$query .= "AND s.date > '".$sincedate."' ";
1206 
+                }
1183 1207 
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1184 
-	if ($limit) $query .= " LIMIT 0,10";
1208 
+	if ($limit) {
1209 
+		$query .= " LIMIT 0,10";
1210 
+	}
1185 1211
1186 1212
1187 1213 
 	$sth = $this->db->prepare($query);
Please login to merge, or discard this patch.
require/class.ATC.php 1 patch
Braces   +20 added lines, -7 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.');
10 
+		if ($this->db === null) {
11 
+			die('Error: No DB connection.');
12 
+		}
11 13 
 	}
12 14
13 15 
 	/**
 
@@ -20,20 +22,27 @@  discard block
 
 block discarded – undo
20 22 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 23 
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22 24 
 				foreach($globalStatsFilters[$globalFilterName] as $source) {
23 
-					if (isset($source['source'])) $filter['source'][] = $source['source'];
25 
+					if (isset($source['source'])) {
26 
+						$filter['source'][] = $source['source'];
27 
+					}
24 28 
 				}
25 29 
 			} else {
26 30 
 				$filter = $globalStatsFilters[$globalFilterName];
27 31 
 			}
28 32 
 		}
29 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
33 
+		if (is_array($globalFilter)) {
34 
+			$filter = array_merge($filter,$globalFilter);
35 
+		}
30 36 
 		$filter_query_join = '';
31 37 
 		$filter_query_where = '';
32 38 
 		if (isset($filter['source']) && !empty($filter['source'])) {
33 39 
 			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
34 40 
 		}
35 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
36 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
41 
+		if ($filter_query_where == '' && $where) {
42 
+			$filter_query_where = ' WHERE';
43 
+		} elseif ($filter_query_where != '' && $and) {
44 
+			$filter_query_where .= ' AND';
45 
+		}
37 46 
 		$filter_query = $filter_query_join.$filter_query_where;
38 47 
 		return $filter_query;
39 48 
 	}
 
@@ -90,7 +99,9 @@  discard block
 
 block discarded – undo
90 99 
 		$info = str_replace('^','<br />',$info);
91 100 
 		$info = str_replace('&amp;sect;','',$info);
92 101 
 		$info = str_replace('"','',$info);
93 
-		if ($type == '') $type = NULL;
102 
+		if ($type == '') {
103 
+			$type = NULL;
104 
+		}
94 105 
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
95 106 
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
96 107 
 		try {
 
@@ -106,7 +117,9 @@  discard block
 
 block discarded – undo
106 117 
 		$info = str_replace('^','<br />',$info);
107 118 
 		$info = str_replace('&amp;sect;','',$info);
108 119 
 		$info = str_replace('"','',$info);
109 
-		if ($type == '') $type = NULL;
120 
+		if ($type == '') {
121 
+			$type = NULL;
122 
+		}
110 123 
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
111 124 
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
112 125 
 		try {
Please login to merge, or discard this patch.
require/class.MarineArchive.php 1 patch
Braces   +37 added lines, -13 removed lines patch added patch discarded remove patch 
@@ -6,7 +6,9 @@  discard block
 
 block discarded – undo
6 6 
 	public function __construct($dbc = null) {
7 7 
 		$Connection = new Connection($dbc);
8 8 
 		$this->db = $Connection->db;
9 
-		if ($this->db === null) die('Error: No DB connection.');
9 
+		if ($this->db === null) {
10 
+			die('Error: No DB connection.');
11 
+		}
10 12 
 	}
11 13
12 14 
 	/**
 
@@ -27,7 +29,9 @@  discard block
 
 block discarded – undo
27 29 
 		if (isset($filter[0]['source'])) {
28 30 
 			$filters = array_merge($filters,$filter);
29 31 
 		}
30 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
32 
+		if (is_array($globalFilter)) {
33 
+			$filter = array_merge($filter,$globalFilter);
34 
+		}
31 35 
 		$filter_query_join = '';
32 36 
 		$filter_query_where = '';
33 37 
 		foreach($filters as $flt) {
 
@@ -73,8 +77,11 @@  discard block
 
 block discarded – undo
73 77 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74 78 
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
75 79 
 		}
76 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
77 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
80 
+		if ($filter_query_where == '' && $where) {
81 
+			$filter_query_where = ' WHERE';
82 
+		} elseif ($filter_query_where != '' && $and) {
83 
+			$filter_query_where .= ' AND';
84 
+		}
78 85 
 		if ($filter_query_where != '') {
79 86 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
80 87 
 		}
 
@@ -88,9 +95,14 @@  discard block
 
 block discarded – undo
88 95 
 		if ($over_country == '') {
89 96 
 			$Marine = new Marine($this->db);
90 97 
 			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude);
91 
-			if (!empty($data_country)) $country = $data_country['iso2'];
92 
-			else $country = '';
93 
-		} else $country = $over_country;
98 
+			if (!empty($data_country)) {
99 
+				$country = $data_country['iso2'];
100 
+			} else {
101 
+				$country = '';
102 
+			}
103 
+		} else {
104 
+			$country = $over_country;
105 
+		}
94 106
95 107 
 		//$country = $over_country;
96 108 
 		// Route is not added in marine_archive
 
@@ -593,7 +605,9 @@  discard block
 
 block discarded – undo
593 605 
 		    $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
594 606 
 		    $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
595 607 
 		    $translate = $Translation->ident2icao($q_item);
596 
-		    if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
608 
+		    if ($translate != $q_item) {
609 
+		    	$additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
610 
+		    }
597 611 
 		    $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
598 612 
 		    $additional_query .= ")";
599 613 
 		}
 
@@ -811,7 +825,9 @@  discard block
 
 block discarded – undo
811 825 
 		date_default_timezone_set($globalTimezone);
812 826 
 		$datetime = new DateTime();
813 827 
 		$offset = $datetime->format('P');
814 
-	    } else $offset = '+00:00';
828 
+	    } else {
829 
+	    	$offset = '+00:00';
830 
+	    }
815 831
816 832
817 833 
 	    if ($date_array[1] != "")
 
@@ -1087,9 +1103,13 @@  discard block
 
 block discarded – undo
1087 1103 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1088 1104 
 			}
1089 1105 
 		}
1090 
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1106 
+                if ($sincedate != '') {
1107 
+                	$query .= "AND date > '".$sincedate."' ";
1108 
+                }
1091 1109 
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1092 
-	if ($limit) $query .= " LIMIT 0,10";
1110 
+	if ($limit) {
1111 
+		$query .= " LIMIT 0,10";
1112 
+	}
1093 1113
1094 1114
1095 1115 
 	$sth = $this->db->prepare($query);
 
@@ -1133,9 +1153,13 @@  discard block
 
 block discarded – undo
1133 1153 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1134 1154 
 			}
1135 1155 
 		}
1136 
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1156 
+                if ($sincedate != '') {
1157 
+                	$query .= "AND s.date > '".$sincedate."' ";
1158 
+                }
1137 1159 
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1138 
-	if ($limit) $query .= " LIMIT 0,10";
1160 
+	if ($limit) {
1161 
+		$query .= " LIMIT 0,10";
1162 
+	}
1139 1163
1140 1164
1141 1165 
 	$sth = $this->db->prepare($query);
Please login to merge, or discard this patch.
require/class.TrackerLive.php 1 patch
Braces   +77 added lines, -26 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.');
11 
+		if ($this->db === null) {
12 
+			die('Error: No DB connection.');
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) {
 
@@ -77,8 +81,11 @@  discard block
 
 block discarded – undo
77 81 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
78 82 
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
79 83 
 		}
80 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
81 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
84 
+		if ($filter_query_where == '' && $where) {
85 
+			$filter_query_where = ' WHERE';
86 
+		} elseif ($filter_query_where != '' && $and) {
87 
+			$filter_query_where .= ' AND';
88 
+		}
82 89 
 		if ($filter_query_where != '') {
83 90 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
84 91 
 		}
 
@@ -120,7 +127,9 @@  discard block
 
 block discarded – undo
120 127 
 			}
121 128 
 		}
122 129
123 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
130 
+		if (!isset($globalLiveInterval)) {
131 
+			$globalLiveInterval = '200';
132 
+		}
124 133 
 		if ($globalDBdriver == 'mysql') {
125 134 
 			//$query  = "SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate";
126 135 
 			$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate'.$filter_query.$orderby_query;
 
@@ -145,7 +154,9 @@  discard block
 
 block discarded – undo
145 154
146 155 
 		$filter_query = $this->getFilter($filter,true,true);
147 156
148 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
157 
+		if (!isset($globalLiveInterval)) {
158 
+			$globalLiveInterval = '200';
159 
+		}
149 160 
 		if ($globalDBdriver == 'mysql') {
150 161 
 			$query  = 'SELECT tracker_live.ident, tracker_live.type,tracker_live.famtrackid, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source
151 162 
 			FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate'.$filter_query." tracker_live.latitude <> 0 AND tracker_live.longitude <> 0";
 
@@ -183,7 +194,9 @@  discard block
 
 block discarded – undo
183 194
184 195 
 		$filter_query = $this->getFilter($filter,true,true);
185 196
186 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
197 
+		if (!isset($globalLiveInterval)) {
198 
+			$globalLiveInterval = '200';
199 
+		}
187 200 
 		if ($globalDBdriver == 'mysql') {
188 201 
 			if (isset($globalArchive) && $globalArchive) {
189 202 
 				$query  = "SELECT * FROM (
 
@@ -241,7 +254,9 @@  discard block
 
 block discarded – undo
241 254 
 		global $globalDBdriver, $globalLiveInterval;
242 255 
 		$filter_query = $this->getFilter($filter,true,true);
243 256
244 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
257 
+		if (!isset($globalLiveInterval)) {
258 
+			$globalLiveInterval = '200';
259 
+		}
245 260 
 		if ($globalDBdriver == 'mysql') {
246 261 
 			$query = 'SELECT COUNT(DISTINCT tracker_live.famtrackid) as nb FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
247 262 
 		} else {
 
@@ -269,7 +284,9 @@  discard block
 
 block discarded – undo
269 284 
 	{
270 285 
 		global $globalDBdriver, $globalLiveInterval;
271 286 
 		$Spotter = new Spotter($this->db);
272 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
287 
+		if (!isset($globalLiveInterval)) {
288 
+			$globalLiveInterval = '200';
289 
+		}
273 290 
 		$filter_query = $this->getFilter($filter);
274 291
275 292 
 		if (is_array($coord)) {
 
@@ -277,7 +294,9 @@  discard block
 
 block discarded – undo
277 294 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
278 295 
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
279 296 
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
280 
-		} else return array();
297 
+		} else {
298 
+			return array();
299 
+		}
281 300 
 		if ($globalDBdriver == 'mysql') {
282 301 
 			$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND tracker_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY tracker_live.famtrackid'.$filter_query;
283 302 
 		} else {
 
@@ -297,7 +316,9 @@  discard block
 
 block discarded – undo
297 316 
 	{
298 317 
 		global $globalDBdriver, $globalLiveInterval;
299 318 
 		$Spotter = new Spotter($this->db);
300 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
319 
+		if (!isset($globalLiveInterval)) {
320 
+			$globalLiveInterval = '200';
321 
+		}
301 322 
 		$filter_query = $this->getFilter($filter);
302 323
303 324 
 		if (is_array($coord)) {
 
@@ -305,7 +326,9 @@  discard block
 
 block discarded – undo
305 326 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
306 327 
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
307 328 
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
308 
-		} else return array();
329 
+		} else {
330 
+			return array();
331 
+		}
309 332 
 		if ($globalDBdriver == 'mysql') {
310 333 
 			$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source
311 334 
 			FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' AND tracker_live.latitude BETWEEN ".$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong."
 
@@ -498,11 +521,15 @@  discard block
 
 block discarded – undo
498 521 
 		//$query  = self::$global_query.' WHERE tracker_live.famtrackid = :id ORDER BY date';
499 522 
 		if ($globalDBdriver == 'mysql') {
500 523 
 			$query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id';
501 
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
524 
+			if ($liveinterval) {
525 
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
526 
+			}
502 527 
 			$query .= ' ORDER BY date';
503 528 
 		} else {
504 529 
 			$query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id';
505 
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
530 
+			if ($liveinterval) {
531 
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
532 
+			}
506 533 
 			$query .= ' ORDER BY date';
507 534 
 		}
508 535 
 
@@ -597,7 +624,9 @@  discard block
 
 block discarded – undo
597 624 
 				$i++;
598 625 
 				$j++;
599 626 
 				if ($j == 30) {
600 
-					if ($globalDebug) echo ".";
627 
+					if ($globalDebug) {
628 
+						echo ".";
629 
+					}
601 630 
 				    	try {
602 631
603 632 
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 
@@ -844,7 +873,9 @@  discard block
 
 block discarded – undo
844 873 
 			{
845 874 
 				return false;
846 875 
 			}
847 
-		} else return '';
876 
+		} else {
877 
+			return '';
878 
+		}
848 879
849 880 
 		if ($longitude != '')
850 881 
 		{
 
@@ -852,7 +883,9 @@  discard block
 
 block discarded – undo
852 883 
 			{
853 884 
 				return false;
854 885 
 			}
855 
-		} else return '';
886 
+		} else {
887 
+			return '';
888 
+		}
856 889
857 890 
 		if ($altitude != '')
858 891 
 		{
 
@@ -860,7 +893,9 @@  discard block
 
 block discarded – undo
860 893 
 			{
861 894 
 				return false;
862 895 
 			}
863 
-		} else $altitude = 0;
896 
+		} else {
897 
+			$altitude = 0;
898 
+		}
864 899
865 900 
 		if ($heading != '')
866 901 
 		{
 
@@ -868,7 +903,9 @@  discard block
 
 block discarded – undo
868 903 
 			{
869 904 
 				return false;
870 905 
 			}
871 
-		} else $heading = 0;
906 
+		} else {
907 
+			$heading = 0;
908 
+		}
872 909
873 910 
 		if ($groundspeed != '')
874 911 
 		{
 
@@ -876,9 +913,13 @@  discard block
 
 block discarded – undo
876 913 
 			{
877 914 
 				return false;
878 915 
 			}
879 
-		} else $groundspeed = 0;
916 
+		} else {
917 
+			$groundspeed = 0;
918 
+		}
880 919 
 		date_default_timezone_set('UTC');
881 
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
920 
+		if ($date == '') {
921 
+			$date = date("Y-m-d H:i:s", time());
922 
+		}
882 923
883 924
884 925 
 		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
 
@@ -894,12 +935,18 @@  discard block
 
 block discarded – undo
894 935 
 		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
895 936 
 		$type = filter_var($type,FILTER_SANITIZE_STRING);
896 937
897 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
898 
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
938 
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
939 
+            		$groundspeed = 0;
940 
+            	}
941 
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
942 
+            		$heading = 0;
943 
+            	}
899 944
900 945 
 		$query = '';
901 946 
 		if ($globalArchive) {
902 
-			if ($globalDebug) echo '-- Delete previous data -- ';
947 
+			if ($globalDebug) {
948 
+				echo '-- Delete previous data -- ';
949 
+			}
903 950 
 			$query .= 'DELETE FROM tracker_live WHERE famtrackid = :famtrackid;';
904 951 
 		}
905 952 
 		$query  .= 'INSERT INTO tracker_live (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
@@ -918,10 +965,14 @@  discard block
 
 block discarded – undo
918 965 
                 echo 'noarchive : '.$noarchive."\n";
919 966 
                 */
920 967 
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
921 
-		    if ($globalDebug) echo '(Add to Tracker archive '.$famtrackid.' : ';
968 
+		    if ($globalDebug) {
969 
+		    	echo '(Add to Tracker archive '.$famtrackid.' : ';
970 
+		    }
922 971 
 		    $TrackerArchive = new TrackerArchive($this->db);
923 972 
 		    $result =  $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country);
924 
-		    if ($globalDebug) echo $result.')';
973 
+		    if ($globalDebug) {
974 
+		    	echo $result.')';
975 
+		    }
925 976 
 		}
926 977
927 978 
 		return "success";
Please login to merge, or discard this patch.
require/class.Marine.php 1 patch
Braces   +173 added lines, -62 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.');
11 
+		if ($this->db === null) {
12 
+			die('Error: No DB connection.');
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) {
 
@@ -69,8 +73,11 @@  discard block
 
 block discarded – undo
69 73 
 				$filter_query_where .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'";
70 74 
 			}
71 75 
 		}
72 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
73 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
76 
+		if ($filter_query_where == '' && $where) {
77 
+			$filter_query_where = ' WHERE';
78 
+		} elseif ($filter_query_where != '' && $and) {
79 
+			$filter_query_where .= ' AND';
80 
+		}
74 81 
 		if ($filter_query_where != '') {
75 82 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
76 83 
 		}
 
@@ -124,32 +131,54 @@  discard block
 
 block discarded – undo
124 131 
 				$temp_array['spotter_id'] = $row['spotter_archive_id'];
125 132 
 			} elseif (isset($row['spotter_archive_output_id'])) {
126 133 
 				$temp_array['spotter_id'] = $row['spotter_archive_output_id'];
127 
-			*/}
128 
-			elseif (isset($row['marineid'])) {
134 
+			*/} elseif (isset($row['marineid'])) {
129 135 
 				$temp_array['marine_id'] = $row['marineid'];
130 136 
 			} else {
131 137 
 				$temp_array['marine_id'] = '';
132 138 
 			}
133 
-			if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id'];
134 
-			if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi'];
135 
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
136 
-			if (isset($row['type_id'])) $temp_array['type_id'] = $row['type_id'];
137 
-			if (isset($row['ident'])) $temp_array['ident'] = $row['ident'];
138 
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
139 
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
140 
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
139 
+			if (isset($row['fammarine_id'])) {
140 
+				$temp_array['fammarine_id'] = $row['fammarine_id'];
141 
+			}
142 
+			if (isset($row['mmsi'])) {
143 
+				$temp_array['mmsi'] = $row['mmsi'];
144 
+			}
145 
+			if (isset($row['type'])) {
146 
+				$temp_array['type'] = $row['type'];
147 
+			}
148 
+			if (isset($row['type_id'])) {
149 
+				$temp_array['type_id'] = $row['type_id'];
150 
+			}
151 
+			if (isset($row['ident'])) {
152 
+				$temp_array['ident'] = $row['ident'];
153 
+			}
154 
+			if (isset($row['latitude'])) {
155 
+				$temp_array['latitude'] = $row['latitude'];
156 
+			}
157 
+			if (isset($row['longitude'])) {
158 
+				$temp_array['longitude'] = $row['longitude'];
159 
+			}
160 
+			if (isset($row['format_source'])) {
161 
+				$temp_array['format_source'] = $row['format_source'];
162 
+			}
141 163 
 			if (isset($row['heading'])) {
142 164 
 				$temp_array['heading'] = $row['heading'];
143 165 
 				$heading_direction = $this->parseDirection($row['heading']);
144 
-				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'];
145 172 
 			}
146 
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
147 173
148 174 
 			if($temp_array['mmsi'] != "")
149 175 
 			{
150 176 
 				$Image = new Image($this->db);
151 
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
152 
-				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
177 
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') {
178 
+					$image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
179 
+				} else {
180 
+					$image_array = $Image->getMarineImage($temp_array['mmsi']);
181 
+				}
153 182 
 				unset($Image);
154 183 
 				if (count($image_array) > 0) {
155 184 
 					$temp_array['image'] = $image_array[0]['image'];
 
@@ -201,13 +230,21 @@  discard block
 
 block discarded – undo
201 230 
 			}
202 231
203 232 
 			$fromsource = NULL;
204 
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
205 
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
206 
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
233 
+			if (isset($row['source_name']) && $row['source_name'] != '') {
234 
+				$temp_array['source_name'] = $row['source_name'];
235 
+			}
236 
+			if (isset($row['over_country']) && $row['over_country'] != '') {
237 
+				$temp_array['over_country'] = $row['over_country'];
238 
+			}
239 
+			if (isset($row['distance']) && $row['distance'] != '') {
240 
+				$temp_array['distance'] = $row['distance'];
241 
+			}
207 242 
 			$temp_array['query_number_rows'] = $num_rows;
208 243 
 			$spotter_array[] = $temp_array;
209 244 
 		}
210 
-		if ($num_rows == 0) return array();
245 
+		if ($num_rows == 0) {
246 
+			return array();
247 
+		}
211 248 
 		$spotter_array[0]['query_number_rows'] = $num_rows;
212 249 
 		return $spotter_array;
213 250 
 	}	
@@ -233,8 +270,12 @@  discard block
 
 block discarded – undo
233 270 
 			{
234 271 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
235 272 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
236 
-			} else $limit_query = "";
237 
-		} else $limit_query = "";
273 
+			} else {
274 
+				$limit_query = "";
275 
+			}
276 
+		} else {
277 
+			$limit_query = "";
278 
+		}
238 279 
 		if ($sort != "")
239 280 
 		{
240 281 
 			$search_orderby_array = $this->getOrderBy();
 
@@ -258,7 +299,9 @@  discard block
 
 block discarded – undo
258 299 
 		global $global_query;
259 300
260 301 
 		date_default_timezone_set('UTC');
261 
-		if ($id == '') return array();
302 
+		if ($id == '') {
303 
+			return array();
304 
+		}
262 305 
 		$additional_query = "marine_output.fammarine_id = :id";
263 306 
 		$query_values = array(':id' => $id);
264 307 
 		$query  = $global_query." WHERE ".$additional_query." ";
 
@@ -401,8 +444,11 @@  discard block
 
 block discarded – undo
401 444 
 		$query .= " ORDER BY marine_output.source_name ASC";
402 445
403 446 
 		$sth = $this->db->prepare($query);
404 
-		if (!empty($query_values)) $sth->execute($query_values);
405 
-		else $sth->execute();
447 
+		if (!empty($query_values)) {
448 
+			$sth->execute($query_values);
449 
+		} else {
450 
+			$sth->execute();
451 
+		}
406 452
407 453 
 		$source_array = array();
408 454 
 		$temp_array = array();
 
@@ -457,8 +503,11 @@  discard block
 
 block discarded – undo
457 503 
 		$sth = $this->db->prepare($query);
458 504 
 		$sth->execute(array(':mmsi' => $mmsi));
459 505 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
460 
-		if (isset($result[0])) return $result[0];
461 
-		else return array();
506 
+		if (isset($result[0])) {
507 
+			return $result[0];
508 
+		} else {
509 
+			return array();
510 
+		}
462 511 
 	}
463 512
464 513 
 	/*
 
@@ -474,7 +523,9 @@  discard block
 
 block discarded – undo
474 523 
 			date_default_timezone_set($globalTimezone);
475 524 
 			$datetime = new DateTime();
476 525 
 			$offset = $datetime->format('P');
477 
-		} else $offset = '+00:00';
526 
+		} else {
527 
+			$offset = '+00:00';
528 
+		}
478 529
479 530 
 		if ($globalDBdriver == 'mysql') {
480 531 
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
 
@@ -704,9 +755,15 @@  discard block
 
 block discarded – undo
704 755 
             		$latitude = 0;
705 756 
             		$longitude = 0;
706 757 
             	}
707 
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
708 
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
709 
-                if ($arrival_date == '') $arrival_date = NULL;
758 
+                if ($heading == '' || $Common->isInteger($heading) === false) {
759 
+                	$heading = 0;
760 
+                }
761 
+                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
762 
+                	$groundspeed = 0;
763 
+                }
764 
+                if ($arrival_date == '') {
765 
+                	$arrival_date = NULL;
766 
+                }
710 767 
 		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date)
711 768 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)";
712 769 
 
@@ -814,7 +871,9 @@  discard block
 
 block discarded – undo
814 871 
 		global $globalDBdriver, $globalArchive;
815 872 
 		//$filter_query = $this->getFilter($filters,true,true);
816 873 
 		$Connection= new Connection($this->db);
817 
-		if (!$Connection->tableExists('countries')) return array();
874 
+		if (!$Connection->tableExists('countries')) {
875 
+			return array();
876 
+		}
818 877 
 		require_once('class.SpotterLive.php');
819 878 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
820 879 
 			$MarineLive = new MarineLive();
 
@@ -858,7 +917,9 @@  discard block
 
 block discarded – undo
858 917 
 			$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 ";
859 918 
 		}
860 919 
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
861 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
920 
+		if ($limit) {
921 
+			$query .= " LIMIT 10 OFFSET 0";
922 
+		}
862 923
863 924 
 		$sth = $this->db->prepare($query);
864 925 
 		$sth->execute();
 
@@ -892,12 +953,18 @@  discard block
 
 block discarded – undo
892 953 
 		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count
893 954 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
894 955 
 		 if ($olderthanmonths > 0) {
895 
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
896 
-			else $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
956 
+			if ($globalDBdriver == 'mysql') {
957 
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
958 
+			} else {
959 
+				$query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
960 
+			}
897 961 
 		}
898 962 
 		if ($sincedate != '') {
899 
-			if ($globalDBdriver == 'mysql') $query .= " AND marine_output.date > '".$sincedate."'";
900 
-			else $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
963 
+			if ($globalDBdriver == 'mysql') {
964 
+				$query .= " AND marine_output.date > '".$sincedate."'";
965 
+			} else {
966 
+				$query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
967 
+			}
901 968 
 		}
902 969 
 		$query_values = array();
903 970 
 		if ($year != '') {
 
@@ -928,7 +995,9 @@  discard block
 
 block discarded – undo
928 995 
 			}
929 996 
 		}
930 997 
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
931 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
998 
+		if ($limit) {
999 
+			$query .= " LIMIT 10 OFFSET 0";
1000 
+		}
932 1001
933 1002 
 		$sth = $this->db->prepare($query);
934 1003 
 		$sth->execute($query_values);
 
@@ -963,7 +1032,9 @@  discard block
 
 block discarded – undo
963 1032 
 			date_default_timezone_set($globalTimezone);
964 1033 
 			$datetime = new DateTime();
965 1034 
 			$offset = $datetime->format('P');
966 
-		} else $offset = '+00:00';
1035 
+		} else {
1036 
+			$offset = '+00:00';
1037 
+		}
967 1038
968 1039 
 		if ($globalDBdriver == 'mysql') {
969 1040 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1013,7 +1084,9 @@  discard block
 
 block discarded – undo
1013 1084 
 			date_default_timezone_set($globalTimezone);
1014 1085 
 			$datetime = new DateTime();
1015 1086 
 			$offset = $datetime->format('P');
1016 
-		} else $offset = '+00:00';
1087 
+		} else {
1088 
+			$offset = '+00:00';
1089 
+		}
1017 1090 
 		$filter_query = $this->getFilter($filters,true,true);
1018 1091 
 		if ($globalDBdriver == 'mysql') {
1019 1092 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1059,7 +1132,9 @@  discard block
 
 block discarded – undo
1059 1132 
 			date_default_timezone_set($globalTimezone);
1060 1133 
 			$datetime = new DateTime();
1061 1134 
 			$offset = $datetime->format('P');
1062 
-		} else $offset = '+00:00';
1135 
+		} else {
1136 
+			$offset = '+00:00';
1137 
+		}
1063 1138 
 		$filter_query = $this->getFilter($filters,true,true);
1064 1139 
 		if ($globalDBdriver == 'mysql') {
1065 1140 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1107,7 +1182,9 @@  discard block
 
 block discarded – undo
1107 1182 
 			date_default_timezone_set($globalTimezone);
1108 1183 
 			$datetime = new DateTime();
1109 1184 
 			$offset = $datetime->format('P');
1110 
-		} else $offset = '+00:00';
1185 
+		} else {
1186 
+			$offset = '+00:00';
1187 
+		}
1111 1188
1112 1189 
 		if ($globalDBdriver == 'mysql') {
1113 1190 
 			$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
 
@@ -1156,7 +1233,9 @@  discard block
 
 block discarded – undo
1156 1233 
 			date_default_timezone_set($globalTimezone);
1157 1234 
 			$datetime = new DateTime();
1158 1235 
 			$offset = $datetime->format('P');
1159 
-		} else $offset = '+00:00';
1236 
+		} else {
1237 
+			$offset = '+00:00';
1238 
+		}
1160 1239 
 		$filter_query = $this->getFilter($filters,true,true);
1161 1240 
 		if ($globalDBdriver == 'mysql') {
1162 1241 
 			$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
 
@@ -1205,7 +1284,9 @@  discard block
 
 block discarded – undo
1205 1284 
 			date_default_timezone_set($globalTimezone);
1206 1285 
 			$datetime = new DateTime();
1207 1286 
 			$offset = $datetime->format('P');
1208 
-		} else $offset = '+00:00';
1287 
+		} else {
1288 
+			$offset = '+00:00';
1289 
+		}
1209 1290
1210 1291 
 		$orderby_sql = '';
1211 1292 
 		if ($orderby == "hour")
 
@@ -1274,7 +1355,9 @@  discard block
 
 block discarded – undo
1274 1355 
 			date_default_timezone_set($globalTimezone);
1275 1356 
 			$datetime = new DateTime($date);
1276 1357 
 			$offset = $datetime->format('P');
1277 
-		} else $offset = '+00:00';
1358 
+		} else {
1359 
+			$offset = '+00:00';
1360 
+		}
1278 1361
1279 1362 
 		if ($globalDBdriver == 'mysql') {
1280 1363 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1322,7 +1405,9 @@  discard block
 
 block discarded – undo
1322 1405 
 			date_default_timezone_set($globalTimezone);
1323 1406 
 			$datetime = new DateTime();
1324 1407 
 			$offset = $datetime->format('P');
1325 
-		} else $offset = '+00:00';
1408 
+		} else {
1409 
+			$offset = '+00:00';
1410 
+		}
1326 1411
1327 1412 
 		if ($globalDBdriver == 'mysql') {
1328 1413 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1387,8 +1472,11 @@  discard block
 
 block discarded – undo
1387 1472 
 				$query_values = array_merge($query_values,array(':month' => $month));
1388 1473 
 			}
1389 1474 
 		}
1390 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1391 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1475 
+		if (empty($query_values)) {
1476 
+			$queryi .= $this->getFilter($filters);
1477 
+		} else {
1478 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1479 
+		}
1392 1480
1393 1481 
 		$sth = $this->db->prepare($queryi);
1394 1482 
 		$sth->execute($query_values);
 
@@ -1425,8 +1513,11 @@  discard block
 
 block discarded – undo
1425 1513 
 				$query_values = array_merge($query_values,array(':month' => $month));
1426 1514 
 			}
1427 1515 
 		}
1428 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1429 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1516 
+		if (empty($query_values)) {
1517 
+			$queryi .= $this->getFilter($filters);
1518 
+		} else {
1519 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1520 
+		}
1430 1521
1431 1522 
 		$sth = $this->db->prepare($queryi);
1432 1523 
 		$sth->execute($query_values);
 
@@ -1448,7 +1539,9 @@  discard block
 
 block discarded – undo
1448 1539 
 			date_default_timezone_set($globalTimezone);
1449 1540 
 			$datetime = new DateTime();
1450 1541 
 			$offset = $datetime->format('P');
1451 
-		} else $offset = '+00:00';
1542 
+		} else {
1543 
+			$offset = '+00:00';
1544 
+		}
1452 1545
1453 1546 
 		if ($globalDBdriver == 'mysql') {
1454 1547 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1552,7 +1645,9 @@  discard block
 
 block discarded – undo
1552 1645 
 	*/
1553 1646 
 	public function parseDirection($direction = 0)
1554 1647 
 	{
1555 
-		if ($direction == '') $direction = 0;
1648 
+		if ($direction == '') {
1649 
+			$direction = 0;
1650 
+		}
1556 1651 
 		$direction_array = array();
1557 1652 
 		$temp_array = array();
1558 1653 
 
@@ -1641,7 +1736,9 @@  discard block
 
 block discarded – undo
1641 1736 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1642 1737
1643 1738 
 		$Connection = new Connection($this->db);
1644 
-		if (!$Connection->tableExists('countries')) return '';
1739 
+		if (!$Connection->tableExists('countries')) {
1740 
+			return '';
1741 
+		}
1645 1742
1646 1743 
 		try {
1647 1744 
 			/*
 
@@ -1661,9 +1758,13 @@  discard block
 
 block discarded – undo
1661 1758 
 			$sth->closeCursor();
1662 1759 
 			if (count($row) > 0) {
1663 1760 
 				return $row;
1664 
-			} else return '';
1761 
+			} else {
1762 
+				return '';
1763 
+			}
1665 1764 
 		} catch (PDOException $e) {
1666 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1765 
+			if (isset($globalDebug) && $globalDebug) {
1766 
+				echo 'Error : '.$e->getMessage()."\n";
1767 
+			}
1667 1768 
 			return '';
1668 1769 
 		}
1669 1770 
 	
@@ -1681,7 +1782,9 @@  discard block
 
 block discarded – undo
1681 1782 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1682 1783
1683 1784 
 		$Connection = new Connection($this->db);
1684 
-		if (!$Connection->tableExists('countries')) return '';
1785 
+		if (!$Connection->tableExists('countries')) {
1786 
+			return '';
1787 
+		}
1685 1788
1686 1789 
 		try {
1687 1790 
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
 
@@ -1693,9 +1796,13 @@  discard block
 
 block discarded – undo
1693 1796 
 			$sth->closeCursor();
1694 1797 
 			if (count($row) > 0) {
1695 1798 
 				return $row;
1696 
-			} else return '';
1799 
+			} else {
1800 
+				return '';
1801 
+			}
1697 1802 
 		} catch (PDOException $e) {
1698 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1803 
+			if (isset($globalDebug) && $globalDebug) {
1804 
+				echo 'Error : '.$e->getMessage()."\n";
1805 
+			}
1699 1806 
 			return '';
1700 1807 
 		}
1701 1808 
 	
@@ -1713,7 +1820,9 @@  discard block
 
 block discarded – undo
1713 1820 
 	{
1714 1821 
 		global $globalBitlyAccessToken;
1715 1822
1716 
-		if ($globalBitlyAccessToken == '') return $url;
1823 
+		if ($globalBitlyAccessToken == '') {
1824 
+			return $url;
1825 
+		}
1717 1826
1718 1827 
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
1719 1828 
 		
@@ -1789,7 +1898,9 @@  discard block
 
 block discarded – undo
1789 1898 
 			}
1790 1899 
 		}
1791 1900 
 		$query .= " GROUP BY marine_output.type ORDER BY marine_type_count DESC";
1792 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
1901 
+		if ($limit) {
1902 
+			$query .= " LIMIT 10 OFFSET 0";
1903 
+		}
1793 1904 
 		$sth = $this->db->prepare($query);
1794 1905 
 		$sth->execute($query_values);
1795 1906 
 		$marine_array = array();
Please login to merge, or discard this patch.