View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 3bb709...adf80b )
by Yannick
05:18
created
Status
Category
Toggle Patches
require/class.Spotter.php 1 patch
Spacing   +1005 added lines, -1005 removed lines patch added patch discarded remove patch 
@@ -4,7 +4,7 @@  discard block
 
 block discarded – undo
4 4 
 require_once(dirname(__FILE__).'/class.Image.php');
5 5 
 $global_query = "SELECT spotter_output.* FROM spotter_output";
6 6
7 
-class Spotter{
7 
+class Spotter {
8 8 
 	public $db;
9 9
10 10 
 	public function __construct($dbc = null) {
 
@@ -17,64 +17,64 @@  discard block
 
 block discarded – undo
17 17 
 	* @param Array $filter the filter
18 18 
 	* @return Array the SQL part
19 19 
 	*/
20 
-	public function getFilter($filter = array(),$where = false,$and = false) {
20 
+	public function getFilter($filter = array(), $where = false, $and = false) {
21 21 
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
22 22 
 		$filters = array();
23 23 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
24 24 
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
25 25 
 				$filters = $globalStatsFilters[$globalFilterName];
26 26 
 			} else {
27 
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
27 
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
28 28 
 			}
29 29 
 		}
30 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
30 
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
31 31 
 		$filter_query_join = '';
32 32 
 		$filter_query_where = '';
33 
-		foreach($filters as $flt) {
33 
+		foreach ($filters as $flt) {
34 34 
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
35 35 
 				if ($flt['airlines'][0] != '') {
36 36 
 					if (isset($flt['source'])) {
37 
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
37 
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
38 38 
 					} else {
39 
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
39 
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
40 40 
 					}
41 41 
 				}
42 42 
 			}
43 43 
 			if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
44 44 
 				if (isset($flt['source'])) {
45 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
45 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
46 46 
 				} else {
47 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
47 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
48 48 
 				}
49 49 
 			}
50 50 
 			if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) {
51 51 
 				if (isset($flt['source'])) {
52 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
52 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
53 53 
 				}
54 54 
 			}
55 55 
 		}
56 56 
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
57 57 
 			if ($filter['airlines'][0] != '') {
58 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
58 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
59 59 
 			}
60 60 
 		}
61 61 
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
62 62 
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_output.flightaware_id ";
63 63 
 		}
64 64 
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
65 
-				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
65 
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
66 66 
 			}
67 67 
 		if (isset($filter['source']) && !empty($filter['source'])) {
68 
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
68 
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
69 69 
 		}
70 70 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
71 71 
 			$filter_query_where = " WHERE ident = '".$filter['ident']."'";
72 72 
 		}
73 73 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74 74 
 			if ($filter_query_where == '') {
75 
-				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
75 
+				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
76 76 
 			} else {
77 
-				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
77 
+				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
78 78 
 			}
79 79 
 		}
80 80 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
 	* @return Array the spotter information
93 93 
 	*
94 94 
 	*/
95 
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
95 
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
96 96 
 	{
97 97 
 		global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM;
98 98 
 		$Image = new Image($this->db);
 
@@ -122,7 +122,7 @@  discard block
 
 block discarded – undo
122 122 
 			$sth = $this->db->prepare($query.$limitQuery);
123 123 
 			$sth->execute($params);
124 124 
 		} catch (PDOException $e) {
125 
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
125 
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
126 126 
 			exit();
127 127 
 		}
128 128 
 		
@@ -132,7 +132,7 @@  discard block
 
 block discarded – undo
132 132 
 		$spotter_array = array();
133 133
134 134
135 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
135 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
136 136 
 		{
137 137 
 			$num_rows++;
138 138 
 			$temp_array = array();
 
@@ -177,7 +177,7 @@  discard block
 
 block discarded – undo
177 177 
 			if (isset($row['route_stop'])) {
178 178 
 				$temp_array['route_stop'] = $row['route_stop'];
179 179 
 				if ($row['route_stop'] != '') {
180 
-					$allroute = explode(' ',$row['route_stop']);
180 
+					$allroute = explode(' ', $row['route_stop']);
181 181
182 182 
 					foreach ($allroute as $route) {
183 183 
 						$route_airport_array = $this->getAllAirportInfo($route);
 
@@ -232,11 +232,11 @@  discard block
 
 block discarded – undo
232 232 
 				{
233 233 
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
234 234 
 				} else {
235 
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
235 
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
236 236 
 				}
237 237 
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
238 
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
239 
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
238 
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
239 
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
240 240 
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
241 241 
 			}
242 242 
 			
@@ -270,9 +270,9 @@  discard block
 
 block discarded – undo
270 270 
 			if (!isset($row['airline_name']) || $row['airline_name'] == '') {
271 271 
 				if (!is_numeric(substr($row['ident'], 0, 3))) {
272 272 
 					if (is_numeric(substr($row['ident'], 2, 1))) {
273 
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2),$fromsource);
273 
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2), $fromsource);
274 274 
 					} elseif (is_numeric(substr($row['ident'], 3, 1))) {
275 
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
275 
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
276 276 
 					} else {
277 277 
 						$airline_array = $this->getAllAirlineInfo('NA');
278 278 
 					}
 
@@ -309,7 +309,7 @@  discard block
 
 block discarded – undo
309 309 
 				}
310 310 
 			}
311 311 
 			if (isset($temp_array['airline_iata']) && $temp_array['airline_iata'] != '') {
312 
-				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'],3));
312 
+				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'], 3));
313 313 
 				//$acars_array = ACARS->getLiveAcarsData('BA40YL');
314 314 
 				if (count($acars_array) > 0) {
315 315 
 					$temp_array['acars'] = $acars_array;
 
@@ -326,11 +326,11 @@  discard block
 
 block discarded – undo
326 326 
 				$temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg'];
327 327 
 			}
328 328
329 
-			if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
329 
+			if ($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
330 330 
 			{
331 331 
 				if ($globalIVAO) {
332 
-					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
333 
-					else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
332 
+					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('', $temp_array['aircraft_type'], $temp_array['airline_icao']);
333 
+					else $image_array = $Image->getSpotterImage('', $temp_array['aircraft_type']);
334 334 
 				} else $image_array = $Image->getSpotterImage($temp_array['registration']);
335 335 
 				if (count($image_array) > 0) {
336 336 
 					$temp_array['image'] = $image_array[0]['image'];
 
@@ -353,7 +353,7 @@  discard block
 
 block discarded – undo
353 353 
 			if (isset($row['arrival_airport_time']) && $row['arrival_airport_time'] != '') {
354 354 
 				$temp_array['arrival_airport_time'] = $row['arrival_airport_time'];
355 355 
 			}
356 
-			if ((!isset($globalIVAO) || ! $globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
356 
+			if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
357 357 
 				if ($schedules === true) {
358 358 
 					$schedule_array = $Schedule->getSchedule($temp_array['ident']);
359 359 
 					//print_r($schedule_array);
 
@@ -435,12 +435,12 @@  discard block
 
 block discarded – undo
435 435 
 			if (isset($row['squawk'])) {
436 436 
 				$temp_array['squawk'] = $row['squawk'];
437 437 
 				if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) {
438 
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']);
439 
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
438 
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['country_iso2']);
439 
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
440 440 
 				} elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) {
441 
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']);
442 
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
443 
-				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
441 
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['over_country']);
442 
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
443 
+				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
444 444 
 			}
445 445
446 446 
 			$temp_array['query_number_rows'] = $num_rows;
 
@@ -459,7 +459,7 @@  discard block
 
 block discarded – undo
459 459 
 	* @return Array the spotter information
460 460 
 	*
461 461 
 	*/
462 
-	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
462 
+	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
463 463 
 	{
464 464 
 		global $globalTimezone, $globalDBdriver;
465 465 
 		require_once(dirname(__FILE__).'/class.Translation.php');
 
@@ -469,7 +469,7 @@  discard block
 
 block discarded – undo
469 469
470 470 
 		$query_values = array();
471 471 
 		$additional_query = '';
472 
-		$filter_query = $this->getFilter($filters,true,true);
472 
+		$filter_query = $this->getFilter($filters, true, true);
473 473 
 		if ($q != "")
474 474 
 		{
475 475 
 			if (!is_string($q))
 
@@ -477,8 +477,8 @@  discard block
 
 block discarded – undo
477 477 
 				return false;
478 478 
 			} else {
479 479 
 				$q_array = explode(" ", $q);
480 
-				foreach ($q_array as $q_item){
481 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
480 
+				foreach ($q_array as $q_item) {
481 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
482 482 
 					$additional_query .= " AND (";
483 483 
 					if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
484 484 
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
 
@@ -510,37 +510,37 @@  discard block
 
 block discarded – undo
510 510
511 511 
 		if ($registration != "")
512 512 
 		{
513 
-			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
513 
+			$registration = filter_var($registration, FILTER_SANITIZE_STRING);
514 514 
 			if (!is_string($registration))
515 515 
 			{
516 516 
 				return false;
517 517 
 			} else {
518 518 
 				$additional_query .= " AND spotter_output.registration = :registration";
519 
-				$query_values = array_merge($query_values,array(':registration' => $registration));
519 
+				$query_values = array_merge($query_values, array(':registration' => $registration));
520 520 
 			}
521 521 
 		}
522 522
523 523 
 		if ($aircraft_icao != "")
524 524 
 		{
525 
-			$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
525 
+			$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
526 526 
 			if (!is_string($aircraft_icao))
527 527 
 			{
528 528 
 				return false;
529 529 
 			} else {
530 530 
 				$additional_query .= " AND spotter_output.aircraft_icao = :aircraft_icao";
531 
-				$query_values = array_merge($query_values,array(':aircraft_icao' => $aircraft_icao));
531 
+				$query_values = array_merge($query_values, array(':aircraft_icao' => $aircraft_icao));
532 532 
 			}
533 533 
 		}
534 534
535 535 
 		if ($aircraft_manufacturer != "")
536 536 
 		{
537 
-			$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
537 
+			$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
538 538 
 			if (!is_string($aircraft_manufacturer))
539 539 
 			{
540 540 
 				return false;
541 541 
 			} else {
542 542 
 				$additional_query .= " AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer";
543 
-				$query_values = array_merge($query_values,array(':aircraft_manufacturer' => $aircraft_manufacturer));
543 
+				$query_values = array_merge($query_values, array(':aircraft_manufacturer' => $aircraft_manufacturer));
544 544 
 			}
545 545 
 		}
546 546 
 
@@ -556,25 +556,25 @@  discard block
 
 block discarded – undo
556 556
557 557 
 		if ($airline_icao != "")
558 558 
 		{
559 
-			$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
559 
+			$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
560 560 
 			if (!is_string($airline_icao))
561 561 
 			{
562 562 
 				return false;
563 563 
 			} else {
564 564 
 				$additional_query .= " AND spotter_output.airline_icao = :airline_icao";
565 
-				$query_values = array_merge($query_values,array(':airline_icao' => $airline_icao));
565 
+				$query_values = array_merge($query_values, array(':airline_icao' => $airline_icao));
566 566 
 			}
567 567 
 		}
568 568
569 569 
 		if ($airline_country != "")
570 570 
 		{
571 
-			$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
571 
+			$airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
572 572 
 			if (!is_string($airline_country))
573 573 
 			{
574 574 
 				return false;
575 575 
 			} else {
576 576 
 				$additional_query .= " AND spotter_output.airline_country = :airline_country";
577 
-				$query_values = array_merge($query_values,array(':airline_country' => $airline_country));
577 
+				$query_values = array_merge($query_values, array(':airline_country' => $airline_country));
578 578 
 			}
579 579 
 		}
580 580 
 
@@ -601,31 +601,31 @@  discard block
 
 block discarded – undo
601 601
602 602 
 		if ($airport != "")
603 603 
 		{
604 
-			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
604 
+			$airport = filter_var($airport, FILTER_SANITIZE_STRING);
605 605 
 			if (!is_string($airport))
606 606 
 			{
607 607 
 				return false;
608 608 
 			} else {
609 609 
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :airport OR spotter_output.arrival_airport_icao = :airport)";
610 
-				$query_values = array_merge($query_values,array(':airport' => $airport));
610 
+				$query_values = array_merge($query_values, array(':airport' => $airport));
611 611 
 			}
612 612 
 		}
613 613
614 614 
 		if ($airport_country != "")
615 615 
 		{
616 
-			$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
616 
+			$airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
617 617 
 			if (!is_string($airport_country))
618 618 
 			{
619 619 
 				return false;
620 620 
 			} else {
621 621 
 				$additional_query .= " AND (spotter_output.departure_airport_country = :airport_country OR spotter_output.arrival_airport_country = :airport_country)";
622 
-				$query_values = array_merge($query_values,array(':airport_country' => $airport_country));
622 
+				$query_values = array_merge($query_values, array(':airport_country' => $airport_country));
623 623 
 			}
624 624 
 		}
625 625
626 626 
 		if ($callsign != "")
627 627 
 		{
628 
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
628 
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
629 629 
 			if (!is_string($callsign))
630 630 
 			{
631 631 
 				return false;
 
@@ -633,79 +633,79 @@  discard block
 
 block discarded – undo
633 633 
 				$translate = $Translation->ident2icao($callsign);
634 634 
 				if ($translate != $callsign) {
635 635 
 					$additional_query .= " AND (spotter_output.ident = :callsign OR spotter_output.ident = :translate)";
636 
-					$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
636 
+					$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
637 637 
 				} else {
638 638 
 					$additional_query .= " AND spotter_output.ident = :callsign";
639 
-					$query_values = array_merge($query_values,array(':callsign' => $callsign));
639 
+					$query_values = array_merge($query_values, array(':callsign' => $callsign));
640 640 
 				}
641 641 
 			}
642 642 
 		}
643 643
644 644 
 		if ($owner != "")
645 645 
 		{
646 
-			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
646 
+			$owner = filter_var($owner, FILTER_SANITIZE_STRING);
647 647 
 			if (!is_string($owner))
648 648 
 			{
649 649 
 				return false;
650 650 
 			} else {
651 651 
 				$additional_query .= " AND spotter_output.owner_name = :owner";
652 
-				$query_values = array_merge($query_values,array(':owner' => $owner));
652 
+				$query_values = array_merge($query_values, array(':owner' => $owner));
653 653 
 			}
654 654 
 		}
655 655
656 656 
 		if ($pilot_name != "")
657 657 
 		{
658 
-			$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
658 
+			$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
659 659 
 			if (!is_string($pilot_name))
660 660 
 			{
661 661 
 				return false;
662 662 
 			} else {
663 663 
 				$additional_query .= " AND spotter_output.pilot_name = :pilot_name";
664 
-				$query_values = array_merge($query_values,array(':pilot_name' => $pilot_name));
664 
+				$query_values = array_merge($query_values, array(':pilot_name' => $pilot_name));
665 665 
 			}
666 666 
 		}
667 667
668 668 
 		if ($pilot_id != "")
669 669 
 		{
670 
-			$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
670 
+			$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
671 671 
 			if (!is_string($pilot_id))
672 672 
 			{
673 673 
 				return false;
674 674 
 			} else {
675 675 
 				$additional_query .= " AND spotter_output.pilot_id = :pilot_id";
676 
-				$query_values = array_merge($query_values,array(':pilot_id' => $pilot_id));
676 
+				$query_values = array_merge($query_values, array(':pilot_id' => $pilot_id));
677 677 
 			}
678 678 
 		}
679 679
680 680 
 		if ($departure_airport_route != "")
681 681 
 		{
682 
-			$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
682 
+			$departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
683 683 
 			if (!is_string($departure_airport_route))
684 684 
 			{
685 685 
 				return false;
686 686 
 			} else {
687 687 
 				$additional_query .= " AND spotter_output.departure_airport_icao = :departure_airport_route";
688 
-				$query_values = array_merge($query_values,array(':departure_airport_route' => $departure_airport_route));
688 
+				$query_values = array_merge($query_values, array(':departure_airport_route' => $departure_airport_route));
689 689 
 			}
690 690 
 		}
691 691
692 692 
 		if ($arrival_airport_route != "")
693 693 
 		{
694 
-			$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
694 
+			$arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
695 695 
 			if (!is_string($arrival_airport_route))
696 696 
 			{
697 697 
 				return false;
698 698 
 			} else {
699 699 
 				$additional_query .= " AND spotter_output.arrival_airport_icao = :arrival_airport_route";
700 
-				$query_values = array_merge($query_values,array(':arrival_airport_route' => $arrival_airport_route));
700 
+				$query_values = array_merge($query_values, array(':arrival_airport_route' => $arrival_airport_route));
701 701 
 			}
702 702 
 		}
703 703
704 704 
 		if ($altitude != "")
705 705 
 		{
706 706 
 			$altitude_array = explode(",", $altitude);
707 
-			$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
708 
-			$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
707 
+			$altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
708 
+			$altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
709 709
710 710 
 			if ($altitude_array[1] != "")
711 711 
 			{                
@@ -721,8 +721,8 @@  discard block
 
 block discarded – undo
721 721 
 		if ($date_posted != "")
722 722 
 		{
723 723 
 			$date_array = explode(",", $date_posted);
724 
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
725 
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
724 
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
725 
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
726 726
727 727 
 			if ($globalTimezone != '') {
728 728 
 				date_default_timezone_set($globalTimezone);
 
@@ -753,8 +753,8 @@  discard block
 
 block discarded – undo
753 753 
 		{
754 754 
 			$limit_array = explode(",", $limit);
755 755
756 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
757 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
756 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
757 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
758 758
759 759 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
760 760 
 			{
 
@@ -783,23 +783,23 @@  discard block
 
 block discarded – undo
783 783
784 784
785 785 
 		if ($origLat != "" && $origLon != "" && $dist != "") {
786 
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
786 
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
787 787
788 788 
 			if ($globalDBdriver == 'mysql') {
789 
-				$query="SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance
789 
+				$query = "SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance
790 790 
 						FROM spotter_archive,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND spotter_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and spotter_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
791 791 
 						AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
792 792 
 			} else {
793 
-				$query="SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance
793 
+				$query = "SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance
794 794 
 						FROM spotter_archive,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
795 795 
 						AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query;
796 796 
 			}
797 797 
 		} else {
798 
-			$query  = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> ''
798 
+			$query = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> ''
799 799 
 					".$additional_query."
800 800 
 					".$orderby_query;
801 801 
 		}
802 
-		$spotter_array = $this->getDataFromDB($query, $query_values,$limit_query);
802 
+		$spotter_array = $this->getDataFromDB($query, $query_values, $limit_query);
803 803 
 		return $spotter_array;
804 804 
 	}
805 805 
 	
@@ -822,8 +822,8 @@  discard block
 
 block discarded – undo
822 822 
 		{
823 823 
 			$limit_array = explode(",", $limit);
824 824
825 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
826 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
825 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
826 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
827 827
828 828 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
829 829 
 			{
 
@@ -840,9 +840,9 @@  discard block
 
 block discarded – undo
840 840 
 			$orderby_query = " ORDER BY spotter_output.date DESC";
841 841 
 		}
842 842
843 
-		$query  = $global_query.$filter_query." ".$orderby_query;
843 
+		$query = $global_query.$filter_query." ".$orderby_query;
844 844
845 
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query,true);
845 
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query, true);
846 846
847 847 
 		return $spotter_array;
848 848 
 	}
 
@@ -888,34 +888,34 @@  discard block
 
 block discarded – undo
888 888 
 			{
889 889 
 				return false;
890 890 
 			} else {
891 
-				if ($interval == "30m"){
891 
+				if ($interval == "30m") {
892 892 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) <= $this_output.date ';
893 
-				} else if ($interval == "1h"){
893 
+				} else if ($interval == "1h") {
894 894 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) <= $this_output.date ';
895 
-				} else if ($interval == "3h"){
895 
+				} else if ($interval == "3h") {
896 896 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 3 HOUR) <= $this_output.date ';
897 
-				} else if ($interval == "6h"){
897 
+				} else if ($interval == "6h") {
898 898 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 6 HOUR) <= $this_output.date ';
899 
-				} else if ($interval == "12h"){
899 
+				} else if ($interval == "12h") {
900 900 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 HOUR) <= $this_output.date ';
901 
-				} else if ($interval == "24h"){
901 
+				} else if ($interval == "24h") {
902 902 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 24 HOUR) <= $this_output.date ';
903 
-				} else if ($interval == "7d"){
903 
+				} else if ($interval == "7d") {
904 904 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) <= $this_output.date ';
905 
-				} else if ($interval == "30d"){
905 
+				} else if ($interval == "30d") {
906 906 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 DAY) <= $this_output.date ';
907 907 
 				}
908 908 
 			}
909 909 
 		}
910 910
911 
-		$query  = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output
911 
+		$query = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output
912 912 
                    WHERE spotter_output.latitude <> ''
913 913 
 				   AND spotter_output.longitude <> ''
914 914 
                    ".$additional_query."
915 915 
                    HAVING distance < :radius
916 916 
 				   ORDER BY distance";
917 917
918 
-		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius),$limit_query);
918 
+		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius), $limit_query);
919 919
920 920 
 		return $spotter_array;
921 921 
 	}
 
@@ -927,21 +927,21 @@  discard block
 
 block discarded – undo
927 927 
 	* @return Array the spotter information
928 928 
 	*
929 929 
 	*/
930 
-	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
930 
+	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '', $filter = array())
931 931 
 	{
932 932 
 		global $global_query;
933 933
934 934 
 		date_default_timezone_set('UTC');
935 935
936 
-		$filter_query = $this->getFilter($filter,true,true);
936 
+		$filter_query = $this->getFilter($filter, true, true);
937 937
938 938 
 		$limit_query = '';
939 939 
 		if ($limit != "")
940 940 
 		{
941 941 
 			$limit_array = explode(",", $limit);
942 942
943 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
944 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
943 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
944 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
945 945
946 946 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
947 947 
 			{
 
@@ -958,7 +958,7 @@  discard block
 
 block discarded – undo
958 958 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
959 959 
 		}
960 960
961 
-		$query  = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
961 
+		$query = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
962 962
963 963 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
964 964 
 
@@ -977,15 +977,15 @@  discard block
 
 block discarded – undo
977 977 
 		global $global_query;
978 978
979 979 
 		date_default_timezone_set('UTC');
980 
-		$filter_query = $this->getFilter($filter,true,true);
980 
+		$filter_query = $this->getFilter($filter, true, true);
981 981
982 982 
 		$limit_query = '';
983 983 
 		if ($limit != "")
984 984 
 		{
985 985 
 			$limit_array = explode(",", $limit);
986 986
987 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
988 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
987 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
988 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
989 989
990 990 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
991 991 
 			{
 
@@ -1002,7 +1002,7 @@  discard block
 
 block discarded – undo
1002 1002 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1003 1003 
 		}
1004 1004
1005 
-		$query  = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1005 
+		$query = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1006 1006
1007 1007 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1008 1008 
 
@@ -1016,20 +1016,20 @@  discard block
 
 block discarded – undo
1016 1016 
 	* @return Array the spotter information
1017 1017 
 	*
1018 1018 
 	*/
1019 
-	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
1019 
+	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '', $filter = array())
1020 1020 
 	{
1021 1021 
 		global $global_query;
1022 1022
1023 1023 
 		date_default_timezone_set('UTC');
1024 
-		$filter_query = $this->getFilter($filter,true,true);
1024 
+		$filter_query = $this->getFilter($filter, true, true);
1025 1025
1026 1026 
 		$limit_query = '';
1027 1027 
 		if ($limit != "")
1028 1028 
 		{
1029 1029 
 			$limit_array = explode(",", $limit);
1030 1030
1031 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1032 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1031 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1032 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1033 1033
1034 1034 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1035 1035 
 			{
 
@@ -1046,7 +1046,7 @@  discard block
 
 block discarded – undo
1046 1046 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1047 1047 
 		}
1048 1048
1049 
-		$query  = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1049 
+		$query = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1050 1050
1051 1051 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1052 1052 
 
@@ -1066,7 +1066,7 @@  discard block
 
 block discarded – undo
1066 1066
1067 1067 
 		date_default_timezone_set('UTC');
1068 1068
1069 
-		$filter_query = $this->getFilter($filter,true,true);
1069 
+		$filter_query = $this->getFilter($filter, true, true);
1070 1070
1071 1071 
 		$limit_query = '';
1072 1072 
 		
@@ -1074,8 +1074,8 @@  discard block
 
 block discarded – undo
1074 1074 
 		{
1075 1075 
 			$limit_array = explode(",", $limit);
1076 1076
1077 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1078 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1077 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1078 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1079 1079
1080 1080 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1081 1081 
 			{
 
@@ -1092,7 +1092,7 @@  discard block
 
 block discarded – undo
1092 1092 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1093 1093 
 		}
1094 1094
1095 
-		$query  = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1095 
+		$query = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1096 1096
1097 1097 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1098 1098 
 
@@ -1111,14 +1111,14 @@  discard block
 
 block discarded – undo
1111 1111 
 		global $global_query;
1112 1112
1113 1113 
 		date_default_timezone_set('UTC');
1114 
-		$filter_query = $this->getFilter($filter,true,true);
1114 
+		$filter_query = $this->getFilter($filter, true, true);
1115 1115 
 		$limit_query = '';
1116 1116 
 		if ($limit != "")
1117 1117 
 		{
1118 1118 
 			$limit_array = explode(",", $limit);
1119 1119
1120 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1121 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1120 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1121 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1122 1122
1123 1123 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1124 1124 
 			{
 
@@ -1135,7 +1135,7 @@  discard block
 
 block discarded – undo
1135 1135 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1136 1136 
 		}
1137 1137
1138 
-		$query  = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1138 
+		$query = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1139 1139
1140 1140 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1141 1141 
 
@@ -1159,9 +1159,9 @@  discard block
 
 block discarded – undo
1159 1159 
 		$query_values = array(':id' => $id);
1160 1160
1161 1161 
 		//$query  = $global_query." WHERE spotter_output.ident <> '' ".$additional_query." ";
1162 
-		$query  = $global_query." WHERE ".$additional_query." ";
1162 
+		$query = $global_query." WHERE ".$additional_query." ";
1163 1163
1164 
-		$spotter_array = $this->getDataFromDB($query,$query_values);
1164 
+		$spotter_array = $this->getDataFromDB($query, $query_values);
1165 1165
1166 1166 
 		return $spotter_array;
1167 1167 
 	}
 
@@ -1199,8 +1199,8 @@  discard block
 
 block discarded – undo
1199 1199 
 		{
1200 1200 
 			$limit_array = explode(",", $limit);
1201 1201
1202 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1203 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1202 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1203 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1204 1204
1205 1205 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1206 1206 
 			{
 
@@ -1241,7 +1241,7 @@  discard block
 
 block discarded – undo
1241 1241 
 		$query_values = array();
1242 1242 
 		$limit_query = '';
1243 1243 
 		$additional_query = '';
1244 
-		$filter_query = $this->getFilter($filter,true,true);
1244 
+		$filter_query = $this->getFilter($filter, true, true);
1245 1245
1246 1246 
 		if ($aircraft_type != "")
1247 1247 
 		{
 
@@ -1258,8 +1258,8 @@  discard block
 
 block discarded – undo
1258 1258 
 		{
1259 1259 
 			$limit_array = explode(",", $limit);
1260 1260
1261 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1262 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1261 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1262 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1263 1263
1264 1264 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1265 1265 
 			{
 
@@ -1315,8 +1315,8 @@  discard block
 
 block discarded – undo
1315 1315 
 		{
1316 1316 
 			$limit_array = explode(",", $limit);
1317 1317
1318 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1319 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1318 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1319 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1320 1320
1321 1321 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1322 1322 
 			{
 
@@ -1332,7 +1332,7 @@  discard block
 
 block discarded – undo
1332 1332 
 		} else {
1333 1333 
 			$orderby_query = " ORDER BY spotter_output.date DESC";
1334 1334 
 		}
1335 
-		$filter_query = $this->getFilter($filter,true,true);
1335 
+		$filter_query = $this->getFilter($filter, true, true);
1336 1336
1337 1337 
 		//$query = $global_query.$filter_query." spotter_output.ident <> '' ".$additional_query." ".$orderby_query;
1338 1338 
 		$query = $global_query.$filter_query." ".$additional_query." ".$orderby_query;
 
@@ -1351,7 +1351,7 @@  discard block
 
 block discarded – undo
1351 1351 
 	* @return Array the spotter information
1352 1352 
 	*
1353 1353 
 	*/
1354 
-	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
1354 
+	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '', $filters = array())
1355 1355 
 	{
1356 1356 
 		global $global_query;
1357 1357 
 		
@@ -1360,7 +1360,7 @@  discard block
 
 block discarded – undo
1360 1360 
 		$query_values = array();
1361 1361 
 		$limit_query = '';
1362 1362 
 		$additional_query = '';
1363 
-		$filter_query = $this->getFilter($filters,true,true);
1363 
+		$filter_query = $this->getFilter($filters, true, true);
1364 1364
1365 1365 
 		if ($airline != "")
1366 1366 
 		{
 
@@ -1377,8 +1377,8 @@  discard block
 
 block discarded – undo
1377 1377 
 		{
1378 1378 
 			$limit_array = explode(",", $limit);
1379 1379
1380 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1381 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1380 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1381 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1382 1382
1383 1383 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1384 1384 
 			{
 
@@ -1408,7 +1408,7 @@  discard block
 
 block discarded – undo
1408 1408 
 	* @return Array the spotter information
1409 1409 
 	*
1410 1410 
 	*/
1411 
-	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1411 
+	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
1412 1412 
 	{
1413 1413 
 		global $global_query;
1414 1414 
 		
@@ -1416,7 +1416,7 @@  discard block
 
 block discarded – undo
1416 1416 
 		$query_values = array();
1417 1417 
 		$limit_query = '';
1418 1418 
 		$additional_query = '';
1419 
-		$filter_query = $this->getFilter($filters,true,true);
1419 
+		$filter_query = $this->getFilter($filters, true, true);
1420 1420
1421 1421 
 		if ($airport != "")
1422 1422 
 		{
 
@@ -1433,8 +1433,8 @@  discard block
 
 block discarded – undo
1433 1433 
 		{
1434 1434 
 			$limit_array = explode(",", $limit);
1435 1435
1436 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1437 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1436 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1437 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1438 1438
1439 1439 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1440 1440 
 			{
 
@@ -1466,7 +1466,7 @@  discard block
 
 block discarded – undo
1466 1466 
 	* @return Array the spotter information
1467 1467 
 	*
1468 1468 
 	*/
1469 
-	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
1469 
+	public function getSpotterDataByDate($date = '', $limit = '', $sort = '', $filter = array())
1470 1470 
 	{
1471 1471 
 		global $global_query, $globalTimezone, $globalDBdriver;
1472 1472 
 		
@@ -1474,7 +1474,7 @@  discard block
 
 block discarded – undo
1474 1474 
 		$limit_query = '';
1475 1475 
 		$additional_query = '';
1476 1476
1477 
-		$filter_query = $this->getFilter($filter,true,true);
1477 
+		$filter_query = $this->getFilter($filter, true, true);
1478 1478
1479 1479 
 		if ($date != "")
1480 1480 
 		{
 
@@ -1500,8 +1500,8 @@  discard block
 
 block discarded – undo
1500 1500 
 		{
1501 1501 
 			$limit_array = explode(",", $limit);
1502 1502
1503 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1504 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1503 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1504 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1505 1505
1506 1506 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1507 1507 
 			{
 
@@ -1531,7 +1531,7 @@  discard block
 
 block discarded – undo
1531 1531 
 	* @return Array the spotter information
1532 1532 
 	*
1533 1533 
 	*/
1534 
-	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
1534 
+	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '', $filters = array())
1535 1535 
 	{
1536 1536 
 		global $global_query;
1537 1537 
 		
@@ -1540,7 +1540,7 @@  discard block
 
 block discarded – undo
1540 1540 
 		$query_values = array();
1541 1541 
 		$limit_query = '';
1542 1542 
 		$additional_query = '';
1543 
-		$filter_query = $this->getFilter($filters,true,true);
1543 
+		$filter_query = $this->getFilter($filters, true, true);
1544 1544 
 		if ($country != "")
1545 1545 
 		{
1546 1546 
 			if (!is_string($country))
 
@@ -1557,8 +1557,8 @@  discard block
 
 block discarded – undo
1557 1557 
 		{
1558 1558 
 			$limit_array = explode(",", $limit);
1559 1559
1560 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1561 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1560 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1561 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1562 1562
1563 1563 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1564 1564 
 			{
 
@@ -1598,7 +1598,7 @@  discard block
 
 block discarded – undo
1598 1598 
 		$query_values = array();
1599 1599 
 		$additional_query = '';
1600 1600 
 		$limit_query = '';
1601 
-		$filter_query = $this->getFilter($filters,true,true);
1601 
+		$filter_query = $this->getFilter($filters, true, true);
1602 1602
1603 1603 
 		if ($aircraft_manufacturer != "")
1604 1604 
 		{
 
@@ -1615,8 +1615,8 @@  discard block
 
 block discarded – undo
1615 1615 
 		{
1616 1616 
 			$limit_array = explode(",", $limit);
1617 1617
1618 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1619 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1618 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1619 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1620 1620
1621 1621 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1622 1622 
 			{
 
@@ -1658,14 +1658,14 @@  discard block
 
 block discarded – undo
1658 1658 
 		$query_values = array();
1659 1659 
 		$additional_query = '';
1660 1660 
 		$limit_query = '';
1661 
-		$filter_query = $this->getFilter($filters,true,true);
1661 
+		$filter_query = $this->getFilter($filters, true, true);
1662 1662 
 		if ($departure_airport_icao != "")
1663 1663 
 		{
1664 1664 
 			if (!is_string($departure_airport_icao))
1665 1665 
 			{
1666 1666 
 				return false;
1667 1667 
 			} else {
1668 
-				$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
1668 
+				$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
1669 1669 
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao)";
1670 1670 
 				//$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao AND spotter_output.real_departure_airport_icao IS NULL) OR spotter_output.real_departure_airport_icao = :departure_airport_icao";
1671 1671 
 				$query_values = array(':departure_airport_icao' => $departure_airport_icao);
 
@@ -1678,10 +1678,10 @@  discard block
 
 block discarded – undo
1678 1678 
 			{
1679 1679 
 				return false;
1680 1680 
 			} else {
1681 
-				$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
1681 
+				$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
1682 1682 
 				$additional_query .= " AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)";
1683 1683 
 				//$additional_query .= " AND ((spotter_output.arrival_airport_icao = :arrival_airport_icao AND spotter_output.real_arrival_airport_icao IS NULL) OR spotter_output.real_arrival_airport_icao = :arrival_airport_icao)";
1684 
-				$query_values = array_merge($query_values,array(':arrival_airport_icao' => $arrival_airport_icao));
1684 
+				$query_values = array_merge($query_values, array(':arrival_airport_icao' => $arrival_airport_icao));
1685 1685 
 			}
1686 1686 
 		}
1687 1687 
 		
@@ -1689,8 +1689,8 @@  discard block
 
 block discarded – undo
1689 1689 
 		{
1690 1690 
 			$limit_array = explode(",", $limit);
1691 1691
1692 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1693 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1692 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1693 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1694 1694
1695 1695 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1696 1696 
 			{
 
@@ -1729,15 +1729,15 @@  discard block
 
 block discarded – undo
1729 1729 
 		global $global_query;
1730 1730
1731 1731 
 		date_default_timezone_set('UTC');
1732 
-		$filter_query = $this->getFilter($filter,true,true);
1732 
+		$filter_query = $this->getFilter($filter, true, true);
1733 1733 
 		$limit_query = '';
1734 1734
1735 1735 
 		if ($limit != "")
1736 1736 
 		{
1737 1737 
 			$limit_array = explode(",", $limit);
1738 1738
1739 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1740 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1739 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1740 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1741 1741
1742 1742 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1743 1743 
 			{
 
@@ -1754,7 +1754,7 @@  discard block
 
 block discarded – undo
1754 1754 
 			$orderby_query = " ORDER BY spotter_output.date DESC";
1755 1755 
 		}
1756 1756
1757 
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
1757 
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
1758 1758
1759 1759 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1760 1760 
 
@@ -1767,19 +1767,19 @@  discard block
 
 block discarded – undo
1767 1767 
 	* @return String the highlight text
1768 1768 
 	*
1769 1769 
 	*/
1770 
-	public function getHighlightByRegistration($registration,$filter = array())
1770 
+	public function getHighlightByRegistration($registration, $filter = array())
1771 1771 
 	{
1772 1772 
 		global $global_query;
1773 1773
1774 1774 
 		date_default_timezone_set('UTC');
1775 
-		$filter_query = $this->getFilter($filter,true,true);
1776 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
1775 
+		$filter_query = $this->getFilter($filter, true, true);
1776 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
1777 1777
1778 
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
1778 
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
1779 1779 
 		$sth = $this->db->prepare($query);
1780 1780 
 		$sth->execute(array(':registration' => $registration));
1781 1781
1782 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1782 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1783 1783 
 		{
1784 1784 
 			$highlight = $row['highlight'];
1785 1785 
 		}
 
@@ -1795,14 +1795,14 @@  discard block
 
 block discarded – undo
1795 1795 
 	* @return String usage
1796 1796 
 	*
1797 1797 
 	*/
1798 
-	public function getSquawkUsage($squawk = '',$country = 'FR')
1798 
+	public function getSquawkUsage($squawk = '', $country = 'FR')
1799 1799 
 	{
1800 1800
1801 
-		$squawk = filter_var($squawk,FILTER_SANITIZE_STRING);
1802 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
1801 
+		$squawk = filter_var($squawk, FILTER_SANITIZE_STRING);
1802 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
1803 1803
1804 1804 
 		$query  = "SELECT squawk.* FROM squawk WHERE squawk.code = :squawk AND squawk.country = :country LIMIT 1";
1805 
-		$query_values = array(':squawk' => ltrim($squawk,'0'), ':country' => $country);
1805 
+		$query_values = array(':squawk' => ltrim($squawk, '0'), ':country' => $country);
1806 1806
1807 1807 
 		$sth = $this->db->prepare($query);
1808 1808 
 		$sth->execute($query_values);
 
@@ -1824,9 +1824,9 @@  discard block
 
 block discarded – undo
1824 1824 
 	public function getAirportIcao($airport_iata = '')
1825 1825 
 	{
1826 1826
1827 
-		$airport_iata = filter_var($airport_iata,FILTER_SANITIZE_STRING);
1827 
+		$airport_iata = filter_var($airport_iata, FILTER_SANITIZE_STRING);
1828 1828
1829 
-		$query  = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
1829 
+		$query = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
1830 1830 
 		$query_values = array(':airport' => $airport_iata);
1831 1831
1832 1832 
 		$sth = $this->db->prepare($query);
 
@@ -1848,12 +1848,12 @@  discard block
 
 block discarded – undo
1848 1848 
 	* @return Float distance to the airport
1849 1849 
 	*
1850 1850 
 	*/
1851 
-	public function getAirportDistance($airport_icao,$latitude,$longitude)
1851 
+	public function getAirportDistance($airport_icao, $latitude, $longitude)
1852 1852 
 	{
1853 1853
1854 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
1854 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
1855 1855
1856 
-		$query  = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
1856 
+		$query = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
1857 1857 
 		$query_values = array(':airport' => $airport_icao);
1858 1858 
 		$sth = $this->db->prepare($query);
1859 1859 
 		$sth->execute($query_values);
 
@@ -1863,7 +1863,7 @@  discard block
 
 block discarded – undo
1863 1863 
 			$airport_latitude = $row['latitude'];
1864 1864 
 			$airport_longitude = $row['longitude'];
1865 1865 
 			$Common = new Common();
1866 
-			return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude);
1866 
+			return $Common->distance($latitude, $longitude, $airport_latitude, $airport_longitude);
1867 1867 
 		} else return '';
1868 1868 
 	}
1869 1869 
 	
@@ -1877,11 +1877,11 @@  discard block
 
 block discarded – undo
1877 1877 
 	public function getAllAirportInfo($airport = '')
1878 1878 
 	{
1879 1879
1880 
-		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
1880 
+		$airport = filter_var($airport, FILTER_SANITIZE_STRING);
1881 1881
1882 1882 
 		$query_values = array();
1883 1883 
 		if ($airport == 'NA') {
1884 
-			return array(array('name' => 'Not available','city' => 'N/A', 'country' => 'N/A','iata' => 'NA','icao' => 'NA','altitude' => NULL,'latitude' => 0,'longitude' => 0,'type' => 'NA','home_link' => '','wikipedia_link' => '','image_thumb' => '', 'image' => ''));
1884 
+			return array(array('name' => 'Not available', 'city' => 'N/A', 'country' => 'N/A', 'iata' => 'NA', 'icao' => 'NA', 'altitude' => NULL, 'latitude' => 0, 'longitude' => 0, 'type' => 'NA', 'home_link' => '', 'wikipedia_link' => '', 'image_thumb' => '', 'image' => ''));
1885 1885 
 		} elseif ($airport == '') {
1886 1886 
 			$query  = "SELECT airport.name, airport.city, airport.country, airport.iata, airport.icao, airport.latitude, airport.longitude, airport.altitude, airport.type, airport.home_link, airport.wikipedia_link, airport.image_thumb, airport.image FROM airport";
1887 1887 
 		} else {
 
@@ -1929,14 +1929,14 @@  discard block
 
 block discarded – undo
1929 1929 
 	{
1930 1930 
 		$lst_countries = '';
1931 1931 
 		foreach ($countries as $country) {
1932 
-			$country = filter_var($country,FILTER_SANITIZE_STRING);
1932 
+			$country = filter_var($country, FILTER_SANITIZE_STRING);
1933 1933 
 			if ($lst_countries == '') {
1934 1934 
 				$lst_countries = "'".$country."'";
1935 1935 
 			} else {
1936 1936 
 				$lst_countries .= ",'".$country."'";
1937 1937 
 			}
1938 1938 
 		}
1939 
-		$query  = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
1939 
+		$query = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
1940 1940
1941 1941 
 		$sth = $this->db->prepare($query);
1942 1942 
 		$sth->execute();
 
@@ -1944,7 +1944,7 @@  discard block
 
 block discarded – undo
1944 1944 
 		$airport_array = array();
1945 1945 
 		$temp_array = array();
1946 1946
1947 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1947 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1948 1948 
 		{
1949 1949 
 			$temp_array['name'] = $row['name'];
1950 1950 
 			$temp_array['city'] = $row['city'];
 
@@ -1972,10 +1972,10 @@  discard block
 
 block discarded – undo
1972 1972 
 	{
1973 1973 
 		global $globalDBdriver;
1974 1974 
 		if (is_array($coord)) {
1975 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1976 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1977 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1978 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1975 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1976 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1977 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1978 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1979 1979 
 		} else return array();
1980 1980 
 		if ($globalDBdriver == 'mysql') {
1981 1981 
 			$query  = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'";
 
@@ -1987,7 +1987,7 @@  discard block
 
 block discarded – undo
1987 1987
1988 1988 
 		$airport_array = array();
1989 1989
1990 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1990 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1991 1991 
 		{
1992 1992 
 			$temp_array = $row;
1993 1993 
 
@@ -2007,13 +2007,13 @@  discard block
 
 block discarded – undo
2007 2007 
 	public function getAllWaypointsInfobyCoord($coord)
2008 2008 
 	{
2009 2009 
 		if (is_array($coord)) {
2010 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2011 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2012 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2013 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2010 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2011 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2012 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2013 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2014 2014 
 		} else return array();
2015 2015 
 		//$query  = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
2016 
-		$query  = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")";
2016 
+		$query = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")";
2017 2017 
 		//$query  = "SELECT waypoints.* FROM waypoints";
2018 2018 
 		//$query  = "SELECT waypoints.* FROM waypoints INNER JOIN (SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") w ON w.name_end = waypoints.name_begin OR w.name_begin = waypoints.name_begin OR w.name_begin = waypoints.name_end OR w.name_end = waypoints.name_end";
2019 2019 
 		//$query = "SELECT * FROM waypoints LEFT JOIN waypoints w ON waypoints.name_end = w.name_begin WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
 
@@ -2025,7 +2025,7 @@  discard block
 
 block discarded – undo
2025 2025
2026 2026 
 		$waypoints_array = array();
2027 2027
2028 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2028 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2029 2029 
 		{
2030 2030 
 			$temp_array = $row;
2031 2031 
 
@@ -2047,10 +2047,10 @@  discard block
 
 block discarded – undo
2047 2047 
 	{
2048 2048 
 		global $globalUseRealAirlines;
2049 2049 
 		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
2050 
-		$airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING));
2050 
+		$airline_icao = strtoupper(filter_var($airline_icao, FILTER_SANITIZE_STRING));
2051 2051 
 		if ($airline_icao == 'NA') {
2052 2052 
 			$airline_array = array();
2053 
-			$airline_array[] = array('name' => 'Not Available','iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
2053 
+			$airline_array[] = array('name' => 'Not Available', 'iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
2054 2054 
 			return $airline_array;
2055 2055 
 		} else {
2056 2056 
 			if (strlen($airline_icao) == 2) {
 
@@ -2071,7 +2071,7 @@  discard block
 
 block discarded – undo
2071 2071 
 			if ($fromsource === NULL) {
2072 2072 
 				$sth->execute(array(':airline_icao' => $airline_icao));
2073 2073 
 			} else {
2074 
-				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
2074 
+				$sth->execute(array(':airline_icao' => $airline_icao, ':fromsource' => $fromsource));
2075 2075 
 			}
2076 2076 
                         /*
2077 2077 
 			$airline_array = array();
 
@@ -2113,12 +2113,12 @@  discard block
 
 block discarded – undo
2113 2113 
 	*/
2114 2114 
 	public function getAllAircraftInfo($aircraft_type)
2115 2115 
 	{
2116 
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
2116 
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
2117 2117
2118 2118 
 		if ($aircraft_type == 'NA') {
2119 
-			return array(array('icao' => 'NA','type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
2119 
+			return array(array('icao' => 'NA', 'type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
2120 2120 
 		}
2121 
-		$query  = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type";
2121 
+		$query = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type";
2122 2122
2123 2123 
 		$sth = $this->db->prepare($query);
2124 2124 
 		$sth->execute(array(':aircraft_type' => $aircraft_type));
 
@@ -2150,7 +2150,7 @@  discard block
 
 block discarded – undo
2150 2150 
 	*/
2151 2151 
 	public function getAircraftIcao($aircraft_type)
2152 2152 
 	{
2153 
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
2153 
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
2154 2154 
 		$all_aircraft = array('737-300' => 'B733',
2155 2155 
 				'777-200' => 'B772',
2156 2156 
 				'777-200ER' => 'B772',
 
@@ -2162,10 +2162,10 @@  discard block
 
 block discarded – undo
2162 2162 
 				'A380' => 'A388');
2163 2163 
 		if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type];
2164 2164
2165 
-		$query  = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2165 
+		$query = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2166 2166 
 		$aircraft_type = strtoupper($aircraft_type);
2167 2167 
 		$sth = $this->db->prepare($query);
2168 
-		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%',':aircraft_type' => $aircraft_type,));
2168 
+		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%', ':aircraft_type' => $aircraft_type,));
2169 2169 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
2170 2170 
 		if (isset($result[0]['icao'])) return $result[0]['icao'];
2171 2171 
 		else return '';
 
@@ -2180,9 +2180,9 @@  discard block
 
 block discarded – undo
2180 2180 
 	*/
2181 2181 
 	public function getAllAircraftType($aircraft_modes)
2182 2182 
 	{
2183 
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
2183 
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
2184 2184
2185 
-		$query  = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
2185 
+		$query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
2186 2186
2187 2187 
 		$sth = $this->db->prepare($query);
2188 2188 
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
 
@@ -2203,8 +2203,8 @@  discard block
 
 block discarded – undo
2203 2203 
 	*/
2204 2204 
 	public function getOperator($operator)
2205 2205 
 	{
2206 
-		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
2207 
-		$query  = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
2206 
+		$operator = filter_var($operator, FILTER_SANITIZE_STRING);
2207 
+		$query = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
2208 2208
2209 2209 
 		$sth = $this->db->prepare($query);
2210 2210 
 		$sth->execute(array(':operator' => $operator));
 
@@ -2225,9 +2225,9 @@  discard block
 
 block discarded – undo
2225 2225 
 	*/
2226 2226 
 	public function getRouteInfo($callsign)
2227 2227 
 	{
2228 
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
2228 
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
2229 2229 
                 if ($callsign == '') return array();
2230 
-		$query  = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
2230 
+		$query = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
2231 2231
2232 2232 
 		$sth = $this->db->prepare($query);
2233 2233 
 		$sth->execute(array(':callsign' => $callsign));
 
@@ -2248,9 +2248,9 @@  discard block
 
 block discarded – undo
2248 2248 
 	*/
2249 2249 
 	public function getAircraftInfoByRegistration($registration)
2250 2250 
 	{
2251 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2251 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2252 2252
2253 
-		$query  = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration";
2253 
+		$query = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration";
2254 2254
2255 2255 
 		$sth = $this->db->prepare($query);
2256 2256 
 		$sth->execute(array(':registration' => $registration));
 
@@ -2258,7 +2258,7 @@  discard block
 
 block discarded – undo
2258 2258 
 		$aircraft_array = array();
2259 2259 
 		$temp_array = array();
2260 2260
2261 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2261 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2262 2262 
 		{
2263 2263 
 			$temp_array['airline_icao'] = $row['airline_icao'];
2264 2264 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
 
@@ -2280,7 +2280,7 @@  discard block
 
 block discarded – undo
2280 2280 
 	*/
2281 2281 
 	public function getAircraftOwnerByRegistration($registration)
2282 2282 
 	{
2283 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2283 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2284 2284 
 		$Connection = new Connection($this->db);
2285 2285 
 		if ($Connection->tableExists('aircraft_owner')) {
2286 2286 
 			$query  = "SELECT aircraft_owner.base, aircraft_owner.owner, aircraft_owner.date_first_reg FROM aircraft_owner WHERE registration = :registration LIMIT 1";
 
@@ -2302,7 +2302,7 @@  discard block
 
 block discarded – undo
2302 2302 
 	public function getAllFlightsforSitemap()
2303 2303 
 	{
2304 2304 
 		//$query  = "SELECT spotter_output.spotter_id, spotter_output.ident, spotter_output.airline_name, spotter_output.aircraft_name, spotter_output.aircraft_icao FROM spotter_output ORDER BY LIMIT ";
2305 
-		$query  = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
2305 
+		$query = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
2306 2306
2307 2307 
 		$sth = $this->db->prepare($query);
2308 2308 
 		$sth->execute();
 
@@ -2349,7 +2349,7 @@  discard block
 
 block discarded – undo
2349 2349 
 		$manufacturer_array = array();
2350 2350 
 		$temp_array = array();
2351 2351
2352 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2352 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2353 2353 
 		{
2354 2354 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
2355 2355 
 
@@ -2375,7 +2375,7 @@  discard block
 
 block discarded – undo
2375 2375 
 								ORDER BY spotter_output.aircraft_name ASC";
2376 2376
2377 2377 
 		*/
2378 
-		$filter_query = $this->getFilter($filters,true,true);
2378 
+		$filter_query = $this->getFilter($filters, true, true);
2379 2379 
 		$query = "SELECT DISTINCT icao AS aircraft_icao, type AS aircraft_name, manufacturer AS aircraft_manufacturer FROM aircraft".$filter_query." icao <> '' ORDER BY aircraft_manufacturer ASC";
2380 2380
2381 2381 
 		$sth = $this->db->prepare($query);
 
@@ -2384,7 +2384,7 @@  discard block
 
 block discarded – undo
2384 2384 
 		$aircraft_array = array();
2385 2385 
 		$temp_array = array();
2386 2386
2387 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2387 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2388 2388 
 		{
2389 2389 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
2390 2390 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 
@@ -2405,8 +2405,8 @@  discard block
 
 block discarded – undo
2405 2405 
 	*/
2406 2406 
 	public function getAllAircraftRegistrations($filters = array())
2407 2407 
 	{
2408 
-		$filter_query = $this->getFilter($filters,true,true);
2409 
-		$query  = "SELECT DISTINCT spotter_output.registration
2408 
+		$filter_query = $this->getFilter($filters, true, true);
2409 
+		$query = "SELECT DISTINCT spotter_output.registration
2410 2410 
 				FROM spotter_output".$filter_query." spotter_output.registration <> ''
2411 2411 
 				ORDER BY spotter_output.registration ASC";
2412 2412 
 
@@ -2416,7 +2416,7 @@  discard block
 
 block discarded – undo
2416 2416 
 		$aircraft_array = array();
2417 2417 
 		$temp_array = array();
2418 2418
2419 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2419 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2420 2420 
 		{
2421 2421 
 			$temp_array['registration'] = $row['registration'];
2422 2422 
 
@@ -2433,11 +2433,11 @@  discard block
 
 block discarded – undo
2433 2433 
 	* @return Array list of source name
2434 2434 
 	*
2435 2435 
 	*/
2436 
-	public function getAllSourceName($type = '',$filters = array())
2436 
+	public function getAllSourceName($type = '', $filters = array())
2437 2437 
 	{
2438 
-		$filter_query = $this->getFilter($filters,true,true);
2438 
+		$filter_query = $this->getFilter($filters, true, true);
2439 2439 
 		$query_values = array();
2440 
-		$query  = "SELECT DISTINCT spotter_output.source_name
2440 
+		$query = "SELECT DISTINCT spotter_output.source_name
2441 2441 
 				FROM spotter_output".$filter_query." spotter_output.source_name <> ''";
2442 2442 
 		if ($type != '') {
2443 2443 
 			$query_values = array(':type' => $type);
 
@@ -2452,7 +2452,7 @@  discard block
 
 block discarded – undo
2452 2452 
 		$source_array = array();
2453 2453 
 		$temp_array = array();
2454 2454
2455 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2455 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2456 2456 
 		{
2457 2457 
 			$temp_array['source_name'] = $row['source_name'];
2458 2458 
 			$source_array[] = $temp_array;
 
@@ -2468,11 +2468,11 @@  discard block
 
 block discarded – undo
2468 2468 
 	* @return Array list of airline names
2469 2469 
 	*
2470 2470 
 	*/
2471 
-	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
2471 
+	public function getAllAirlineNames($airline_type = '', $forsource = NULL, $filters = array())
2472 2472 
 	{
2473 
-		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
2474 
-		$filter_query = $this->getFilter($filters,true,true);
2475 
-		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
2473 
+		global $globalAirlinesSource, $globalVATSIM, $globalIVAO;
2474 
+		$filter_query = $this->getFilter($filters, true, true);
2475 
+		$airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
2476 2476 
 		if ($airline_type == '' || $airline_type == 'all') {
2477 2477 
 			/*
2478 2478 
 			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
 
@@ -2491,7 +2491,7 @@  discard block
 
 block discarded – undo
2491 2491 
 				$query_data = array(':forsource' => $forsource);
2492 2492 
 			}
2493 2493 
 		} else {
2494 
-			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
2494 
+			$query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
2495 2495 
 					FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
2496 2496 
 					AND spotter_output.airline_type = :airline_type
2497 2497 
 					ORDER BY spotter_output.airline_icao ASC";
 
@@ -2504,7 +2504,7 @@  discard block
 
 block discarded – undo
2504 2504 
 		$airline_array = array();
2505 2505 
 		$temp_array = array();
2506 2506
2507 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2507 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2508 2508 
 		{
2509 2509 
 			$temp_array['airline_icao'] = $row['airline_icao'];
2510 2510 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -2524,8 +2524,8 @@  discard block
 
 block discarded – undo
2524 2524 
 	*/
2525 2525 
 	public function getAllAirlineCountries($filters = array())
2526 2526 
 	{
2527 
-		$filter_query = $this->getFilter($filters,true,true);
2528 
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2527 
+		$filter_query = $this->getFilter($filters, true, true);
2528 
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2529 2529 
 				FROM spotter_output".$filter_query." spotter_output.airline_country <> ''
2530 2530 
 				ORDER BY spotter_output.airline_country ASC";
2531 2531 
 		
@@ -2536,7 +2536,7 @@  discard block
 
 block discarded – undo
2536 2536 
 		$airline_array = array();
2537 2537 
 		$temp_array = array();
2538 2538
2539 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2539 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2540 2540 
 		{
2541 2541 
 			$temp_array['airline_country'] = $row['airline_country'];
2542 2542 
 
@@ -2556,9 +2556,9 @@  discard block
 
 block discarded – undo
2556 2556 
 	*/
2557 2557 
 	public function getAllAirportNames($filters = array())
2558 2558 
 	{
2559 
-		$filter_query = $this->getFilter($filters,true,true);
2559 
+		$filter_query = $this->getFilter($filters, true, true);
2560 2560 
 		$airport_array = array();
2561 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country
2561 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country
2562 2562 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_icao <> '' AND spotter_output.departure_airport_icao <> 'NA'
2563 2563 
 				ORDER BY spotter_output.departure_airport_city ASC";
2564 2564 
 		
@@ -2567,7 +2567,7 @@  discard block
 
 block discarded – undo
2567 2567 
 		$sth->execute();
2568 2568
2569 2569 
 		$temp_array = array();
2570 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2570 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2571 2571 
 		{
2572 2572 
 			$temp_array['airport_icao'] = $row['airport_icao'];
2573 2573 
 			$temp_array['airport_name'] = $row['airport_name'];
 
@@ -2577,14 +2577,14 @@  discard block
 
 block discarded – undo
2577 2577 
 			$airport_array[$row['airport_city'].",".$row['airport_name']] = $temp_array;
2578 2578 
 		}
2579 2579
2580 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country
2580 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country
2581 2581 
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA'
2582 2582 
 								ORDER BY spotter_output.arrival_airport_city ASC";
2583 2583
2584 2584 
 		$sth = $this->db->prepare($query);
2585 2585 
 		$sth->execute();
2586 2586
2587 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2587 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2588 2588 
 			{
2589 2589 
 		//	if ($airport_array[$row['airport_city'].",".$row['airport_name']]['airport_icao'] != $row['airport_icao'])
2590 2590 
 		//	{
 
@@ -2624,21 +2624,21 @@  discard block
 
 block discarded – undo
2624 2624
2625 2625 
 		$temp_array = array();
2626 2626
2627 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2627 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2628 2628 
 		{
2629 2629 
 			$temp_array['airport_country'] = $row['airport_country'];
2630 2630
2631 2631 
 			$airport_array[$row['airport_country']] = $temp_array;
2632 2632 
 		}
2633 
-		$filter_query = $this->getFilter($filters,true,true);
2634 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2633 
+		$filter_query = $this->getFilter($filters, true, true);
2634 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2635 2635 
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> ''
2636 2636 
 								ORDER BY spotter_output.arrival_airport_country ASC";
2637 2637
2638 2638 
 		$sth = $this->db->prepare($query);
2639 2639 
 		$sth->execute();
2640 2640
2641 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2641 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2642 2642 
 		{
2643 2643 
 			if (isset($airport_array[$row['airport_country']]['airport_country']) && $airport_array[$row['airport_country']]['airport_country'] != $row['airport_country'])
2644 2644 
 			{
 
@@ -2661,9 +2661,9 @@  discard block
 
 block discarded – undo
2661 2661 
 	*/
2662 2662 
 	public function getAllCountries($filters = array())
2663 2663 
 	{
2664 
-		$Connection= new Connection($this->db);
2664 
+		$Connection = new Connection($this->db);
2665 2665 
 		if ($Connection->tableExists('countries')) {
2666 
-			$query  = "SELECT countries.name AS airport_country
2666 
+			$query = "SELECT countries.name AS airport_country
2667 2667 
 				FROM countries
2668 2668 
 				ORDER BY countries.name ASC";
2669 2669 
 			$sth = $this->db->prepare($query);
 
@@ -2672,14 +2672,14 @@  discard block
 
 block discarded – undo
2672 2672 
 			$temp_array = array();
2673 2673 
 			$country_array = array();
2674 2674
2675 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
2675 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2676 2676 
 			{
2677 2677 
 				$temp_array['country'] = $row['airport_country'];
2678 2678 
 				$country_array[$row['airport_country']] = $temp_array;
2679 2679 
 			}
2680 2680 
 		} else {
2681 
-			$filter_query = $this->getFilter($filters,true,true);
2682 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
2681 
+			$filter_query = $this->getFilter($filters, true, true);
2682 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
2683 2683 
 								FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> ''
2684 2684 
 								ORDER BY spotter_output.departure_airport_country ASC";
2685 2685 
 
@@ -2688,20 +2688,20 @@  discard block
 
 block discarded – undo
2688 2688
2689 2689 
 			$temp_array = array();
2690 2690 
 			$country_array = array();
2691 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
2691 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2692 2692 
 			{
2693 2693 
 				$temp_array['country'] = $row['airport_country'];
2694 2694 
 				$country_array[$row['airport_country']] = $temp_array;
2695 2695 
 			}
2696 2696
2697 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2697 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2698 2698 
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> ''
2699 2699 
 								ORDER BY spotter_output.arrival_airport_country ASC";
2700 2700
2701 2701 
 		$sth = $this->db->prepare($query);
2702 2702 
 		$sth->execute();
2703 2703
2704 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2704 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2705 2705 
 		{
2706 2706 
 			if ($country_array[$row['airport_country']]['country'] != $row['airport_country'])
2707 2707 
 			{
 
@@ -2711,14 +2711,14 @@  discard block
 
 block discarded – undo
2711 2711 
 			}
2712 2712 
 		}
2713 2713
2714 
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2714 
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2715 2715 
 								FROM spotter_output".$filter_query." spotter_output.airline_country <> ''
2716 2716 
 								ORDER BY spotter_output.airline_country ASC";
2717 2717
2718 2718 
 		$sth = $this->db->prepare($query);
2719 2719 
 		$sth->execute();
2720 2720
2721 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2721 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2722 2722 
 		{
2723 2723 
 			if (isset($country_array[$row['airline_country']]['country']) && $country_array[$row['airline_country']]['country'] != $row['airline_country'])
2724 2724 
 			{
 
@@ -2742,8 +2742,8 @@  discard block
 
 block discarded – undo
2742 2742 
 	*/
2743 2743 
 	public function getAllIdents($filters = array())
2744 2744 
 	{
2745 
-		$filter_query = $this->getFilter($filters,true,true);
2746 
-		$query  = "SELECT DISTINCT spotter_output.ident
2745 
+		$filter_query = $this->getFilter($filters, true, true);
2746 
+		$query = "SELECT DISTINCT spotter_output.ident
2747 2747 
 								FROM spotter_output".$filter_query." spotter_output.ident <> ''
2748 2748 
 								ORDER BY spotter_output.date ASC LIMIT 700 OFFSET 0";
2749 2749 
 
@@ -2753,7 +2753,7 @@  discard block
 
 block discarded – undo
2753 2753 
 		$ident_array = array();
2754 2754 
 		$temp_array = array();
2755 2755
2756 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2756 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2757 2757 
 		{
2758 2758 
 			$temp_array['ident'] = $row['ident'];
2759 2759 
 			$ident_array[] = $temp_array;
 
@@ -2767,9 +2767,9 @@  discard block
 
 block discarded – undo
2767 2767 
 	* @return Array number, icao, name and city of airports
2768 2768 
 	*/
2769 2769
2770 
-	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
2770 
+	public function getLast7DaysAirportsDeparture($airport_icao = '', $filters = array()) {
2771 2771 
 		global $globalTimezone, $globalDBdriver;
2772 
-		$filter_query = $this->getFilter($filters,true,true);
2772 
+		$filter_query = $this->getFilter($filters, true, true);
2773 2773 
 		if ($globalTimezone != '') {
2774 2774 
 			date_default_timezone_set($globalTimezone);
2775 2775 
 			$datetime = new DateTime();
 
@@ -2834,7 +2834,7 @@  discard block
 
 block discarded – undo
2834 2834
2835 2835 
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) {
2836 2836 
 		global $globalTimezone, $globalDBdriver;
2837 
-		$filter_query = $this->getFilter($filters,true,true);
2837 
+		$filter_query = $this->getFilter($filters, true, true);
2838 2838 
 		if ($globalTimezone != '') {
2839 2839 
 			date_default_timezone_set($globalTimezone);
2840 2840 
 			$datetime = new DateTime();
 
@@ -2918,7 +2918,7 @@  discard block
 
 block discarded – undo
2918 2918
2919 2919 
 	public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) {
2920 2920 
 		global $globalTimezone, $globalDBdriver;
2921 
-		$filter_query = $this->getFilter($filters,true,true);
2921 
+		$filter_query = $this->getFilter($filters, true, true);
2922 2922 
 		if ($globalTimezone != '') {
2923 2923 
 			date_default_timezone_set($globalTimezone);
2924 2924 
 			$datetime = new DateTime();
 
@@ -2951,9 +2951,9 @@  discard block
 
 block discarded – undo
2951 2951 
 	* @return Array number, icao, name and city of airports
2952 2952 
 	*/
2953 2953
2954 
-	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
2954 
+	public function getLast7DaysDetectedAirportsArrival($airport_icao = '', $filters = array()) {
2955 2955 
 		global $globalTimezone, $globalDBdriver;
2956 
-		$filter_query = $this->getFilter($filters,true,true);
2956 
+		$filter_query = $this->getFilter($filters, true, true);
2957 2957 
 		if ($globalTimezone != '') {
2958 2958 
 			date_default_timezone_set($globalTimezone);
2959 2959 
 			$datetime = new DateTime();
 
@@ -3085,12 +3085,12 @@  discard block
 
 block discarded – undo
3085 3085 
 		} else $offset = '+00:00';
3086 3086
3087 3087 
 		if ($globalDBdriver == 'mysql') {
3088 
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
3088 
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
3089 3089 
 								FROM spotter_output
3090 3090 
 								WHERE spotter_output.date <> ''
3091 3091 
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
3092 3092 
 		} else {
3093 
-			$query  = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
3093 
+			$query = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
3094 3094 
 								FROM spotter_output
3095 3095 
 								WHERE spotter_output.date <> ''
3096 3096 
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
 
@@ -3102,7 +3102,7 @@  discard block
 
 block discarded – undo
3102 3102 
 		$date_array = array();
3103 3103 
 		$temp_array = array();
3104 3104
3105 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3105 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3106 3106 
 		{
3107 3107 
 			$temp_array['date'] = $row['date'];
3108 3108 
 
@@ -3122,7 +3122,7 @@  discard block
 
 block discarded – undo
3122 3122 
 	*/
3123 3123 
 	public function getAllRoutes()
3124 3124 
 	{
3125 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao
3125 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao
3126 3126 
 				FROM spotter_output
3127 3127 
 				WHERE spotter_output.ident <> ''
3128 3128 
 				GROUP BY route
 
@@ -3133,7 +3133,7 @@  discard block
 
 block discarded – undo
3133 3133
3134 3134 
 		$routes_array = array();
3135 3135 
 		$temp_array = array();
3136 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3136 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3137 3137 
 		{
3138 3138 
 			$temp_array['route'] = $row['route'];
3139 3139 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -3152,21 +3152,21 @@  discard block
 
 block discarded – undo
3152 3152 
 	* @return String success or false
3153 3153 
 	*
3154 3154 
 	*/
3155 
-	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
3155 
+	public function updateIdentSpotterData($flightaware_id = '', $ident = '', $fromsource = NULL)
3156 3156 
 	{
3157 3157 
 		if (!is_numeric(substr($ident, 0, 3)))
3158 3158 
 		{
3159 3159 
 			if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
3160 
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
3160 
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
3161 3161 
 			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
3162 
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
3162 
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
3163 3163 
 			} else {
3164 3164 
 				$airline_array = $this->getAllAirlineInfo("NA");
3165 3165 
 			}
3166 3166 
 			if (count($airline_array) == 0) {
3167 3167 
 				$airline_array = $this->getAllAirlineInfo("NA");
3168 3168 
 			}
3169 
-			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3169 
+			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
3170 3170 
 				$airline_array = $this->getAllAirlineInfo("NA");
3171 3171 
 			}
3172 3172 
 		} else {
 
@@ -3179,7 +3179,7 @@  discard block
 
 block discarded – undo
3179 3179
3180 3180
3181 3181 
 		$query = 'UPDATE spotter_output SET ident = :ident, airline_name = :airline_name, airline_icao = :airline_icao, airline_country = :airline_country, airline_type = :airline_type WHERE flightaware_id = :flightaware_id';
3182 
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
3182 
+                $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type);
3183 3183
3184 3184 
 		try {
3185 3185 
 			$sth = $this->db->prepare($query);
 
@@ -3200,11 +3200,11 @@  discard block
 
 block discarded – undo
3200 3200 
 	* @return String success or false
3201 3201 
 	*
3202 3202 
 	*/
3203 
-	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
3203 
+	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '', $arrival_airport_time = '')
3204 3204 
 	{
3205 3205 
 		if ($groundspeed == '') $groundspeed = NULL;
3206 3206 
 		$query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id';
3207 
-                $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
3207 
+                $query_values = array(':flightaware_id' => $flightaware_id, ':real_arrival_airport_icao' => $arrival_airport_icao, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
3208 3208
3209 3209 
 		try {
3210 3210 
 			$sth = $this->db->prepare($query);
 
@@ -3244,7 +3244,7 @@  discard block
 
 block discarded – undo
3244 3244 
 	* @param String $verticalrate vertival rate of flight
3245 3245 
 	* @return String success or false
3246 3246 
 	*/
3247 
-	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '')
3247 
+	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false, $format_source = '', $source_name = '')
3248 3248 
 	{
3249 3249 
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
3250 3250 
 		
@@ -3268,13 +3268,13 @@  discard block
 
 block discarded – undo
3268 3268 
 				if ($ModeS != '') {
3269 3269 
 					$timeelapsed = microtime(true);
3270 3270 
 					$registration = $this->getAircraftRegistrationBymodeS($ModeS);
3271 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3271 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3272 3272 
 				} else {
3273 
-					$myhex = explode('-',$flightaware_id);
3273 
+					$myhex = explode('-', $flightaware_id);
3274 3274 
 					if (count($myhex) > 0) {
3275 3275 
 						$timeelapsed = microtime(true);
3276 3276 
 						$registration = $this->getAircraftRegistrationBymodeS($myhex[0]);
3277 
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3277 
+						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3278 3278 
 					}
3279 3279 
 				}
3280 3280 
 			}
 
@@ -3296,24 +3296,24 @@  discard block
 
 block discarded – undo
3296 3296 
 				{
3297 3297 
 					$timeelapsed = microtime(true);
3298 3298 
 					if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
3299 
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
3299 
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
3300 3300 
 					} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
3301 
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
3301 
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
3302 3302 
 					} else {
3303 3303 
 						$airline_array = $this->getAllAirlineInfo("NA");
3304 3304 
 					}
3305 3305 
 					if (count($airline_array) == 0) {
3306 3306 
 						$airline_array = $this->getAllAirlineInfo("NA");
3307 3307 
 					}
3308 
-					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3308 
+					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
3309 3309 
 						$airline_array = $this->getAllAirlineInfo("NA");
3310 3310 
 					}
3311 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3311 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3312 3312
3313 3313 
 				} else {
3314 3314 
 					$timeelapsed = microtime(true);
3315 3315 
 					$airline_array = $this->getAllAirlineInfo("NA");
3316 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3316 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3317 3317 
 				}
3318 3318 
 			}
3319 3319 
 		} else $airline_array = array();
 
@@ -3330,27 +3330,27 @@  discard block
 
 block discarded – undo
3330 3330 
 				{
3331 3331 
 					$timeelapsed = microtime(true);
3332 3332 
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3333 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3333 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3334 3334 
 				} else {
3335 3335 
 					$timeelapsed = microtime(true);
3336 3336 
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3337 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3337 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3338 3338 
 				}
3339 3339 
 			}
3340 3340 
 		} else {
3341 3341 
 			if ($ModeS != '') {
3342 3342 
 				$timeelapsed = microtime(true);
3343 3343 
 				$aircraft_icao = $this->getAllAircraftType($ModeS);
3344 
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3344 
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3345 3345 
 				if ($aircraft_icao == "" || $aircraft_icao == "XXXX")
3346 3346 
 				{
3347 3347 
 					$timeelapsed = microtime(true);
3348 3348 
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3349 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3349 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3350 3350 
 				} else {
3351 3351 
 					$timeelapsed = microtime(true);
3352 3352 
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3353 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3353 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3354 3354 
 				}
3355 3355 
 			}
3356 3356 
 		}
 
@@ -3365,7 +3365,7 @@  discard block
 
 block discarded – undo
3365 3365 
 			} else {
3366 3366 
 				$timeelapsed = microtime(true);
3367 3367 
 				$departure_airport_array = $this->getAllAirportInfo($departure_airport_icao);
3368 
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3368 
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3369 3369 
 			}
3370 3370 
 		}
3371 3371 
 		
@@ -3379,7 +3379,7 @@  discard block
 
 block discarded – undo
3379 3379 
 			} else {
3380 3380 
 				$timeelapsed = microtime(true);
3381 3381 
 				$arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao);
3382 
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3382 
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3383 3383 
 			}
3384 3384 
 		}
3385 3385 
 
@@ -3443,7 +3443,7 @@  discard block
 
 block discarded – undo
3443 3443 
 		{
3444 3444 
 			$timeelapsed = microtime(true);
3445 3445 
 			$image_array = $Image->getSpotterImage($registration);
3446 
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3446 
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3447 3447 
 			if (!isset($image_array[0]['registration']))
3448 3448 
 			{
3449 3449 
 				//echo "Add image !!!! \n";
 
@@ -3451,7 +3451,7 @@  discard block
 
 block discarded – undo
3451 3451 
 			}
3452 3452 
 			$timeelapsed = microtime(true);
3453 3453 
 			$owner_info = $this->getAircraftOwnerByRegistration($registration);
3454 
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3454 
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3455 3455 
 			if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner']));
3456 3456 
 		}
3457 3457 
     
@@ -3459,33 +3459,33 @@  discard block
 
 block discarded – undo
3459 3459 
 		{
3460 3460 
             		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
3461 3461 
             		else $airline_icao = '';
3462 
-			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
3462 
+			$image_array = $Image->getSpotterImage('', $aircraft_icao, $airline_icao);
3463 3463 
 			if (!isset($image_array[0]['registration']))
3464 3464 
 			{
3465 3465 
 				//echo "Add image !!!! \n";
3466 
-				$Image->addSpotterImage('',$aircraft_icao,$airline_icao);
3466 
+				$Image->addSpotterImage('', $aircraft_icao, $airline_icao);
3467 3467 
 			}
3468 3468 
 		}
3469 3469
3470 
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
3471 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
3472 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
3473 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3474 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
3475 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
3476 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3477 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3478 
-		$waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING);
3479 
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3480 
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
3481 
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3482 
-		$squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT);
3483 
-		$route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING);
3484 
-		$ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING);
3485 
-		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING);
3486 
-		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
3487 
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
3488 
-		$verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT);
3470 
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
3471 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
3472 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
3473 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3474 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
3475 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
3476 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3477 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3478 
+		$waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING);
3479 
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3480 
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
3481 
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3482 
+		$squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT);
3483 
+		$route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING);
3484 
+		$ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING);
3485 
+		$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING);
3486 
+		$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
3487 
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
3488 
+		$verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT);
3489 3489
3490 3490 
 		if (count($airline_array) == 0)
3491 3491 
 		{
 
@@ -3513,7 +3513,7 @@  discard block
 
 block discarded – undo
3513 3513 
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
3514 3514 
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
3515 3515 
                 if (!isset($aircraft_owner)) $aircraft_owner = NULL;
3516 
-                $query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name)
3516 
+                $query = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name)
3517 3517 
                 VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)";
3518 3518
3519 3519 
                 $airline_name = $airline_array[0]['name'];
 
@@ -3523,7 +3523,7 @@  discard block
 
 block discarded – undo
3523 3523 
 		if ($airline_type == '') {
3524 3524 
 			$timeelapsed = microtime(true);
3525 3525 
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
3526 
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3526 
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3527 3527 
 		}
3528 3528 
 		if ($airline_type == null) $airline_type = '';
3529 3529 
                 $aircraft_type = $aircraft_array[0]['type'];
 
@@ -3534,7 +3534,7 @@  discard block
 
 block discarded – undo
3534 3534 
                 $arrival_airport_name = $arrival_airport_array[0]['name'];
3535 3535 
                 $arrival_airport_city = $arrival_airport_array[0]['city'];
3536 3536 
                 $arrival_airport_country = $arrival_airport_array[0]['country'];
3537 
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
3537 
+                $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
3538 3538
3539 3539 
 		try {
3540 3540 
 		        
@@ -3560,13 +3560,13 @@  discard block
 
 block discarded – undo
3560 3560 
 	{
3561 3561 
 		global $globalDBdriver, $globalTimezone;
3562 3562 
 		if ($globalDBdriver == 'mysql') {
3563 
-			$query  = "SELECT spotter_output.ident FROM spotter_output
3563 
+			$query = "SELECT spotter_output.ident FROM spotter_output
3564 3564 
 								WHERE spotter_output.ident = :ident
3565 3565 
 								AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR)
3566 3566 
 								AND spotter_output.date < UTC_TIMESTAMP()";
3567 3567 
 			$query_data = array(':ident' => $ident);
3568 3568 
 		} else {
3569 
-			$query  = "SELECT spotter_output.ident FROM spotter_output
3569 
+			$query = "SELECT spotter_output.ident FROM spotter_output
3570 3570 
 								WHERE spotter_output.ident = :ident
3571 3571 
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
3572 3572 
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
 
@@ -3575,8 +3575,8 @@  discard block
 
 block discarded – undo
3575 3575
3576 3576 
 		$sth = $this->db->prepare($query);
3577 3577 
 		$sth->execute($query_data);
3578 
-    		$ident_result='';
3579 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3578 
+    		$ident_result = '';
3579 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3580 3580 
 		{
3581 3581 
 			$ident_result = $row['ident'];
3582 3582 
 		}
 
@@ -3602,8 +3602,8 @@  discard block
 
 block discarded – undo
3602 3602 
 				return false;
3603 3603 
 			} else {
3604 3604 
 				$q_array = explode(" ", $q);
3605 
-				foreach ($q_array as $q_item){
3606 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
3605 
+				foreach ($q_array as $q_item) {
3606 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
3607 3607 
 					$additional_query .= " AND (";
3608 3608 
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
3609 3609 
 					$additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR ";
 
@@ -3618,11 +3618,11 @@  discard block
 
 block discarded – undo
3618 3618 
 			}
3619 3619 
 		}
3620 3620 
 		if ($globalDBdriver == 'mysql') {
3621 
-			$query  = "SELECT spotter_output.* FROM spotter_output
3621 
+			$query = "SELECT spotter_output.* FROM spotter_output
3622 3622 
 				WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query."
3623 3623 
 				AND spotter_output.date < UTC_TIMESTAMP()";
3624 3624 
 		} else {
3625 
-			$query  = "SELECT spotter_output.* FROM spotter_output
3625 
+			$query = "SELECT spotter_output.* FROM spotter_output
3626 3626 
 				WHERE spotter_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query."
3627 3627 
 				AND spotter_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
3628 3628 
 		}
 
@@ -3639,11 +3639,11 @@  discard block
 
 block discarded – undo
3639 3639 
 	* @return Array the airline list
3640 3640 
 	*
3641 3641 
 	*/
3642 
-	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3642 
+	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3643 3643 
 	{
3644 3644 
 		global $globalDBdriver;
3645 
-		$filter_query = $this->getFilter($filters,true,true);
3646 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3645 
+		$filter_query = $this->getFilter($filters, true, true);
3646 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3647 3647 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.airline_icao <> 'NA' ";
3648 3648 
 		if ($olderthanmonths > 0) {
3649 3649 
 			if ($globalDBdriver == 'mysql') {
 
@@ -3667,7 +3667,7 @@  discard block
 
 block discarded – undo
3667 3667
3668 3668 
 		$airline_array = array();
3669 3669 
 		$temp_array = array();
3670 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3670 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3671 3671 
 		{
3672 3672 
 			$temp_array['airline_name'] = $row['airline_name'];
3673 3673 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -3684,11 +3684,11 @@  discard block
 
 block discarded – undo
3684 3684 
 	* @return Array the pilots list
3685 3685 
 	*
3686 3686 
 	*/
3687 
-	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3687 
+	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3688 3688 
 	{
3689 3689 
 		global $globalDBdriver;
3690 
-		$filter_query = $this->getFilter($filters,true,true);
3691 
-		$query  = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3690 
+		$filter_query = $this->getFilter($filters, true, true);
3691 
+		$query = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3692 3692 
 		 			FROM spotter_output".$filter_query." spotter_output.pilot_id <> '' ";
3693 3693 
                 if ($olderthanmonths > 0) {
3694 3694 
             		if ($globalDBdriver == 'mysql') {
 
@@ -3714,7 +3714,7 @@  discard block
 
 block discarded – undo
3714 3714 
 		$airline_array = array();
3715 3715 
 		$temp_array = array();
3716 3716
3717 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3717 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3718 3718 
 		{
3719 3719 
 			$temp_array['pilot_name'] = $row['pilot_name'];
3720 3720 
 			$temp_array['pilot_id'] = $row['pilot_id'];
 
@@ -3734,7 +3734,7 @@  discard block
 
 block discarded – undo
3734 3734 
 	public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
3735 3735 
 	{
3736 3736 
 		global $globalDBdriver;
3737 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3737 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3738 3738 
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
3739 3739 
                 if ($olderthanmonths > 0) {
3740 3740 
             		if ($globalDBdriver == 'mysql') {
 
@@ -3760,7 +3760,7 @@  discard block
 
 block discarded – undo
3760 3760 
 		$airline_array = array();
3761 3761 
 		$temp_array = array();
3762 3762
3763 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3763 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3764 3764 
 		{
3765 3765 
 			$temp_array['pilot_name'] = $row['pilot_name'];
3766 3766 
 			$temp_array['pilot_id'] = $row['pilot_id'];
 
@@ -3778,11 +3778,11 @@  discard block
 
 block discarded – undo
3778 3778 
 	* @return Array the pilots list
3779 3779 
 	*
3780 3780 
 	*/
3781 
-	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3781 
+	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3782 3782 
 	{
3783 3783 
 		global $globalDBdriver;
3784 
-		$filter_query = $this->getFilter($filters,true,true);
3785 
-		$query  = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3784 
+		$filter_query = $this->getFilter($filters, true, true);
3785 
+		$query = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3786 3786 
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3787 3787 
                 if ($olderthanmonths > 0) {
3788 3788 
             		if ($globalDBdriver == 'mysql') {
 
@@ -3808,7 +3808,7 @@  discard block
 
 block discarded – undo
3808 3808 
 		$airline_array = array();
3809 3809 
 		$temp_array = array();
3810 3810
3811 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3811 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3812 3812 
 		{
3813 3813 
 			$temp_array['owner_name'] = $row['owner_name'];
3814 3814 
 			$temp_array['owner_count'] = $row['owner_count'];
 
@@ -3823,11 +3823,11 @@  discard block
 
 block discarded – undo
3823 3823 
 	* @return Array the pilots list
3824 3824 
 	*
3825 3825 
 	*/
3826 
-	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3826 
+	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3827 3827 
 	{
3828 3828 
 		global $globalDBdriver;
3829 
-		$filter_query = $this->getFilter($filters,true,true);
3830 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3829 
+		$filter_query = $this->getFilter($filters, true, true);
3830 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3831 3831 
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3832 3832 
                 if ($olderthanmonths > 0) {
3833 3833 
             		if ($globalDBdriver == 'mysql') {
 
@@ -3853,7 +3853,7 @@  discard block
 
 block discarded – undo
3853 3853 
 		$airline_array = array();
3854 3854 
 		$temp_array = array();
3855 3855
3856 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3856 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3857 3857 
 		{
3858 3858 
 			$temp_array['owner_name'] = $row['owner_name'];
3859 3859 
 			$temp_array['owner_count'] = $row['owner_count'];
 
@@ -3869,11 +3869,11 @@  discard block
 
 block discarded – undo
3869 3869 
 	* @return Array the airline list
3870 3870 
 	*
3871 3871 
 	*/
3872 
-	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
3872 
+	public function countAllAirlinesByAircraft($aircraft_icao, $filters = array())
3873 3873 
 	{
3874 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3875 
-		$filter_query = $this->getFilter($filters,true,true);
3876 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3874 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3875 
+		$filter_query = $this->getFilter($filters, true, true);
3876 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3877 3877 
 		 	    FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.aircraft_icao = :aircraft_icao
3878 3878 
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country
3879 3879 
 			    ORDER BY airline_count DESC";
 
@@ -3885,7 +3885,7 @@  discard block
 
 block discarded – undo
3885 3885 
 		$airline_array = array();
3886 3886 
 		$temp_array = array();
3887 3887
3888 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3888 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3889 3889 
 		{
3890 3890 
 			$temp_array['airline_name'] = $row['airline_name'];
3891 3891 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -3905,11 +3905,11 @@  discard block
 
 block discarded – undo
3905 3905 
 	* @return Array the airline country list
3906 3906 
 	*
3907 3907 
 	*/
3908 
-	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
3908 
+	public function countAllAirlineCountriesByAircraft($aircraft_icao, $filters = array())
3909 3909 
 	{
3910 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3911 
-		$filter_query = $this->getFilter($filters,true,true);
3912 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3910 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3911 
+		$filter_query = $this->getFilter($filters, true, true);
3912 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3913 3913 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
3914 3914 
                     GROUP BY spotter_output.airline_country
3915 3915 
 					ORDER BY airline_country_count DESC
 
@@ -3922,7 +3922,7 @@  discard block
 
 block discarded – undo
3922 3922 
 		$airline_country_array = array();
3923 3923 
 		$temp_array = array();
3924 3924
3925 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3925 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3926 3926 
 		{
3927 3927 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
3928 3928 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -3941,11 +3941,11 @@  discard block
 
 block discarded – undo
3941 3941 
 	* @return Array the airline list
3942 3942 
 	*
3943 3943 
 	*/
3944 
-	public function countAllAirlinesByAirport($airport_icao,$filters = array())
3944 
+	public function countAllAirlinesByAirport($airport_icao, $filters = array())
3945 3945 
 	{
3946 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
3947 
-		$filter_query = $this->getFilter($filters,true,true);
3948 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3946 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
3947 
+		$filter_query = $this->getFilter($filters, true, true);
3948 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3949 3949 
 		    FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao )
3950 3950 
                     GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country
3951 3951 
 		    ORDER BY airline_count DESC";
 
@@ -3957,7 +3957,7 @@  discard block
 
 block discarded – undo
3957 3957 
 		$airline_array = array();
3958 3958 
 		$temp_array = array();
3959 3959
3960 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3960 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3961 3961 
 		{
3962 3962 
 			$temp_array['airline_name'] = $row['airline_name'];
3963 3963 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -3976,11 +3976,11 @@  discard block
 
 block discarded – undo
3976 3976 
 	* @return Array the airline country list
3977 3977 
 	*
3978 3978 
 	*/
3979 
-	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
3979 
+	public function countAllAirlineCountriesByAirport($airport_icao, $filters = array())
3980 3980 
 	{
3981 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
3982 
-		$filter_query = $this->getFilter($filters,true,true);
3983 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3981 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
3982 
+		$filter_query = $this->getFilter($filters, true, true);
3983 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3984 3984 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao )
3985 3985 
 					GROUP BY spotter_output.airline_country
3986 3986 
 					ORDER BY airline_country_count DESC
 
@@ -3993,7 +3993,7 @@  discard block
 
 block discarded – undo
3993 3993 
 		$airline_country_array = array();
3994 3994 
 		$temp_array = array();
3995 3995
3996 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3996 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3997 3997 
 		{
3998 3998 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
3999 3999 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4010,11 +4010,11 @@  discard block
 
 block discarded – undo
4010 4010 
 	* @return Array the airline list
4011 4011 
 	*
4012 4012 
 	*/
4013 
-	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
4013 
+	public function countAllAirlinesByManufacturer($aircraft_manufacturer, $filters = array())
4014 4014 
 	{
4015 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4016 
-		$filter_query = $this->getFilter($filters,true,true);
4017 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4015 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4016 
+		$filter_query = $this->getFilter($filters, true, true);
4017 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4018 4018 
 		 			FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4019 4019 
 					GROUP BY spotter_output.airline_name
4020 4020 
 					ORDER BY airline_count DESC";
 
@@ -4025,7 +4025,7 @@  discard block
 
 block discarded – undo
4025 4025 
 		$airline_array = array();
4026 4026 
 		$temp_array = array();
4027 4027
4028 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4028 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4029 4029 
 		{
4030 4030 
 			$temp_array['airline_name'] = $row['airline_name'];
4031 4031 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4045,11 +4045,11 @@  discard block
 
 block discarded – undo
4045 4045 
 	* @return Array the airline country list
4046 4046 
 	*
4047 4047 
 	*/
4048 
-	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
4048 
+	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer, $filters = array())
4049 4049 
 	{
4050 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4051 
-		$filter_query = $this->getFilter($filters,true,true);
4052 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4050 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4051 
+		$filter_query = $this->getFilter($filters, true, true);
4052 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4053 4053 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4054 4054 
 					GROUP BY spotter_output.airline_country
4055 4055 
 					ORDER BY airline_country_count DESC
 
@@ -4062,7 +4062,7 @@  discard block
 
 block discarded – undo
4062 4062 
 		$airline_country_array = array();
4063 4063 
 		$temp_array = array();
4064 4064
4065 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4065 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4066 4066 
 		{
4067 4067 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4068 4068 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4078,11 +4078,11 @@  discard block
 
 block discarded – undo
4078 4078 
 	* @return Array the airline list
4079 4079 
 	*
4080 4080 
 	*/
4081 
-	public function countAllAirlinesByDate($date,$filters = array())
4081 
+	public function countAllAirlinesByDate($date, $filters = array())
4082 4082 
 	{
4083 4083 
 		global $globalTimezone, $globalDBdriver;
4084 
-		$filter_query = $this->getFilter($filters,true,true);
4085 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4084 
+		$filter_query = $this->getFilter($filters, true, true);
4085 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4086 4086 
 		if ($globalTimezone != '') {
4087 4087 
 			date_default_timezone_set($globalTimezone);
4088 4088 
 			$datetime = new DateTime($date);
 
@@ -4090,12 +4090,12 @@  discard block
 
 block discarded – undo
4090 4090 
 		} else $offset = '+00:00';
4091 4091
4092 4092 
 		if ($globalDBdriver == 'mysql') {
4093 
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4093 
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4094 4094 
 		 			FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
4095 4095 
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country
4096 4096 
 					ORDER BY airline_count DESC";
4097 4097 
 		} else {
4098 
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4098 
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4099 4099 
 		 			FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
4100 4100 
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country
4101 4101 
 					ORDER BY airline_count DESC";
 
@@ -4106,7 +4106,7 @@  discard block
 
 block discarded – undo
4106 4106
4107 4107 
 		$airline_array = array();
4108 4108 
 		$temp_array = array();
4109 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4109 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4110 4110 
 		{
4111 4111 
 			$temp_array['airline_name'] = $row['airline_name'];
4112 4112 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4126,11 +4126,11 @@  discard block
 
 block discarded – undo
4126 4126 
 	* @return Array the airline country list
4127 4127 
 	*
4128 4128 
 	*/
4129 
-	public function countAllAirlineCountriesByDate($date,$filters = array())
4129 
+	public function countAllAirlineCountriesByDate($date, $filters = array())
4130 4130 
 	{
4131 4131 
 		global $globalTimezone, $globalDBdriver;
4132 
-		$filter_query = $this->getFilter($filters,true,true);
4133 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4132 
+		$filter_query = $this->getFilter($filters, true, true);
4133 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4134 4134 
 		if ($globalTimezone != '') {
4135 4135 
 			date_default_timezone_set($globalTimezone);
4136 4136 
 			$datetime = new DateTime($date);
 
@@ -4138,13 +4138,13 @@  discard block
 
 block discarded – undo
4138 4138 
 		} else $offset = '+00:00';
4139 4139
4140 4140 
 		if ($globalDBdriver == 'mysql') {
4141 
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4141 
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4142 4142 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
4143 4143 
 					GROUP BY spotter_output.airline_country
4144 4144 
 					ORDER BY airline_country_count DESC
4145 4145 
 					LIMIT 10 OFFSET 0";
4146 4146 
 		} else {
4147 
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4147 
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4148 4148 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
4149 4149 
 					GROUP BY spotter_output.airline_country
4150 4150 
 					ORDER BY airline_country_count DESC
 
@@ -4156,7 +4156,7 @@  discard block
 
 block discarded – undo
4156 4156
4157 4157 
 		$airline_country_array = array();
4158 4158 
 		$temp_array = array();
4159 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4159 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4160 4160 
 		{
4161 4161 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4162 4162 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4173,11 +4173,11 @@  discard block
 
 block discarded – undo
4173 4173 
 	* @return Array the airline list
4174 4174 
 	*
4175 4175 
 	*/
4176 
-	public function countAllAirlinesByIdent($ident,$filters = array())
4176 
+	public function countAllAirlinesByIdent($ident, $filters = array())
4177 4177 
 	{
4178 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
4179 
-		$filter_query = $this->getFilter($filters,true,true);
4180 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4178 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
4179 
+		$filter_query = $this->getFilter($filters, true, true);
4180 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4181 4181 
 		 		FROM spotter_output".$filter_query." spotter_output.ident = :ident
4182 4182 
 				GROUP BY spotter_output.airline_name
4183 4183 
 				ORDER BY airline_count DESC";
 
@@ -4189,7 +4189,7 @@  discard block
 
 block discarded – undo
4189 4189 
 		$airline_array = array();
4190 4190 
 		$temp_array = array();
4191 4191
4192 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4192 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4193 4193 
 		{
4194 4194 
 			$temp_array['airline_name'] = $row['airline_name'];
4195 4195 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4207,25 +4207,25 @@  discard block
 
 block discarded – undo
4207 4207 
 	* @return Array the airline list
4208 4208 
 	*
4209 4209 
 	*/
4210 
-	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
4210 
+	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
4211 4211 
 	{
4212 
-		$filter_query = $this->getFilter($filters,true,true);
4213 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
4214 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
4212 
+		$filter_query = $this->getFilter($filters, true, true);
4213 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
4214 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
4215 4215
4216 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4216 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4217 4217 
 		 			FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
4218 4218 
 					GROUP BY spotter_output.airline_name
4219 4219 
 					ORDER BY airline_count DESC";
4220 4220
4221 4221
4222 4222 
 		$sth = $this->db->prepare($query);
4223 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
4223 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
4224 4224
4225 4225 
 		$airline_array = array();
4226 4226 
 		$temp_array = array();
4227 4227
4228 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4228 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4229 4229 
 		{
4230 4230 
 			$temp_array['airline_name'] = $row['airline_name'];
4231 4231 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4243,13 +4243,13 @@  discard block
 
 block discarded – undo
4243 4243 
 	* @return Array the airline country list
4244 4244 
 	*
4245 4245 
 	*/
4246 
-	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
4246 
+	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
4247 4247 
 	{
4248 
-		$filter_query = $this->getFilter($filters,true,true);
4249 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
4250 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
4248 
+		$filter_query = $this->getFilter($filters, true, true);
4249 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
4250 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
4251 4251
4252 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4252 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4253 4253 
 		 		FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
4254 4254 
 				GROUP BY spotter_output.airline_country
4255 4255 
 				ORDER BY airline_country_count DESC
 
@@ -4257,11 +4257,11 @@  discard block
 
 block discarded – undo
4257 4257
4258 4258
4259 4259 
 		$sth = $this->db->prepare($query);
4260 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
4260 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
4261 4261
4262 4262 
 		$airline_country_array = array();
4263 4263 
 		$temp_array = array();
4264 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4264 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4265 4265 
 		{
4266 4266 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4267 4267 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4279,11 +4279,11 @@  discard block
 
 block discarded – undo
4279 4279 
 	* @return Array the airline list
4280 4280 
 	*
4281 4281 
 	*/
4282 
-	public function countAllAirlinesByCountry($country,$filters = array())
4282 
+	public function countAllAirlinesByCountry($country, $filters = array())
4283 4283 
 	{
4284 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
4285 
-		$filter_query = $this->getFilter($filters,true,true);
4286 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4284 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
4285 
+		$filter_query = $this->getFilter($filters, true, true);
4286 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4287 4287 
 		 	    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
4288 4288 
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country
4289 4289 
 			    ORDER BY airline_count DESC";
 
@@ -4294,7 +4294,7 @@  discard block
 
 block discarded – undo
4294 4294
4295 4295 
 		$airline_array = array();
4296 4296 
 		$temp_array = array();
4297 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4297 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4298 4298 
 		{
4299 4299 
 			$temp_array['airline_name'] = $row['airline_name'];
4300 4300 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4313,11 +4313,11 @@  discard block
 
 block discarded – undo
4313 4313 
 	* @return Array the airline country list
4314 4314 
 	*
4315 4315 
 	*/
4316 
-	public function countAllAirlineCountriesByCountry($country,$filters = array())
4316 
+	public function countAllAirlineCountriesByCountry($country, $filters = array())
4317 4317 
 	{
4318 
-		$filter_query = $this->getFilter($filters,true,true);
4319 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
4320 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4318 
+		$filter_query = $this->getFilter($filters, true, true);
4319 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
4320 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4321 4321 
 		 		FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
4322 4322 
 				GROUP BY spotter_output.airline_country
4323 4323 
 				ORDER BY airline_country_count DESC
 
@@ -4329,7 +4329,7 @@  discard block
 
 block discarded – undo
4329 4329
4330 4330 
 		$airline_country_array = array();
4331 4331 
 		$temp_array = array();
4332 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4332 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4333 4333 
 		{
4334 4334 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4335 4335 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4348,8 +4348,8 @@  discard block
 
 block discarded – undo
4348 4348 
 	*/
4349 4349 
 	public function countAllAirlineCountries($limit = true, $filters = array())
4350 4350 
 	{
4351 
-		$filter_query = $this->getFilter($filters,true,true);
4352 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4351 
+		$filter_query = $this->getFilter($filters, true, true);
4352 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4353 4353 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.airline_country <> 'NA'
4354 4354 
 					GROUP BY spotter_output.airline_country
4355 4355 
 					ORDER BY airline_country_count DESC";
 
@@ -4360,7 +4360,7 @@  discard block
 
 block discarded – undo
4360 4360
4361 4361 
 		$airline_array = array();
4362 4362 
 		$temp_array = array();
4363 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4363 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4364 4364 
 		{
4365 4365 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4366 4366 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4376,11 +4376,11 @@  discard block
 
 block discarded – undo
4376 4376 
 	* @return Array the airline country list
4377 4377 
 	*
4378 4378 
 	*/
4379 
-	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4379 
+	public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4380 4380 
 	{
4381 4381 
 		global $globalDBdriver;
4382 4382 
 		//$filter_query = $this->getFilter($filters,true,true);
4383 
-		$Connection= new Connection($this->db);
4383 
+		$Connection = new Connection($this->db);
4384 4384 
 		if (!$Connection->tableExists('countries')) return array();
4385 4385 
 		/*
4386 4386 
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -4395,7 +4395,7 @@  discard block
 
 block discarded – undo
4395 4395 
 */
4396 4396 
 		require_once('class.SpotterLive.php');
4397 4397 
 		$SpotterLive = new SpotterLive();
4398 
-		$filter_query = $SpotterLive->getFilter($filters,true,true);
4398 
+		$filter_query = $SpotterLive->getFilter($filters, true, true);
4399 4399 
 		$filter_query .= ' over_country IS NOT NULL';
4400 4400 
                 if ($olderthanmonths > 0) {
4401 4401 
 			if ($globalDBdriver == 'mysql') {
 
@@ -4422,7 +4422,7 @@  discard block
 
 block discarded – undo
4422 4422 
 		$flight_array = array();
4423 4423 
 		$temp_array = array();
4424 4424
4425 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4425 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4426 4426 
 		{
4427 4427 
 			$temp_array['flight_count'] = $row['nb'];
4428 4428 
 			$temp_array['flight_country'] = $row['name'];
 
@@ -4440,12 +4440,12 @@  discard block
 
 block discarded – undo
4440 4440 
 	* @return Array the aircraft list
4441 4441 
 	*
4442 4442 
 	*/
4443 
-	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4443 
+	public function countAllAircraftTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4444 4444 
 	{
4445 4445 
 		global $globalDBdriver;
4446 
-		$filter_query = $this->getFilter($filters,true,true);
4446 
+		$filter_query = $this->getFilter($filters, true, true);
4447 4447
4448 
-		$query  = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4448 
+		$query = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4449 4449 
 		    FROM spotter_output ".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> ''";
4450 4450 
 		if ($olderthanmonths > 0) {
4451 4451 
 			if ($globalDBdriver == 'mysql') {
 
@@ -4470,7 +4470,7 @@  discard block
 
 block discarded – undo
4470 4470
4471 4471 
 		$aircraft_array = array();
4472 4472 
 		$temp_array = array();
4473 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4473 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4474 4474 
 		{
4475 4475 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4476 4476 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4487,11 +4487,11 @@  discard block
 
 block discarded – undo
4487 4487 
 	* @return Array the aircraft list
4488 4488 
 	*
4489 4489 
 	*/
4490 
-	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4490 
+	public function countAllAircraftTypesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4491 4491 
 	{
4492 4492 
 		global $globalDBdriver;
4493 
-		$filter_query = $this->getFilter($filters,true,true);
4494 
-		$query  = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4493 
+		$filter_query = $this->getFilter($filters, true, true);
4494 
+		$query = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4495 4495 
 		    FROM spotter_output".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> '' AND spotter_output.airline_icao <>'' AND spotter_output.airline_icao <> 'NA' ";
4496 4496 
 		if ($olderthanmonths > 0) {
4497 4497 
 			if ($globalDBdriver == 'mysql') {
 
@@ -4516,7 +4516,7 @@  discard block
 
 block discarded – undo
4516 4516
4517 4517 
 		$aircraft_array = array();
4518 4518 
 		$temp_array = array();
4519 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4519 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4520 4520 
 		{
4521 4521 
 			$temp_array['airline_icao'] = $row['airline_icao'];
4522 4522 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
 
@@ -4534,11 +4534,11 @@  discard block
 
 block discarded – undo
4534 4534 
 	* @return Array the aircraft list
4535 4535 
 	*
4536 4536 
 	*/
4537 
-	public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4537 
+	public function countAllAircraftTypesByMonths($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4538 4538 
 	{
4539 4539 
 		global $globalDBdriver;
4540 
-		$filter_query = $this->getFilter($filters,true,true);
4541 
-		$query  = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4540 
+		$filter_query = $this->getFilter($filters, true, true);
4541 
+		$query = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4542 4542 
 		    FROM spotter_output".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> '' AND spotter_output.airline_icao <>'' AND spotter_output.airline_icao <> 'NA' ";
4543 4543 
 		if ($olderthanmonths > 0) {
4544 4544 
 			if ($globalDBdriver == 'mysql') {
 
@@ -4563,7 +4563,7 @@  discard block
 
 block discarded – undo
4563 4563
4564 4564 
 		$aircraft_array = array();
4565 4565 
 		$temp_array = array();
4566 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4566 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4567 4567 
 		{
4568 4568 
 			//$temp_array['airline_icao'] = $row['airline_icao'];
4569 4569 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
 
@@ -4582,13 +4582,13 @@  discard block
 
 block discarded – undo
4582 4582 
 	* @return Array the aircraft list
4583 4583 
 	*
4584 4584 
 	*/
4585 
-	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
4585 
+	public function countAllAircraftRegistrationByAircraft($aircraft_icao, $filters = array())
4586 4586 
 	{
4587 4587 
 		$Image = new Image($this->db);
4588 
-		$filter_query = $this->getFilter($filters,true,true);
4589 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
4588 
+		$filter_query = $this->getFilter($filters, true, true);
4589 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
4590 4590
4591 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4591 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4592 4592 
 				FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_icao = :aircraft_icao
4593 4593 
 				GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4594 4594 
 				ORDER BY registration_count DESC";
 
@@ -4599,14 +4599,14 @@  discard block
 
 block discarded – undo
4599 4599 
 		$aircraft_array = array();
4600 4600 
 		$temp_array = array();
4601 4601
4602 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4602 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4603 4603 
 		{
4604 4604 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4605 4605 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4606 4606 
 			$temp_array['registration'] = $row['registration'];
4607 4607 
 			$temp_array['airline_name'] = $row['airline_name'];
4608 4608 
 			$temp_array['image_thumbnail'] = "";
4609 
-			if($row['registration'] != "")
4609 
+			if ($row['registration'] != "")
4610 4610 
 			{
4611 4611 
 				$image_array = $Image->getSpotterImage($row['registration']);
4612 4612 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -4625,11 +4625,11 @@  discard block
 
 block discarded – undo
4625 4625 
 	* @return Array the aircraft list
4626 4626 
 	*
4627 4627 
 	*/
4628 
-	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
4628 
+	public function countAllAircraftTypesByAirline($airline_icao, $filters = array())
4629 4629 
 	{
4630 
-		$filter_query = $this->getFilter($filters,true,true);
4631 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4632 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4630 
+		$filter_query = $this->getFilter($filters, true, true);
4631 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4632 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4633 4633 
 			    FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND spotter_output.airline_icao = :airline_icao
4634 4634 
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
4635 4635 
 			    ORDER BY aircraft_icao_count DESC";
 
@@ -4640,7 +4640,7 @@  discard block
 
 block discarded – undo
4640 4640 
 		$aircraft_array = array();
4641 4641 
 		$temp_array = array();
4642 4642
4643 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4643 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4644 4644 
 		{
4645 4645 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4646 4646 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4658,13 +4658,13 @@  discard block
 
 block discarded – undo
4658 4658 
 	* @return Array the aircraft list
4659 4659 
 	*
4660 4660 
 	*/
4661 
-	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
4661 
+	public function countAllAircraftRegistrationByAirline($airline_icao, $filters = array())
4662 4662 
 	{
4663 
-		$filter_query = $this->getFilter($filters,true,true);
4663 
+		$filter_query = $this->getFilter($filters, true, true);
4664 4664 
 		$Image = new Image($this->db);
4665 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4665 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4666 4666
4667 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4667 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4668 4668 
 			    FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.airline_icao = :airline_icao
4669 4669 
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
4670 4670 
 			    ORDER BY registration_count DESC";
 
@@ -4674,14 +4674,14 @@  discard block
 
 block discarded – undo
4674 4674
4675 4675 
 		$aircraft_array = array();
4676 4676 
 		$temp_array = array();
4677 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4677 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4678 4678 
 		{
4679 4679 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4680 4680 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4681 4681 
 			$temp_array['registration'] = $row['registration'];
4682 4682 
 			$temp_array['airline_name'] = $row['airline_name'];
4683 4683 
 			$temp_array['image_thumbnail'] = "";
4684 
-			if($row['registration'] != "")
4684 
+			if ($row['registration'] != "")
4685 4685 
 			{
4686 4686 
 				$image_array = $Image->getSpotterImage($row['registration']);
4687 4687 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -4700,11 +4700,11 @@  discard block
 
 block discarded – undo
4700 4700 
 	* @return Array the aircraft list
4701 4701 
 	*
4702 4702 
 	*/
4703 
-	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
4703 
+	public function countAllAircraftManufacturerByAirline($airline_icao, $filters = array())
4704 4704 
 	{
4705 
-		$filter_query = $this->getFilter($filters,true,true);
4706 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4707 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
4705 
+		$filter_query = $this->getFilter($filters, true, true);
4706 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4707 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
4708 4708 
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.airline_icao = :airline_icao
4709 4709 
 				GROUP BY spotter_output.aircraft_manufacturer
4710 4710 
 				ORDER BY aircraft_manufacturer_count DESC";
 
@@ -4715,7 +4715,7 @@  discard block
 
 block discarded – undo
4715 4715 
 		$aircraft_array = array();
4716 4716 
 		$temp_array = array();
4717 4717
4718 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4718 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4719 4719 
 		{
4720 4720 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
4721 4721 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -4732,12 +4732,12 @@  discard block
 
 block discarded – undo
4732 4732 
 	* @return Array the aircraft list
4733 4733 
 	*
4734 4734 
 	*/
4735 
-	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
4735 
+	public function countAllAircraftTypesByAirport($airport_icao, $filters = array())
4736 4736 
 	{
4737 
-		$filter_query = $this->getFilter($filters,true,true);
4738 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4737 
+		$filter_query = $this->getFilter($filters, true, true);
4738 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4739 4739
4740 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4740 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4741 4741 
 				FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
4742 4742 
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
4743 4743 
 				ORDER BY aircraft_icao_count DESC";
 
@@ -4747,7 +4747,7 @@  discard block
 
 block discarded – undo
4747 4747
4748 4748 
 		$aircraft_array = array();
4749 4749 
 		$temp_array = array();
4750 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4750 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4751 4751 
 		{
4752 4752 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4753 4753 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4765,13 +4765,13 @@  discard block
 
 block discarded – undo
4765 4765 
 	* @return Array the aircraft list
4766 4766 
 	*
4767 4767 
 	*/
4768 
-	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
4768 
+	public function countAllAircraftRegistrationByAirport($airport_icao, $filters = array())
4769 4769 
 	{
4770 
-		$filter_query = $this->getFilter($filters,true,true);
4770 
+		$filter_query = $this->getFilter($filters, true, true);
4771 4771 
 		$Image = new Image($this->db);
4772 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4772 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4773 4773
4774 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4774 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4775 4775 
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
4776 4776 
                     GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
4777 4777 
 		    ORDER BY registration_count DESC";
 
@@ -4781,14 +4781,14 @@  discard block
 
 block discarded – undo
4781 4781
4782 4782 
 		$aircraft_array = array();
4783 4783 
 		$temp_array = array();
4784 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4784 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4785 4785 
 		{
4786 4786 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4787 4787 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4788 4788 
 			$temp_array['registration'] = $row['registration'];
4789 4789 
 			$temp_array['airline_name'] = $row['airline_name'];
4790 4790 
 			$temp_array['image_thumbnail'] = "";
4791 
-			if($row['registration'] != "")
4791 
+			if ($row['registration'] != "")
4792 4792 
 			{
4793 4793 
 				$image_array = $Image->getSpotterImage($row['registration']);
4794 4794 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -4806,11 +4806,11 @@  discard block
 
 block discarded – undo
4806 4806 
 	* @return Array the aircraft list
4807 4807 
 	*
4808 4808 
 	*/
4809 
-	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
4809 
+	public function countAllAircraftManufacturerByAirport($airport_icao, $filters = array())
4810 4810 
 	{
4811 
-		$filter_query = $this->getFilter($filters,true,true);
4812 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4813 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
4811 
+		$filter_query = $this->getFilter($filters, true, true);
4812 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4813 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
4814 4814 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
4815 4815 
                     GROUP BY spotter_output.aircraft_manufacturer
4816 4816 
 					ORDER BY aircraft_manufacturer_count DESC";
 
@@ -4821,7 +4821,7 @@  discard block
 
 block discarded – undo
4821 4821
4822 4822 
 		$aircraft_array = array();
4823 4823 
 		$temp_array = array();
4824 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4824 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4825 4825 
 		{
4826 4826 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
4827 4827 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -4836,12 +4836,12 @@  discard block
 
 block discarded – undo
4836 4836 
 	* @return Array the aircraft list
4837 4837 
 	*
4838 4838 
 	*/
4839 
-	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
4839 
+	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer, $filters = array())
4840 4840 
 	{
4841 
-		$filter_query = $this->getFilter($filters,true,true);
4842 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4841 
+		$filter_query = $this->getFilter($filters, true, true);
4842 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4843 4843
4844 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4844 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4845 4845 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4846 4846 
                     GROUP BY spotter_output.aircraft_name
4847 4847 
 					ORDER BY aircraft_icao_count DESC";
 
@@ -4850,7 +4850,7 @@  discard block
 
 block discarded – undo
4850 4850 
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
4851 4851 
 		$aircraft_array = array();
4852 4852 
 		$temp_array = array();
4853 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4853 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4854 4854 
 		{
4855 4855 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4856 4856 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4869,11 +4869,11 @@  discard block
 
 block discarded – undo
4869 4869 
 	*/
4870 4870 
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
4871 4871 
 	{
4872 
-		$filter_query = $this->getFilter($filters,true,true);
4872 
+		$filter_query = $this->getFilter($filters, true, true);
4873 4873 
 		$Image = new Image($this->db);
4874 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4874 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4875 4875
4876 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4876 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4877 4877 
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4878 4878 
                     GROUP BY spotter_output.registration
4879 4879 
 					ORDER BY registration_count DESC";
 
@@ -4883,14 +4883,14 @@  discard block
 
 block discarded – undo
4883 4883 
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
4884 4884 
 		$aircraft_array = array();
4885 4885 
 		$temp_array = array();
4886 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4886 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4887 4887 
 		{
4888 4888 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4889 4889 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4890 4890 
 			$temp_array['registration'] = $row['registration'];
4891 4891 
 			$temp_array['airline_name'] = $row['airline_name'];
4892 4892 
 			$temp_array['image_thumbnail'] = "";
4893 
-			if($row['registration'] != "")
4893 
+			if ($row['registration'] != "")
4894 4894 
 			{
4895 4895 
 				$image_array = $Image->getSpotterImage($row['registration']);
4896 4896 
 				$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -4907,11 +4907,11 @@  discard block
 
 block discarded – undo
4907 4907 
 	* @return Array the aircraft list
4908 4908 
 	*
4909 4909 
 	*/
4910 
-	public function countAllAircraftTypesByDate($date,$filters = array())
4910 
+	public function countAllAircraftTypesByDate($date, $filters = array())
4911 4911 
 	{
4912 4912 
 		global $globalTimezone, $globalDBdriver;
4913 
-		$filter_query = $this->getFilter($filters,true,true);
4914 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4913 
+		$filter_query = $this->getFilter($filters, true, true);
4914 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4915 4915 
 		if ($globalTimezone != '') {
4916 4916 
 			date_default_timezone_set($globalTimezone);
4917 4917 
 			$datetime = new DateTime($date);
 
@@ -4919,12 +4919,12 @@  discard block
 
 block discarded – undo
4919 4919 
 		} else $offset = '+00:00';
4920 4920
4921 4921 
 		if ($globalDBdriver == 'mysql') {
4922 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4922 
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4923 4923 
 					FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
4924 4924 
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
4925 4925 
 					ORDER BY aircraft_icao_count DESC";
4926 4926 
 		} else {
4927 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4927 
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4928 4928 
 					FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
4929 4929 
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
4930 4930 
 					ORDER BY aircraft_icao_count DESC";
 
@@ -4935,7 +4935,7 @@  discard block
 
 block discarded – undo
4935 4935
4936 4936 
 		$aircraft_array = array();
4937 4937 
 		$temp_array = array();
4938 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4938 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4939 4939 
 		{
4940 4940 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4941 4941 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4953,12 +4953,12 @@  discard block
 
 block discarded – undo
4953 4953 
 	* @return Array the aircraft list
4954 4954 
 	*
4955 4955 
 	*/
4956 
-	public function countAllAircraftRegistrationByDate($date,$filters = array())
4956 
+	public function countAllAircraftRegistrationByDate($date, $filters = array())
4957 4957 
 	{
4958 4958 
 		global $globalTimezone, $globalDBdriver;
4959 
-		$filter_query = $this->getFilter($filters,true,true);
4959 
+		$filter_query = $this->getFilter($filters, true, true);
4960 4960 
 		$Image = new Image($this->db);
4961 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4961 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4962 4962 
 		if ($globalTimezone != '') {
4963 4963 
 			date_default_timezone_set($globalTimezone);
4964 4964 
 			$datetime = new DateTime($date);
 
@@ -4966,12 +4966,12 @@  discard block
 
 block discarded – undo
4966 4966 
 		} else $offset = '+00:00';
4967 4967
4968 4968 
 		if ($globalDBdriver == 'mysql') {
4969 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4969 
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4970 4970 
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
4971 4971 
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
4972 4972 
 					ORDER BY registration_count DESC";
4973 4973 
 		} else {
4974 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4974 
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4975 4975 
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
4976 4976 
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
4977 4977 
 					ORDER BY registration_count DESC";
 
@@ -4982,14 +4982,14 @@  discard block
 
 block discarded – undo
4982 4982
4983 4983 
 		$aircraft_array = array();
4984 4984 
 		$temp_array = array();
4985 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4985 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4986 4986 
 		{
4987 4987 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4988 4988 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4989 4989 
 			$temp_array['registration'] = $row['registration'];
4990 4990 
 			$temp_array['airline_name'] = $row['airline_name'];
4991 4991 
 			$temp_array['image_thumbnail'] = "";
4992 
-			if($row['registration'] != "")
4992 
+			if ($row['registration'] != "")
4993 4993 
 			{
4994 4994 
 				$image_array = $Image->getSpotterImage($row['registration']);
4995 4995 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5008,11 +5008,11 @@  discard block
 
 block discarded – undo
5008 5008 
 	* @return Array the aircraft manufacturer list
5009 5009 
 	*
5010 5010 
 	*/
5011 
-	public function countAllAircraftManufacturerByDate($date,$filters = array())
5011 
+	public function countAllAircraftManufacturerByDate($date, $filters = array())
5012 5012 
 	{
5013 5013 
 		global $globalTimezone, $globalDBdriver;
5014 
-		$filter_query = $this->getFilter($filters,true,true);
5015 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
5014 
+		$filter_query = $this->getFilter($filters, true, true);
5015 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
5016 5016 
 		if ($globalTimezone != '') {
5017 5017 
 			date_default_timezone_set($globalTimezone);
5018 5018 
 			$datetime = new DateTime($date);
 
@@ -5020,12 +5020,12 @@  discard block
 
 block discarded – undo
5020 5020 
 		} else $offset = '+00:00';
5021 5021
5022 5022 
 		if ($globalDBdriver == 'mysql') {
5023 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5023 
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5024 5024 
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
5025 5025 
 				GROUP BY spotter_output.aircraft_manufacturer
5026 5026 
 				ORDER BY aircraft_manufacturer_count DESC";
5027 5027 
 		} else {
5028 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5028 
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5029 5029 
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
5030 5030 
 				GROUP BY spotter_output.aircraft_manufacturer
5031 5031 
 				ORDER BY aircraft_manufacturer_count DESC";
 
@@ -5037,7 +5037,7 @@  discard block
 
 block discarded – undo
5037 5037 
 		$aircraft_array = array();
5038 5038 
 		$temp_array = array();
5039 5039
5040 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5040 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5041 5041 
 		{
5042 5042 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5043 5043 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5054,11 +5054,11 @@  discard block
 
 block discarded – undo
5054 5054 
 	* @return Array the aircraft list
5055 5055 
 	*
5056 5056 
 	*/
5057 
-	public function countAllAircraftTypesByIdent($ident,$filters = array())
5057 
+	public function countAllAircraftTypesByIdent($ident, $filters = array())
5058 5058 
 	{
5059 
-		$filter_query = $this->getFilter($filters,true,true);
5060 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5061 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5059 
+		$filter_query = $this->getFilter($filters, true, true);
5060 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5061 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5062 5062 
 				FROM spotter_output".$filter_query." spotter_output.ident = :ident
5063 5063 
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
5064 5064 
 				ORDER BY aircraft_icao_count DESC";
 
@@ -5069,7 +5069,7 @@  discard block
 
 block discarded – undo
5069 5069 
 		$aircraft_array = array();
5070 5070 
 		$temp_array = array();
5071 5071
5072 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5072 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5073 5073 
 		{
5074 5074 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5075 5075 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -5087,13 +5087,13 @@  discard block
 
 block discarded – undo
5087 5087 
 	* @return Array the aircraft list
5088 5088 
 	*
5089 5089 
 	*/
5090 
-	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
5090 
+	public function countAllAircraftRegistrationByIdent($ident, $filters = array())
5091 5091 
 	{
5092 
-		$filter_query = $this->getFilter($filters,true,true);
5092 
+		$filter_query = $this->getFilter($filters, true, true);
5093 5093 
 		$Image = new Image($this->db);
5094 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5094 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5095 5095
5096 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5096 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5097 5097 
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.ident = :ident
5098 5098 
                     GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
5099 5099 
 		    ORDER BY registration_count DESC";
 
@@ -5105,14 +5105,14 @@  discard block
 
 block discarded – undo
5105 5105 
 		$aircraft_array = array();
5106 5106 
 		$temp_array = array();
5107 5107
5108 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5108 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5109 5109 
 		{
5110 5110 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5111 5111 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5112 5112 
 			$temp_array['registration'] = $row['registration'];
5113 5113 
 			$temp_array['airline_name'] = $row['airline_name'];
5114 5114 
 			$temp_array['image_thumbnail'] = "";
5115 
-			if($row['registration'] != "")
5115 
+			if ($row['registration'] != "")
5116 5116 
 			{
5117 5117 
 				$image_array = $Image->getSpotterImage($row['registration']);
5118 5118 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5131,11 +5131,11 @@  discard block
 
 block discarded – undo
5131 5131 
 	* @return Array the aircraft manufacturer list
5132 5132 
 	*
5133 5133 
 	*/
5134 
-	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
5134 
+	public function countAllAircraftManufacturerByIdent($ident, $filters = array())
5135 5135 
 	{
5136 
-		$filter_query = $this->getFilter($filters,true,true);
5137 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5138 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5136 
+		$filter_query = $this->getFilter($filters, true, true);
5137 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5138 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5139 5139 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.ident = :ident
5140 5140 
                     GROUP BY spotter_output.aircraft_manufacturer
5141 5141 
 					ORDER BY aircraft_manufacturer_count DESC";
 
@@ -5145,7 +5145,7 @@  discard block
 
 block discarded – undo
5145 5145 
 		$sth->execute(array(':ident' => $ident));
5146 5146 
 		$aircraft_array = array();
5147 5147 
 		$temp_array = array();
5148 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5148 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5149 5149 
 		{
5150 5150 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5151 5151 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5161,24 +5161,24 @@  discard block
 
 block discarded – undo
5161 5161 
 	* @return Array the aircraft list
5162 5162 
 	*
5163 5163 
 	*/
5164 
-	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5164 
+	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5165 5165 
 	{
5166 
-		$filter_query = $this->getFilter($filters,true,true);
5167 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5168 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5166 
+		$filter_query = $this->getFilter($filters, true, true);
5167 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5168 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5169 5169
5170 5170
5171 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5171 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5172 5172 
                     FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
5173 5173 
                     GROUP BY spotter_output.aircraft_name
5174 5174 
 					ORDER BY aircraft_icao_count DESC";
5175 5175
5176 5176
5177 5177 
 		$sth = $this->db->prepare($query);
5178 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5178 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5179 5179 
 		$aircraft_array = array();
5180 5180 
 		$temp_array = array();
5181 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5181 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5182 5182 
 		{
5183 5183 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5184 5184 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -5194,33 +5194,33 @@  discard block
 
 block discarded – undo
5194 5194 
 	* @return Array the aircraft list
5195 5195 
 	*
5196 5196 
 	*/
5197 
-	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5197 
+	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5198 5198 
 	{
5199 
-		$filter_query = $this->getFilter($filters,true,true);
5199 
+		$filter_query = $this->getFilter($filters, true, true);
5200 5200 
 		$Image = new Image($this->db);
5201 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5202 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5201 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5202 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5203 5203
5204 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5204 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5205 5205 
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
5206 5206 
                     GROUP BY spotter_output.registration
5207 5207 
 					ORDER BY registration_count DESC";
5208 5208
5209 5209
5210 5210 
 		$sth = $this->db->prepare($query);
5211 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5211 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5212 5212
5213 5213 
 		$aircraft_array = array();
5214 5214 
 		$temp_array = array();
5215 5215
5216 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5216 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5217 5217 
 		{
5218 5218 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5219 5219 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5220 5220 
 			$temp_array['registration'] = $row['registration'];
5221 5221 
 			$temp_array['airline_name'] = $row['airline_name'];
5222 5222 
 			$temp_array['image_thumbnail'] = "";
5223 
-			if($row['registration'] != "")
5223 
+			if ($row['registration'] != "")
5224 5224 
 			{
5225 5225 
 				$image_array = $Image->getSpotterImage($row['registration']);
5226 5226 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5240,25 +5240,25 @@  discard block
 
 block discarded – undo
5240 5240 
 	* @return Array the aircraft manufacturer list
5241 5241 
 	*
5242 5242 
 	*/
5243 
-	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5243 
+	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5244 5244 
 	{
5245 
-		$filter_query = $this->getFilter($filters,true,true);
5246 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5247 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5245 
+		$filter_query = $this->getFilter($filters, true, true);
5246 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5247 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5248 5248
5249 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5249 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5250 5250 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
5251 5251 
                     GROUP BY spotter_output.aircraft_manufacturer
5252 5252 
 					ORDER BY aircraft_manufacturer_count DESC";
5253 5253
5254 5254
5255 5255 
 		$sth = $this->db->prepare($query);
5256 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5256 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5257 5257
5258 5258 
 		$aircraft_array = array();
5259 5259 
 		$temp_array = array();
5260 5260
5261 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5261 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5262 5262 
 		{
5263 5263 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5264 5264 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5278,11 +5278,11 @@  discard block
 
 block discarded – undo
5278 5278 
 	* @return Array the aircraft list
5279 5279 
 	*
5280 5280 
 	*/
5281 
-	public function countAllAircraftTypesByCountry($country,$filters = array())
5281 
+	public function countAllAircraftTypesByCountry($country, $filters = array())
5282 5282 
 	{
5283 
-		$filter_query = $this->getFilter($filters,true,true);
5284 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5285 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5283 
+		$filter_query = $this->getFilter($filters, true, true);
5284 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5285 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5286 5286 
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
5287 5287 
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
5288 5288 
 			    ORDER BY aircraft_icao_count DESC";
 
@@ -5294,7 +5294,7 @@  discard block
 
 block discarded – undo
5294 5294 
 		$aircraft_array = array();
5295 5295 
 		$temp_array = array();
5296 5296
5297 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5297 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5298 5298 
 		{
5299 5299 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5300 5300 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -5313,12 +5313,12 @@  discard block
 
 block discarded – undo
5313 5313 
 	* @return Array the aircraft list
5314 5314 
 	*
5315 5315 
 	*/
5316 
-	public function countAllAircraftRegistrationByCountry($country,$filters = array())
5316 
+	public function countAllAircraftRegistrationByCountry($country, $filters = array())
5317 5317 
 	{
5318 
-		$filter_query = $this->getFilter($filters,true,true);
5318 
+		$filter_query = $this->getFilter($filters, true, true);
5319 5319 
 		$Image = new Image($this->db);
5320 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5321 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5320 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5321 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5322 5322 
 			    FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country)
5323 5323 
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
5324 5324 
 			    ORDER BY registration_count DESC";
 
@@ -5330,14 +5330,14 @@  discard block
 
 block discarded – undo
5330 5330 
 		$aircraft_array = array();
5331 5331 
 		$temp_array = array();
5332 5332
5333 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5333 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5334 5334 
 		{
5335 5335 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5336 5336 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5337 5337 
 			$temp_array['registration'] = $row['registration'];
5338 5338 
 			$temp_array['airline_name'] = $row['airline_name'];
5339 5339 
 			$temp_array['image_thumbnail'] = "";
5340 
-			if($row['registration'] != "")
5340 
+			if ($row['registration'] != "")
5341 5341 
 			{
5342 5342 
 				$image_array = $Image->getSpotterImage($row['registration']);
5343 5343 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5357,11 +5357,11 @@  discard block
 
 block discarded – undo
5357 5357 
 	* @return Array the aircraft manufacturer list
5358 5358 
 	*
5359 5359 
 	*/
5360 
-	public function countAllAircraftManufacturerByCountry($country,$filters = array())
5360 
+	public function countAllAircraftManufacturerByCountry($country, $filters = array())
5361 5361 
 	{
5362 
-		$filter_query = $this->getFilter($filters,true,true);
5363 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5364 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5362 
+		$filter_query = $this->getFilter($filters, true, true);
5363 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5364 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5365 5365 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country)
5366 5366 
                     GROUP BY spotter_output.aircraft_manufacturer
5367 5367 
 					ORDER BY aircraft_manufacturer_count DESC";
 
@@ -5373,7 +5373,7 @@  discard block
 
 block discarded – undo
5373 5373 
 		$aircraft_array = array();
5374 5374 
 		$temp_array = array();
5375 5375
5376 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5376 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5377 5377 
 		{
5378 5378 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5379 5379 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5394,8 +5394,8 @@  discard block
 
 block discarded – undo
5394 5394 
 	*/
5395 5395 
 	public function countAllAircraftManufacturers($filters = array())
5396 5396 
 	{
5397 
-		$filter_query = $this->getFilter($filters,true,true);
5398 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5397 
+		$filter_query = $this->getFilter($filters, true, true);
5398 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5399 5399 
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
5400 5400 
                 $query .= " GROUP BY spotter_output.aircraft_manufacturer
5401 5401 
 					ORDER BY aircraft_manufacturer_count DESC
 
@@ -5408,7 +5408,7 @@  discard block
 
 block discarded – undo
5408 5408 
 		$manufacturer_array = array();
5409 5409 
 		$temp_array = array();
5410 5410
5411 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5411 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5412 5412 
 		{
5413 5413 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5414 5414 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5427,12 +5427,12 @@  discard block
 
 block discarded – undo
5427 5427 
 	* @return Array the aircraft list
5428 5428 
 	*
5429 5429 
 	*/
5430 
-	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5430 
+	public function countAllAircraftRegistrations($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5431 5431 
 	{
5432 5432 
 		global $globalDBdriver;
5433 5433 
 		$Image = new Image($this->db);
5434 
-		$filter_query = $this->getFilter($filters,true,true);
5435 
-		$query  = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name
5434 
+		$filter_query = $this->getFilter($filters, true, true);
5435 
+		$query = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name
5436 5436 
                     FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'";
5437 5437 
                 if ($olderthanmonths > 0) {
5438 5438 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5460,7 +5460,7 @@  discard block
 
 block discarded – undo
5460 5460 
 		$aircraft_array = array();
5461 5461 
 		$temp_array = array();
5462 5462
5463 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5463 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5464 5464 
 		{
5465 5465 
 			$temp_array['registration'] = $row['registration'];
5466 5466 
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
 
@@ -5468,7 +5468,7 @@  discard block
 
 block discarded – undo
5468 5468 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5469 5469 
 			$temp_array['airline_name'] = $row['airline_name'];
5470 5470 
 			$temp_array['image_thumbnail'] = "";
5471 
-			if($row['registration'] != "")
5471 
+			if ($row['registration'] != "")
5472 5472 
 			{
5473 5473 
 				$image_array = $Image->getSpotterImage($row['registration']);
5474 5474 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5487,12 +5487,12 @@  discard block
 
 block discarded – undo
5487 5487 
 	* @return Array the aircraft list
5488 5488 
 	*
5489 5489 
 	*/
5490 
-	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5490 
+	public function countAllAircraftRegistrationsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5491 5491 
 	{
5492 5492 
 		global $globalDBdriver;
5493 
-		$filter_query = $this->getFilter($filters,true,true);
5493 
+		$filter_query = $this->getFilter($filters, true, true);
5494 5494 
 		$Image = new Image($this->db);
5495 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name
5495 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name
5496 5496 
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
5497 5497 
                 if ($olderthanmonths > 0) {
5498 5498 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5520,7 +5520,7 @@  discard block
 
 block discarded – undo
5520 5520 
 		$aircraft_array = array();
5521 5521 
 		$temp_array = array();
5522 5522
5523 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5523 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5524 5524 
 		{
5525 5525 
 			$temp_array['registration'] = $row['registration'];
5526 5526 
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
 
@@ -5529,7 +5529,7 @@  discard block
 
 block discarded – undo
5529 5529 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5530 5530 
 			$temp_array['airline_name'] = $row['airline_name'];
5531 5531 
 			$temp_array['image_thumbnail'] = "";
5532 
-			if($row['registration'] != "")
5532 
+			if ($row['registration'] != "")
5533 5533 
 			{
5534 5534 
 				$image_array = $Image->getSpotterImage($row['registration']);
5535 5535 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5548,11 +5548,11 @@  discard block
 
 block discarded – undo
5548 5548 
 	* @return Array the airport list
5549 5549 
 	*
5550 5550 
 	*/
5551 
-	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5551 
+	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5552 5552 
 	{
5553 5553 
 		global $globalDBdriver;
5554 
-		$filter_query = $this->getFilter($filters,true,true);
5555 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5554 
+		$filter_query = $this->getFilter($filters, true, true);
5555 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5556 5556 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA'";
5557 5557 
                 if ($olderthanmonths > 0) {
5558 5558 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5581,7 +5581,7 @@  discard block
 
 block discarded – undo
5581 5581 
 		$airport_array = array();
5582 5582 
 		$temp_array = array();
5583 5583
5584 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5584 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5585 5585 
 		{
5586 5586 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5587 5587 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5600,11 +5600,11 @@  discard block
 
 block discarded – undo
5600 5600 
 	* @return Array the airport list
5601 5601 
 	*
5602 5602 
 	*/
5603 
-	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5603 
+	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5604 5604 
 	{
5605 5605 
 		global $globalDBdriver;
5606 
-		$filter_query = $this->getFilter($filters,true,true);
5607 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5606 
+		$filter_query = $this->getFilter($filters, true, true);
5607 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5608 5608 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' ";
5609 5609 
                 if ($olderthanmonths > 0) {
5610 5610 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5633,7 +5633,7 @@  discard block
 
 block discarded – undo
5633 5633 
 		$airport_array = array();
5634 5634 
 		$temp_array = array();
5635 5635
5636 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5636 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5637 5637 
 		{
5638 5638 
 			$temp_array['airline_icao'] = $row['airline_icao'];
5639 5639 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -5653,11 +5653,11 @@  discard block
 
 block discarded – undo
5653 5653 
 	* @return Array the airport list
5654 5654 
 	*
5655 5655 
 	*/
5656 
-	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5656 
+	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5657 5657 
 	{
5658 5658 
 		global $globalDBdriver;
5659 
-		$filter_query = $this->getFilter($filters,true,true);
5660 
-		$query  = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5659 
+		$filter_query = $this->getFilter($filters, true, true);
5660 
+		$query = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5661 5661 
 				FROM airport, spotter_output".$filter_query." spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao";
5662 5662 
                 if ($olderthanmonths > 0) {
5663 5663 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5685,7 +5685,7 @@  discard block
 
 block discarded – undo
5685 5685 
 		$airport_array = array();
5686 5686 
 		$temp_array = array();
5687 5687
5688 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5688 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5689 5689 
 		{
5690 5690 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5691 5691 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5704,11 +5704,11 @@  discard block
 
 block discarded – undo
5704 5704 
 	* @return Array the airport list
5705 5705 
 	*
5706 5706 
 	*/
5707 
-	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5707 
+	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5708 5708 
 	{
5709 5709 
 		global $globalDBdriver;
5710 
-		$filter_query = $this->getFilter($filters,true,true);
5711 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5710 
+		$filter_query = $this->getFilter($filters, true, true);
5711 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5712 5712 
 				FROM airport, spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao ";
5713 5713 
                 if ($olderthanmonths > 0) {
5714 5714 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5737,7 +5737,7 @@  discard block
 
 block discarded – undo
5737 5737 
 		$airport_array = array();
5738 5738 
 		$temp_array = array();
5739 5739
5740 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5740 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5741 5741 
 		{
5742 5742 
 			$temp_array['airline_icao'] = $row['airline_icao'];
5743 5743 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -5757,11 +5757,11 @@  discard block
 
 block discarded – undo
5757 5757 
 	* @return Array the airport list
5758 5758 
 	*
5759 5759 
 	*/
5760 
-	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
5760 
+	public function countAllDepartureAirportsByAirline($airline_icao, $filters = array())
5761 5761 
 	{
5762 
-		$filter_query = $this->getFilter($filters,true,true);
5763 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
5764 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5762 
+		$filter_query = $this->getFilter($filters, true, true);
5763 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
5764 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5765 5765 
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao
5766 5766 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5767 5767 
 			    ORDER BY airport_departure_icao_count DESC";
 
@@ -5773,7 +5773,7 @@  discard block
 
 block discarded – undo
5773 5773 
 		$airport_array = array();
5774 5774 
 		$temp_array = array();
5775 5775
5776 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5776 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5777 5777 
 		{
5778 5778 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5779 5779 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5795,11 +5795,11 @@  discard block
 
 block discarded – undo
5795 5795 
 	* @return Array the airport list
5796 5796 
 	*
5797 5797 
 	*/
5798 
-	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
5798 
+	public function countAllDepartureAirportCountriesByAirline($airline_icao, $filters = array())
5799 5799 
 	{
5800 
-		$filter_query = $this->getFilter($filters,true,true);
5801 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
5802 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5800 
+		$filter_query = $this->getFilter($filters, true, true);
5801 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
5802 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5803 5803 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.airline_icao = :airline_icao
5804 5804 
                     GROUP BY spotter_output.departure_airport_country
5805 5805 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -5811,7 +5811,7 @@  discard block
 
 block discarded – undo
5811 5811 
 		$airport_array = array();
5812 5812 
 		$temp_array = array();
5813 5813
5814 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5814 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5815 5815 
 		{
5816 5816 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5817 5817 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -5830,11 +5830,11 @@  discard block
 
 block discarded – undo
5830 5830 
 	* @return Array the airport list
5831 5831 
 	*
5832 5832 
 	*/
5833 
-	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
5833 
+	public function countAllDepartureAirportsByAircraft($aircraft_icao, $filters = array())
5834 5834 
 	{
5835 
-		$filter_query = $this->getFilter($filters,true,true);
5836 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
5837 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5835 
+		$filter_query = $this->getFilter($filters, true, true);
5836 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
5837 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5838 5838 
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao
5839 5839 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5840 5840 
 			    ORDER BY airport_departure_icao_count DESC";
 
@@ -5846,7 +5846,7 @@  discard block
 
 block discarded – undo
5846 5846 
 		$airport_array = array();
5847 5847 
 		$temp_array = array();
5848 5848
5849 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5849 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5850 5850 
 		{
5851 5851 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5852 5852 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5867,11 +5867,11 @@  discard block
 
 block discarded – undo
5867 5867 
 	* @return Array the airport list
5868 5868 
 	*
5869 5869 
 	*/
5870 
-	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
5870 
+	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao, $filters = array())
5871 5871 
 	{
5872 
-		$filter_query = $this->getFilter($filters,true,true);
5873 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
5874 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5872 
+		$filter_query = $this->getFilter($filters, true, true);
5873 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
5874 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5875 5875 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
5876 5876 
                     GROUP BY spotter_output.departure_airport_country
5877 5877 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -5883,7 +5883,7 @@  discard block
 
 block discarded – undo
5883 5883 
 		$airport_array = array();
5884 5884 
 		$temp_array = array();
5885 5885
5886 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5886 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5887 5887 
 		{
5888 5888 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5889 5889 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -5901,11 +5901,11 @@  discard block
 
 block discarded – undo
5901 5901 
 	* @return Array the airport list
5902 5902 
 	*
5903 5903 
 	*/
5904 
-	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
5904 
+	public function countAllDepartureAirportsByRegistration($registration, $filters = array())
5905 5905 
 	{
5906 
-		$filter_query = $this->getFilter($filters,true,true);
5907 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
5908 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5906 
+		$filter_query = $this->getFilter($filters, true, true);
5907 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
5908 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5909 5909 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.registration = :registration
5910 5910 
                     GROUP BY spotter_output.departure_airport_icao
5911 5911 
 					ORDER BY airport_departure_icao_count DESC";
 
@@ -5917,7 +5917,7 @@  discard block
 
 block discarded – undo
5917 5917 
 		$airport_array = array();
5918 5918 
 		$temp_array = array();
5919 5919
5920 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5920 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5921 5921 
 		{
5922 5922 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5923 5923 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5938,11 +5938,11 @@  discard block
 
 block discarded – undo
5938 5938 
 	* @return Array the airport list
5939 5939 
 	*
5940 5940 
 	*/
5941 
-	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
5941 
+	public function countAllDepartureAirportCountriesByRegistration($registration, $filters = array())
5942 5942 
 	{
5943 
-		$filter_query = $this->getFilter($filters,true,true);
5944 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
5945 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5943 
+		$filter_query = $this->getFilter($filters, true, true);
5944 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
5945 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5946 5946 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.registration = :registration
5947 5947 
                     GROUP BY spotter_output.departure_airport_country
5948 5948 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -5954,7 +5954,7 @@  discard block
 
 block discarded – undo
5954 5954 
 		$airport_array = array();
5955 5955 
 		$temp_array = array();
5956 5956
5957 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5957 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5958 5958 
 		{
5959 5959 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5960 5960 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -5972,11 +5972,11 @@  discard block
 
 block discarded – undo
5972 5972 
 	* @return Array the airport list
5973 5973 
 	*
5974 5974 
 	*/
5975 
-	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
5975 
+	public function countAllDepartureAirportsByAirport($airport_icao, $filters = array())
5976 5976 
 	{
5977 
-		$filter_query = $this->getFilter($filters,true,true);
5978 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
5979 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5977 
+		$filter_query = $this->getFilter($filters, true, true);
5978 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
5979 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5980 5980 
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao = :airport_icao
5981 5981 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5982 5982 
 			    ORDER BY airport_departure_icao_count DESC";
 
@@ -5988,7 +5988,7 @@  discard block
 
 block discarded – undo
5988 5988 
 		$airport_array = array();
5989 5989 
 		$temp_array = array();
5990 5990
5991 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5991 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5992 5992 
 		{
5993 5993 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5994 5994 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6009,11 +6009,11 @@  discard block
 
 block discarded – undo
6009 6009 
 	* @return Array the airport list
6010 6010 
 	*
6011 6011 
 	*/
6012 
-	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
6012 
+	public function countAllDepartureAirportCountriesByAirport($airport_icao, $filters = array())
6013 6013 
 	{
6014 
-		$filter_query = $this->getFilter($filters,true,true);
6015 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6016 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6014 
+		$filter_query = $this->getFilter($filters, true, true);
6015 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6016 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6017 6017 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.arrival_airport_icao = :airport_icao
6018 6018 
                     GROUP BY spotter_output.departure_airport_country
6019 6019 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6025,7 +6025,7 @@  discard block
 
 block discarded – undo
6025 6025 
 		$airport_array = array();
6026 6026 
 		$temp_array = array();
6027 6027
6028 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6028 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6029 6029 
 		{
6030 6030 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6031 6031 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6044,11 +6044,11 @@  discard block
 
 block discarded – undo
6044 6044 
 	* @return Array the airport list
6045 6045 
 	*
6046 6046 
 	*/
6047 
-	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
6047 
+	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer, $filters = array())
6048 6048 
 	{
6049 
-		$filter_query = $this->getFilter($filters,true,true);
6050 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6051 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6049 
+		$filter_query = $this->getFilter($filters, true, true);
6050 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6051 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6052 6052 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
6053 6053 
                     GROUP BY spotter_output.departure_airport_icao
6054 6054 
 					ORDER BY airport_departure_icao_count DESC";
 
@@ -6060,7 +6060,7 @@  discard block
 
 block discarded – undo
6060 6060 
 		$airport_array = array();
6061 6061 
 		$temp_array = array();
6062 6062
6063 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6063 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6064 6064 
 		{
6065 6065 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6066 6066 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6081,11 +6081,11 @@  discard block
 
 block discarded – undo
6081 6081 
 	* @return Array the airport list
6082 6082 
 	*
6083 6083 
 	*/
6084 
-	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
6084 
+	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
6085 6085 
 	{
6086 
-		$filter_query = $this->getFilter($filters,true,true);
6087 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6088 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6086 
+		$filter_query = $this->getFilter($filters, true, true);
6087 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6088 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6089 6089 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
6090 6090 
                     GROUP BY spotter_output.departure_airport_country
6091 6091 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6097,7 +6097,7 @@  discard block
 
 block discarded – undo
6097 6097 
 		$airport_array = array();
6098 6098 
 		$temp_array = array();
6099 6099
6100 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6100 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6101 6101 
 		{
6102 6102 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6103 6103 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6115,11 +6115,11 @@  discard block
 
 block discarded – undo
6115 6115 
 	* @return Array the airport list
6116 6116 
 	*
6117 6117 
 	*/
6118 
-	public function countAllDepartureAirportsByDate($date,$filters = array())
6118 
+	public function countAllDepartureAirportsByDate($date, $filters = array())
6119 6119 
 	{
6120 6120 
 		global $globalTimezone, $globalDBdriver;
6121 
-		$filter_query = $this->getFilter($filters,true,true);
6122 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6121 
+		$filter_query = $this->getFilter($filters, true, true);
6122 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6123 6123 
 		if ($globalTimezone != '') {
6124 6124 
 			date_default_timezone_set($globalTimezone);
6125 6125 
 			$datetime = new DateTime($date);
 
@@ -6127,12 +6127,12 @@  discard block
 
 block discarded – undo
6127 6127 
 		} else $offset = '+00:00';
6128 6128
6129 6129 
 		if ($globalDBdriver == 'mysql') {
6130 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6130 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6131 6131 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
6132 6132 
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6133 6133 
 					ORDER BY airport_departure_icao_count DESC";
6134 6134 
 		} else {
6135 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6135 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6136 6136 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
6137 6137 
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6138 6138 
 					ORDER BY airport_departure_icao_count DESC";
 
@@ -6144,7 +6144,7 @@  discard block
 
 block discarded – undo
6144 6144 
 		$airport_array = array();
6145 6145 
 		$temp_array = array();
6146 6146
6147 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6147 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6148 6148 
 		{
6149 6149 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6150 6150 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6165,11 +6165,11 @@  discard block
 
 block discarded – undo
6165 6165 
 	* @return Array the airport list
6166 6166 
 	*
6167 6167 
 	*/
6168 
-	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
6168 
+	public function countAllDepartureAirportCountriesByDate($date, $filters = array())
6169 6169 
 	{
6170 6170 
 		global $globalTimezone, $globalDBdriver;
6171 
-		$filter_query = $this->getFilter($filters,true,true);
6172 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6171 
+		$filter_query = $this->getFilter($filters, true, true);
6172 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6173 6173 
 		if ($globalTimezone != '') {
6174 6174 
 			date_default_timezone_set($globalTimezone);
6175 6175 
 			$datetime = new DateTime($date);
 
@@ -6177,12 +6177,12 @@  discard block
 
 block discarded – undo
6177 6177 
 		} else $offset = '+00:00';
6178 6178
6179 6179 
 		if ($globalDBdriver == 'mysql') {
6180 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6180 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6181 6181 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
6182 6182 
 					GROUP BY spotter_output.departure_airport_country
6183 6183 
 					ORDER BY airport_departure_country_count DESC";
6184 6184 
 		} else {
6185 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6185 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6186 6186 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
6187 6187 
 					GROUP BY spotter_output.departure_airport_country
6188 6188 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6194,7 +6194,7 @@  discard block
 
 block discarded – undo
6194 6194 
 		$airport_array = array();
6195 6195 
 		$temp_array = array();
6196 6196
6197 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6197 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6198 6198 
 		{
6199 6199 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6200 6200 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6212,11 +6212,11 @@  discard block
 
 block discarded – undo
6212 6212 
 	* @return Array the airport list
6213 6213 
 	*
6214 6214 
 	*/
6215 
-	public function countAllDepartureAirportsByIdent($ident,$filters = array())
6215 
+	public function countAllDepartureAirportsByIdent($ident, $filters = array())
6216 6216 
 	{
6217 
-		$filter_query = $this->getFilter($filters,true,true);
6218 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
6219 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6217 
+		$filter_query = $this->getFilter($filters, true, true);
6218 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
6219 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6220 6220 
 		    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.ident = :ident
6221 6221 
                     GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6222 6222 
 		    ORDER BY airport_departure_icao_count DESC";
 
@@ -6228,7 +6228,7 @@  discard block
 
 block discarded – undo
6228 6228 
 		$airport_array = array();
6229 6229 
 		$temp_array = array();
6230 6230
6231 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6231 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6232 6232 
 		{
6233 6233 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6234 6234 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6250,11 +6250,11 @@  discard block
 
 block discarded – undo
6250 6250 
 	* @return Array the airport list
6251 6251 
 	*
6252 6252 
 	*/
6253 
-	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
6253 
+	public function countAllDepartureAirportCountriesByIdent($ident, $filters = array())
6254 6254 
 	{
6255 
-		$filter_query = $this->getFilter($filters,true,true);
6256 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
6257 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6255 
+		$filter_query = $this->getFilter($filters, true, true);
6256 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
6257 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6258 6258 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.ident = :ident
6259 6259 
                     GROUP BY spotter_output.departure_airport_country
6260 6260 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6266,7 +6266,7 @@  discard block
 
 block discarded – undo
6266 6266 
 		$airport_array = array();
6267 6267 
 		$temp_array = array();
6268 6268
6269 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6269 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6270 6270 
 		{
6271 6271 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6272 6272 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6285,12 +6285,12 @@  discard block
 
 block discarded – undo
6285 6285 
 	* @return Array the airport list
6286 6286 
 	*
6287 6287 
 	*/
6288 
-	public function countAllDepartureAirportsByCountry($country,$filters = array())
6288 
+	public function countAllDepartureAirportsByCountry($country, $filters = array())
6289 6289 
 	{
6290 
-		$filter_query = $this->getFilter($filters,true,true);
6291 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
6290 
+		$filter_query = $this->getFilter($filters, true, true);
6291 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
6292 6292
6293 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6293 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6294 6294 
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
6295 6295 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6296 6296 
 			    ORDER BY airport_departure_icao_count DESC";
 
@@ -6302,7 +6302,7 @@  discard block
 
 block discarded – undo
6302 6302 
 		$airport_array = array();
6303 6303 
 		$temp_array = array();
6304 6304
6305 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6305 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6306 6306 
 		{
6307 6307 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6308 6308 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6323,11 +6323,11 @@  discard block
 
 block discarded – undo
6323 6323 
 	* @return Array the airport list
6324 6324 
 	*
6325 6325 
 	*/
6326 
-	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
6326 
+	public function countAllDepartureAirportCountriesByCountry($country, $filters = array())
6327 6327 
 	{
6328 
-		$filter_query = $this->getFilter($filters,true,true);
6329 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
6330 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6328 
+		$filter_query = $this->getFilter($filters, true, true);
6329 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
6330 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6331 6331 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
6332 6332 
                     GROUP BY spotter_output.departure_airport_country
6333 6333 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6339,7 +6339,7 @@  discard block
 
 block discarded – undo
6339 6339 
 		$airport_array = array();
6340 6340 
 		$temp_array = array();
6341 6341
6342 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6342 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6343 6343 
 		{
6344 6344 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6345 6345 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6357,11 +6357,11 @@  discard block
 
 block discarded – undo
6357 6357 
 	* @return Array the airport list
6358 6358 
 	*
6359 6359 
 	*/
6360 
-	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6360 
+	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6361 6361 
 	{
6362 6362 
 		global $globalDBdriver;
6363 
-		$filter_query = $this->getFilter($filters,true,true);
6364 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6363 
+		$filter_query = $this->getFilter($filters, true, true);
6364 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6365 6365 
 				FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA'";
6366 6366 
                 if ($olderthanmonths > 0) {
6367 6367 
             		if ($globalDBdriver == 'mysql') {
 
@@ -6396,7 +6396,7 @@  discard block
 
 block discarded – undo
6396 6396 
 		$airport_array = array();
6397 6397 
 		$temp_array = array();
6398 6398
6399 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6399 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6400 6400 
 		{
6401 6401 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6402 6402 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6419,11 +6419,11 @@  discard block
 
 block discarded – undo
6419 6419 
 	* @return Array the airport list
6420 6420 
 	*
6421 6421 
 	*/
6422 
-	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6422 
+	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6423 6423 
 	{
6424 6424 
 		global $globalDBdriver;
6425 
-		$filter_query = $this->getFilter($filters,true,true);
6426 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6425 
+		$filter_query = $this->getFilter($filters, true, true);
6426 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6427 6427 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' ";
6428 6428 
                 if ($olderthanmonths > 0) {
6429 6429 
             		if ($globalDBdriver == 'mysql') {
 
@@ -6458,7 +6458,7 @@  discard block
 
 block discarded – undo
6458 6458 
 		$airport_array = array();
6459 6459 
 		$temp_array = array();
6460 6460
6461 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6461 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6462 6462 
 		{
6463 6463 
 			$temp_array['airline_icao'] = $row['airline_icao'];
6464 6464 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
 
@@ -6483,11 +6483,11 @@  discard block
 
 block discarded – undo
6483 6483 
 	* @return Array the airport list
6484 6484 
 	*
6485 6485 
 	*/
6486 
-	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6486 
+	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6487 6487 
 	{
6488 6488 
 		global $globalDBdriver;
6489 
-		$filter_query = $this->getFilter($filters,true,true);
6490 
-		$query  = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country
6489 
+		$filter_query = $this->getFilter($filters, true, true);
6490 
+		$query = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country
6491 6491 
 			FROM airport,spotter_output".$filter_query." spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao";
6492 6492 
                 if ($olderthanmonths > 0) {
6493 6493 
             		if ($globalDBdriver == 'mysql') {
 
@@ -6521,7 +6521,7 @@  discard block
 
 block discarded – undo
6521 6521 
 		$airport_array = array();
6522 6522 
 		$temp_array = array();
6523 6523
6524 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6524 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6525 6525 
 		{
6526 6526 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6527 6527 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6544,11 +6544,11 @@  discard block
 
 block discarded – undo
6544 6544 
 	* @return Array the airport list
6545 6545 
 	*
6546 6546 
 	*/
6547 
-	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6547 
+	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6548 6548 
 	{
6549 6549 
 		global $globalDBdriver;
6550 
-		$filter_query = $this->getFilter($filters,true,true);
6551 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country
6550 
+		$filter_query = $this->getFilter($filters, true, true);
6551 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country
6552 6552 
 			FROM airport,spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao ";
6553 6553 
                 if ($olderthanmonths > 0) {
6554 6554 
             		if ($globalDBdriver == 'mysql') {
 
@@ -6583,7 +6583,7 @@  discard block
 
 block discarded – undo
6583 6583 
 		$airport_array = array();
6584 6584 
 		$temp_array = array();
6585 6585
6586 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6586 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6587 6587 
 		{
6588 6588 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6589 6589 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6609,9 +6609,9 @@  discard block
 
 block discarded – undo
6609 6609 
 	*/
6610 6610 
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
6611 6611 
 	{
6612 
-		$filter_query = $this->getFilter($filters,true,true);
6613 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
6614 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6612 
+		$filter_query = $this->getFilter($filters, true, true);
6613 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
6614 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6615 6615 
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao
6616 6616 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6617 6617 
 			    ORDER BY airport_arrival_icao_count DESC";
 
@@ -6622,7 +6622,7 @@  discard block
 
 block discarded – undo
6622 6622 
 		$airport_array = array();
6623 6623 
 		$temp_array = array();
6624 6624
6625 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6625 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6626 6626 
 		{
6627 6627 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6628 6628 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6643,12 +6643,12 @@  discard block
 
 block discarded – undo
6643 6643 
 	* @return Array the airport list
6644 6644 
 	*
6645 6645 
 	*/
6646 
-	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
6646 
+	public function countAllArrivalAirportCountriesByAirline($airline_icao, $filters = array())
6647 6647 
 	{
6648 
-		$filter_query = $this->getFilter($filters,true,true);
6649 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
6648 
+		$filter_query = $this->getFilter($filters, true, true);
6649 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
6650 6650
6651 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6651 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6652 6652 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.airline_icao = :airline_icao
6653 6653 
                     GROUP BY spotter_output.arrival_airport_country
6654 6654 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6660,7 +6660,7 @@  discard block
 
 block discarded – undo
6660 6660 
 		$airport_array = array();
6661 6661 
 		$temp_array = array();
6662 6662
6663 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6663 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6664 6664 
 		{
6665 6665 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6666 6666 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6678,11 +6678,11 @@  discard block
 
 block discarded – undo
6678 6678 
 	* @return Array the airport list
6679 6679 
 	*
6680 6680 
 	*/
6681 
-	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
6681 
+	public function countAllArrivalAirportsByAircraft($aircraft_icao, $filters = array())
6682 6682 
 	{
6683 
-		$filter_query = $this->getFilter($filters,true,true);
6684 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
6685 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6683 
+		$filter_query = $this->getFilter($filters, true, true);
6684 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
6685 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6686 6686 
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao
6687 6687 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6688 6688 
 			    ORDER BY airport_arrival_icao_count DESC";
 
@@ -6694,7 +6694,7 @@  discard block
 
 block discarded – undo
6694 6694 
 		$airport_array = array();
6695 6695 
 		$temp_array = array();
6696 6696
6697 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6697 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6698 6698 
 		{
6699 6699 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6700 6700 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6716,11 +6716,11 @@  discard block
 
 block discarded – undo
6716 6716 
 	* @return Array the airport list
6717 6717 
 	*
6718 6718 
 	*/
6719 
-	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
6719 
+	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao, $filters = array())
6720 6720 
 	{
6721 
-		$filter_query = $this->getFilter($filters,true,true);
6722 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
6723 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6721 
+		$filter_query = $this->getFilter($filters, true, true);
6722 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
6723 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6724 6724 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
6725 6725 
                     GROUP BY spotter_output.arrival_airport_country
6726 6726 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6732,7 +6732,7 @@  discard block
 
 block discarded – undo
6732 6732 
 		$airport_array = array();
6733 6733 
 		$temp_array = array();
6734 6734
6735 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6735 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6736 6736 
 		{
6737 6737 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6738 6738 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6750,12 +6750,12 @@  discard block
 
 block discarded – undo
6750 6750 
 	* @return Array the airport list
6751 6751 
 	*
6752 6752 
 	*/
6753 
-	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
6753 
+	public function countAllArrivalAirportsByRegistration($registration, $filters = array())
6754 6754 
 	{
6755 
-		$filter_query = $this->getFilter($filters,true,true);
6756 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
6755 
+		$filter_query = $this->getFilter($filters, true, true);
6756 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
6757 6757
6758 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6758 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6759 6759 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.registration = :registration
6760 6760 
                     GROUP BY spotter_output.arrival_airport_icao
6761 6761 
 					ORDER BY airport_arrival_icao_count DESC";
 
@@ -6767,7 +6767,7 @@  discard block
 
 block discarded – undo
6767 6767 
 		$airport_array = array();
6768 6768 
 		$temp_array = array();
6769 6769
6770 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6770 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6771 6771 
 		{
6772 6772 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6773 6773 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6788,11 +6788,11 @@  discard block
 
 block discarded – undo
6788 6788 
 	* @return Array the airport list
6789 6789 
 	*
6790 6790 
 	*/
6791 
-	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
6791 
+	public function countAllArrivalAirportCountriesByRegistration($registration, $filters = array())
6792 6792 
 	{
6793 
-		$filter_query = $this->getFilter($filters,true,true);
6794 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
6795 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6793 
+		$filter_query = $this->getFilter($filters, true, true);
6794 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
6795 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6796 6796 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.registration = :registration
6797 6797 
                     GROUP BY spotter_output.arrival_airport_country
6798 6798 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6804,7 +6804,7 @@  discard block
 
 block discarded – undo
6804 6804 
 		$airport_array = array();
6805 6805 
 		$temp_array = array();
6806 6806
6807 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6807 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6808 6808 
 		{
6809 6809 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6810 6810 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6823,11 +6823,11 @@  discard block
 
 block discarded – undo
6823 6823 
 	* @return Array the airport list
6824 6824 
 	*
6825 6825 
 	*/
6826 
-	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
6826 
+	public function countAllArrivalAirportsByAirport($airport_icao, $filters = array())
6827 6827 
 	{
6828 
-		$filter_query = $this->getFilter($filters,true,true);
6829 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6830 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6828 
+		$filter_query = $this->getFilter($filters, true, true);
6829 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6830 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6831 6831 
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.departure_airport_icao = :airport_icao
6832 6832 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6833 6833 
 			    ORDER BY airport_arrival_icao_count DESC";
 
@@ -6839,7 +6839,7 @@  discard block
 
 block discarded – undo
6839 6839 
 		$airport_array = array();
6840 6840 
 		$temp_array = array();
6841 6841
6842 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6842 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6843 6843 
 		{
6844 6844 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6845 6845 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6860,11 +6860,11 @@  discard block
 
 block discarded – undo
6860 6860 
 	* @return Array the airport list
6861 6861 
 	*
6862 6862 
 	*/
6863 
-	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
6863 
+	public function countAllArrivalAirportCountriesByAirport($airport_icao, $filters = array())
6864 6864 
 	{
6865 
-		$filter_query = $this->getFilter($filters,true,true);
6866 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6867 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6865 
+		$filter_query = $this->getFilter($filters, true, true);
6866 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6867 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6868 6868 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.departure_airport_icao = :airport_icao
6869 6869 
                     GROUP BY spotter_output.arrival_airport_country
6870 6870 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6876,7 +6876,7 @@  discard block
 
 block discarded – undo
6876 6876 
 		$airport_array = array();
6877 6877 
 		$temp_array = array();
6878 6878
6879 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6879 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6880 6880 
 		{
6881 6881 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6882 6882 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6894,11 +6894,11 @@  discard block
 
 block discarded – undo
6894 6894 
 	* @return Array the airport list
6895 6895 
 	*
6896 6896 
 	*/
6897 
-	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
6897 
+	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer, $filters = array())
6898 6898 
 	{
6899 
-		$filter_query = $this->getFilter($filters,true,true);
6900 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6901 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6899 
+		$filter_query = $this->getFilter($filters, true, true);
6900 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6901 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6902 6902 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
6903 6903 
                     GROUP BY spotter_output.arrival_airport_icao
6904 6904 
 					ORDER BY airport_arrival_icao_count DESC";
 
@@ -6910,7 +6910,7 @@  discard block
 
 block discarded – undo
6910 6910 
 		$airport_array = array();
6911 6911 
 		$temp_array = array();
6912 6912
6913 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6913 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6914 6914 
 		{
6915 6915 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6916 6916 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6932,11 +6932,11 @@  discard block
 
 block discarded – undo
6932 6932 
 	* @return Array the airport list
6933 6933 
 	*
6934 6934 
 	*/
6935 
-	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
6935 
+	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
6936 6936 
 	{
6937 
-		$filter_query = $this->getFilter($filters,true,true);
6938 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6939 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6937 
+		$filter_query = $this->getFilter($filters, true, true);
6938 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6939 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6940 6940 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
6941 6941 
                     GROUP BY spotter_output.arrival_airport_country
6942 6942 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6948,7 +6948,7 @@  discard block
 
 block discarded – undo
6948 6948 
 		$airport_array = array();
6949 6949 
 		$temp_array = array();
6950 6950
6951 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6951 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6952 6952 
 		{
6953 6953 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6954 6954 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6967,11 +6967,11 @@  discard block
 
 block discarded – undo
6967 6967 
 	* @return Array the airport list
6968 6968 
 	*
6969 6969 
 	*/
6970 
-	public function countAllArrivalAirportsByDate($date,$filters = array())
6970 
+	public function countAllArrivalAirportsByDate($date, $filters = array())
6971 6971 
 	{
6972 6972 
 		global $globalTimezone, $globalDBdriver;
6973 
-		$filter_query = $this->getFilter($filters,true,true);
6974 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6973 
+		$filter_query = $this->getFilter($filters, true, true);
6974 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6975 6975 
 		if ($globalTimezone != '') {
6976 6976 
 			date_default_timezone_set($globalTimezone);
6977 6977 
 			$datetime = new DateTime($date);
 
@@ -6979,12 +6979,12 @@  discard block
 
 block discarded – undo
6979 6979 
 		} else $offset = '+00:00';
6980 6980
6981 6981 
 		if ($globalDBdriver == 'mysql') {
6982 
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6982 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6983 6983 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
6984 6984 
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6985 6985 
 					ORDER BY airport_arrival_icao_count DESC";
6986 6986 
 		} else {
6987 
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6987 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6988 6988 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
6989 6989 
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6990 6990 
 					ORDER BY airport_arrival_icao_count DESC";
 
@@ -6996,7 +6996,7 @@  discard block
 
 block discarded – undo
6996 6996 
 		$airport_array = array();
6997 6997 
 		$temp_array = array();
6998 6998
6999 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6999 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7000 7000 
 		{
7001 7001 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7002 7002 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -7020,8 +7020,8 @@  discard block
 
 block discarded – undo
7020 7020 
 	public function countAllArrivalAirportCountriesByDate($date, $filters = array())
7021 7021 
 	{
7022 7022 
 		global $globalTimezone, $globalDBdriver;
7023 
-		$filter_query = $this->getFilter($filters,true,true);
7024 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
7023 
+		$filter_query = $this->getFilter($filters, true, true);
7024 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
7025 7025 
 		if ($globalTimezone != '') {
7026 7026 
 			date_default_timezone_set($globalTimezone);
7027 7027 
 			$datetime = new DateTime($date);
 
@@ -7029,12 +7029,12 @@  discard block
 
 block discarded – undo
7029 7029 
 		} else $offset = '+00:00';
7030 7030
7031 7031 
 		if ($globalDBdriver == 'mysql') {
7032 
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7032 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7033 7033 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
7034 7034 
 					GROUP BY spotter_output.arrival_airport_country
7035 7035 
 					ORDER BY airport_arrival_country_count DESC";
7036 7036 
 		} else {
7037 
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7037 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7038 7038 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
7039 7039 
 					GROUP BY spotter_output.arrival_airport_country
7040 7040 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -7046,7 +7046,7 @@  discard block
 
 block discarded – undo
7046 7046 
 		$airport_array = array();
7047 7047 
 		$temp_array = array();
7048 7048
7049 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7049 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7050 7050 
 		{
7051 7051 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7052 7052 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -7064,11 +7064,11 @@  discard block
 
 block discarded – undo
7064 7064 
 	* @return Array the airport list
7065 7065 
 	*
7066 7066 
 	*/
7067 
-	public function countAllArrivalAirportsByIdent($ident,$filters = array())
7067 
+	public function countAllArrivalAirportsByIdent($ident, $filters = array())
7068 7068 
 	{
7069 
-		$filter_query = $this->getFilter($filters,true,true);
7070 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7071 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7069 
+		$filter_query = $this->getFilter($filters, true, true);
7070 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7071 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7072 7072 
 		    FROM spotter_output".$filter_query." WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.ident = :ident
7073 7073 
                     GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7074 7074 
 		    ORDER BY airport_arrival_icao_count DESC";
 
@@ -7080,7 +7080,7 @@  discard block
 
 block discarded – undo
7080 7080 
 		$airport_array = array();
7081 7081 
 		$temp_array = array();
7082 7082
7083 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7083 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7084 7084 
 		{
7085 7085 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7086 7086 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -7103,9 +7103,9 @@  discard block
 
 block discarded – undo
7103 7103 
 	*/
7104 7104 
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
7105 7105 
 	{
7106 
-		$filter_query = $this->getFilter($filters,true,true);
7107 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7108 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7106 
+		$filter_query = $this->getFilter($filters, true, true);
7107 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7108 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7109 7109 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.ident = :ident
7110 7110 
                     GROUP BY spotter_output.arrival_airport_country
7111 7111 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -7117,7 +7117,7 @@  discard block
 
 block discarded – undo
7117 7117 
 		$airport_array = array();
7118 7118 
 		$temp_array = array();
7119 7119
7120 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7120 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7121 7121 
 		{
7122 7122 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7123 7123 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -7136,11 +7136,11 @@  discard block
 
 block discarded – undo
7136 7136 
 	* @return Array the airport list
7137 7137 
 	*
7138 7138 
 	*/
7139 
-	public function countAllArrivalAirportsByCountry($country,$filters = array())
7139 
+	public function countAllArrivalAirportsByCountry($country, $filters = array())
7140 7140 
 	{
7141 
-		$filter_query = $this->getFilter($filters,true,true);
7142 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7143 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7141 
+		$filter_query = $this->getFilter($filters, true, true);
7142 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7143 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7144 7144 
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
7145 7145 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7146 7146 
 			    ORDER BY airport_arrival_icao_count DESC";
 
@@ -7152,7 +7152,7 @@  discard block
 
 block discarded – undo
7152 7152 
 		$airport_array = array();
7153 7153 
 		$temp_array = array();
7154 7154
7155 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7155 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7156 7156 
 		{
7157 7157 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7158 7158 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -7173,11 +7173,11 @@  discard block
 
 block discarded – undo
7173 7173 
 	* @return Array the airport list
7174 7174 
 	*
7175 7175 
 	*/
7176 
-	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
7176 
+	public function countAllArrivalAirportCountriesByCountry($country, $filters = array())
7177 7177 
 	{
7178 
-		$filter_query = $this->getFilter($filters,true,true);
7179 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7180 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7178 
+		$filter_query = $this->getFilter($filters, true, true);
7179 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7180 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7181 7181 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
7182 7182 
                     GROUP BY spotter_output.arrival_airport_country
7183 7183 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -7189,7 +7189,7 @@  discard block
 
 block discarded – undo
7189 7189 
 		$airport_array = array();
7190 7190 
 		$temp_array = array();
7191 7191
7192 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7192 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7193 7193 
 		{
7194 7194 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7195 7195 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -7210,7 +7210,7 @@  discard block
 
 block discarded – undo
7210 7210 
 	*/
7211 7211 
 	public function countAllDepartureCountries($filters = array())
7212 7212 
 	{
7213 
-		$filter_query = $this->getFilter($filters,true,true);
7213 
+		$filter_query = $this->getFilter($filters, true, true);
7214 7214 
 		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
7215 7215 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.departure_airport_icao <> 'NA'";
7216 7216 
 		$query .= " GROUP BY spotter_output.departure_airport_country
 
@@ -7224,7 +7224,7 @@  discard block
 
 block discarded – undo
7224 7224 
 		$airport_array = array();
7225 7225 
 		$temp_array = array();
7226 7226
7227 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7227 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7228 7228 
 		{
7229 7229 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
7230 7230 
 			$temp_array['airport_departure_country'] = $row['departure_airport_country'];
 
@@ -7242,9 +7242,9 @@  discard block
 
 block discarded – undo
7242 7242 
 	* @return Array the airport arrival list
7243 7243 
 	*
7244 7244 
 	*/
7245 
-	public function countAllArrivalCountries($limit = true,$filters = array())
7245 
+	public function countAllArrivalCountries($limit = true, $filters = array())
7246 7246 
 	{
7247 
-		$filter_query = $this->getFilter($filters,true,true);
7247 
+		$filter_query = $this->getFilter($filters, true, true);
7248 7248 
 		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7249 7249 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.arrival_airport_icao <> 'NA'";
7250 7250 
 		$query .= " GROUP BY spotter_output.arrival_airport_country
 
@@ -7258,7 +7258,7 @@  discard block
 
 block discarded – undo
7258 7258 
 		$airport_array = array();
7259 7259 
 		$temp_array = array();
7260 7260
7261 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7261 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7262 7262 
 		{
7263 7263 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
7264 7264 
 			$temp_array['airport_arrival_country'] = $row['arrival_airport_country'];
 
@@ -7281,8 +7281,8 @@  discard block
 
 block discarded – undo
7281 7281 
 	*/
7282 7282 
 	public function countAllRoutes($filters = array())
7283 7283 
 	{
7284 
-		$filter_query = $this->getFilter($filters,true,true);
7285 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7284 
+		$filter_query = $this->getFilter($filters, true, true);
7285 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7286 7286 
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> 'NA'
7287 7287 
                     GROUP BY route,spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
7288 7288 
                     ORDER BY route_count DESC
 
@@ -7295,7 +7295,7 @@  discard block
 
 block discarded – undo
7295 7295 
 		$routes_array = array();
7296 7296 
 		$temp_array = array();
7297 7297
7298 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7298 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7299 7299 
 		{
7300 7300 
 			$temp_array['route_count'] = $row['route_count'];
7301 7301 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7322,11 +7322,11 @@  discard block
 
 block discarded – undo
7322 7322 
 	* @return Array the route list
7323 7323 
 	*
7324 7324 
 	*/
7325 
-	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
7325 
+	public function countAllRoutesByAircraft($aircraft_icao, $filters = array())
7326 7326 
 	{
7327 
-		$filter_query = $this->getFilter($filters,true,true);
7328 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
7329 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7327 
+		$filter_query = $this->getFilter($filters, true, true);
7328 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
7329 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7330 7330 
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_icao = :aircraft_icao
7331 7331 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7332 7332 
 			    ORDER BY route_count DESC";
 
@@ -7337,7 +7337,7 @@  discard block
 
 block discarded – undo
7337 7337 
 		$routes_array = array();
7338 7338 
 		$temp_array = array();
7339 7339
7340 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7340 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7341 7341 
 		{
7342 7342 
 			$temp_array['route_count'] = $row['route_count'];
7343 7343 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7364,9 +7364,9 @@  discard block
 
 block discarded – undo
7364 7364 
 	*/
7365 7365 
 	public function countAllRoutesByRegistration($registration, $filters = array())
7366 7366 
 	{
7367 
-		$filter_query = $this->getFilter($filters,true,true);
7367 
+		$filter_query = $this->getFilter($filters, true, true);
7368 7368 
 		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
7369 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7369 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7370 7370 
 			FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.registration = :registration
7371 7371 
                     GROUP BY route
7372 7372 
                     ORDER BY route_count DESC";
 
@@ -7378,7 +7378,7 @@  discard block
 
 block discarded – undo
7378 7378 
 		$routes_array = array();
7379 7379 
 		$temp_array = array();
7380 7380
7381 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7381 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7382 7382 
 		{
7383 7383 
 			$temp_array['route_count'] = $row['route_count'];
7384 7384 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7406,9 +7406,9 @@  discard block
 
 block discarded – undo
7406 7406 
 	*/
7407 7407 
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
7408 7408 
 	{
7409 
-		$filter_query = $this->getFilter($filters,true,true);
7410 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
7411 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7409 
+		$filter_query = $this->getFilter($filters, true, true);
7410 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
7411 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7412 7412 
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.airline_icao = :airline_icao
7413 7413 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7414 7414 
 			    ORDER BY route_count DESC";
 
@@ -7420,7 +7420,7 @@  discard block
 
 block discarded – undo
7420 7420 
 		$routes_array = array();
7421 7421 
 		$temp_array = array();
7422 7422
7423 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7423 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7424 7424 
 		{
7425 7425 
 			$temp_array['route_count'] = $row['route_count'];
7426 7426 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7448,9 +7448,9 @@  discard block
 
 block discarded – undo
7448 7448 
 	*/
7449 7449 
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
7450 7450 
 	{
7451 
-		$filter_query = $this->getFilter($filters,true,true);
7452 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
7453 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7451 
+		$filter_query = $this->getFilter($filters, true, true);
7452 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
7453 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7454 7454 
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
7455 7455 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7456 7456 
 			    ORDER BY route_count DESC";
 
@@ -7461,7 +7461,7 @@  discard block
 
 block discarded – undo
7461 7461 
 		$routes_array = array();
7462 7462 
 		$temp_array = array();
7463 7463
7464 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7464 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7465 7465 
 		{
7466 7466 
 			$temp_array['route_count'] = $row['route_count'];
7467 7467 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7489,9 +7489,9 @@  discard block
 
 block discarded – undo
7489 7489 
 	*/
7490 7490 
 	public function countAllRoutesByCountry($country, $filters = array())
7491 7491 
 	{
7492 
-		$filter_query = $this->getFilter($filters,true,true);
7493 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7494 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7492 
+		$filter_query = $this->getFilter($filters, true, true);
7493 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7494 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7495 7495 
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
7496 7496 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7497 7497 
 			    ORDER BY route_count DESC";
 
@@ -7502,7 +7502,7 @@  discard block
 
 block discarded – undo
7502 7502 
 		$routes_array = array();
7503 7503 
 		$temp_array = array();
7504 7504
7505 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7505 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7506 7506 
 		{
7507 7507 
 			$temp_array['route_count'] = $row['route_count'];
7508 7508 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7530,8 +7530,8 @@  discard block
 
 block discarded – undo
7530 7530 
 	public function countAllRoutesByDate($date, $filters = array())
7531 7531 
 	{
7532 7532 
 		global $globalTimezone, $globalDBdriver;
7533 
-		$filter_query = $this->getFilter($filters,true,true);
7534 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
7533 
+		$filter_query = $this->getFilter($filters, true, true);
7534 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
7535 7535 
 		if ($globalTimezone != '') {
7536 7536 
 			date_default_timezone_set($globalTimezone);
7537 7537 
 			$datetime = new DateTime($date);
 
@@ -7539,12 +7539,12 @@  discard block
 
 block discarded – undo
7539 7539 
 		} else $offset = '+00:00';
7540 7540
7541 7541 
 		if ($globalDBdriver == 'mysql') {
7542 
-			$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7542 
+			$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7543 7543 
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
7544 7544 
 				    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7545 7545 
 				    ORDER BY route_count DESC";
7546 7546 
 		} else {
7547 
-			$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7547 
+			$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7548 7548 
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
7549 7549 
 				    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7550 7550 
 				    ORDER BY route_count DESC";
 
@@ -7556,7 +7556,7 @@  discard block
 
 block discarded – undo
7556 7556 
 		$routes_array = array();
7557 7557 
 		$temp_array = array();
7558 7558
7559 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7559 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7560 7560 
 		{
7561 7561 
 			$temp_array['route_count'] = $row['route_count'];
7562 7562 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7583,9 +7583,9 @@  discard block
 
 block discarded – undo
7583 7583 
 	*/
7584 7584 
 	public function countAllRoutesByIdent($ident, $filters = array())
7585 7585 
 	{
7586 
-		$filter_query = $this->getFilter($filters,true,true);
7587 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7588 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7586 
+		$filter_query = $this->getFilter($filters, true, true);
7587 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7588 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7589 7589 
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.ident = :ident
7590 7590 
                     GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7591 7591 
                     ORDER BY route_count DESC";
 
@@ -7597,7 +7597,7 @@  discard block
 
 block discarded – undo
7597 7597 
 		$routes_array = array();
7598 7598 
 		$temp_array = array();
7599 7599
7600 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7600 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7601 7601 
 		{
7602 7602 
 			$temp_array['route_count'] = $row['route_count'];
7603 7603 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7624,9 +7624,9 @@  discard block
 
 block discarded – undo
7624 7624 
 	*/
7625 7625 
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
7626 7626 
 	{
7627 
-		$filter_query = $this->getFilter($filters,true,true);
7628 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
7629 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7627 
+		$filter_query = $this->getFilter($filters, true, true);
7628 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
7629 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7630 7630 
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
7631 7631 
                     GROUP BY route
7632 7632 
                     ORDER BY route_count DESC";
 
@@ -7638,7 +7638,7 @@  discard block
 
 block discarded – undo
7638 7638 
 		$routes_array = array();
7639 7639 
 		$temp_array = array();
7640 7640
7641 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7641 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7642 7642 
 		{
7643 7643 
 			$temp_array['route_count'] = $row['route_count'];
7644 7644 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7666,8 +7666,8 @@  discard block
 
 block discarded – undo
7666 7666 
 	*/
7667 7667 
 	public function countAllRoutesWithWaypoints($filters = array())
7668 7668 
 	{
7669 
-		$filter_query = $this->getFilter($filters,true,true);
7670 
-		$query  = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7669 
+		$filter_query = $this->getFilter($filters, true, true);
7670 
+		$query = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7671 7671 
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.waypoints <> ''
7672 7672 
                     GROUP BY route, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7673 7673 
                     ORDER BY route_count DESC
 
@@ -7680,7 +7680,7 @@  discard block
 
 block discarded – undo
7680 7680 
 		$routes_array = array();
7681 7681 
 		$temp_array = array();
7682 7682
7683 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7683 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7684 7684 
 		{
7685 7685 
 			$temp_array['spotter_id'] = $row['spotter_id'];
7686 7686 
 			$temp_array['route_count'] = $row['route_count'];
 
@@ -7705,11 +7705,11 @@  discard block
 
 block discarded – undo
7705 7705 
 	* @return Array the callsign list
7706 7706 
 	*
7707 7707 
 	*/
7708 
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
7708 
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
7709 7709 
 	{
7710 7710 
 		global $globalDBdriver;
7711 
-		$filter_query = $this->getFilter($filters,true,true);
7712 
-		$query  = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao
7711 
+		$filter_query = $this->getFilter($filters, true, true);
7712 
+		$query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao
7713 7713 
                     FROM spotter_output".$filter_query." spotter_output.ident <> '' ";
7714 7714 
 		 if ($olderthanmonths > 0) {
7715 7715 
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
 
@@ -7728,7 +7728,7 @@  discard block
 
 block discarded – undo
7728 7728 
 		$callsign_array = array();
7729 7729 
 		$temp_array = array();
7730 7730
7731 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7731 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7732 7732 
 		{
7733 7733 
 			$temp_array['callsign_icao'] = $row['ident'];
7734 7734 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -7750,8 +7750,8 @@  discard block
 
 block discarded – undo
7750 7750 
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
7751 7751 
 	{
7752 7752 
 		global $globalDBdriver;
7753 
-		$filter_query = $this->getFilter($filters,true,true);
7754 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name
7753 
+		$filter_query = $this->getFilter($filters, true, true);
7754 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name
7755 7755 
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''  AND spotter_output.airline_icao <> '' ";
7756 7756 
 		 if ($olderthanmonths > 0) {
7757 7757 
 			if ($globalDBdriver == 'mysql') $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 
@@ -7770,7 +7770,7 @@  discard block
 
 block discarded – undo
7770 7770 
 		$callsign_array = array();
7771 7771 
 		$temp_array = array();
7772 7772
7773 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7773 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7774 7774 
 		{
7775 7775 
 			$temp_array['callsign_icao'] = $row['ident'];
7776 7776 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -7824,7 +7824,7 @@  discard block
 
 block discarded – undo
7824 7824 
 		$date_array = array();
7825 7825 
 		$temp_array = array();
7826 7826
7827 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7827 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7828 7828 
 		{
7829 7829 
 			$temp_array['date_name'] = $row['date_name'];
7830 7830 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -7849,15 +7849,15 @@  discard block
 
 block discarded – undo
7849 7849 
 			$datetime = new DateTime();
7850 7850 
 			$offset = $datetime->format('P');
7851 7851 
 		} else $offset = '+00:00';
7852 
-		$filter_query = $this->getFilter($filters,true,true);
7852 
+		$filter_query = $this->getFilter($filters, true, true);
7853 7853 
 		if ($globalDBdriver == 'mysql') {
7854 
-			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7854 
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7855 7855 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
7856 7856 
 								GROUP BY spotter_output.airline_icao, date_name
7857 7857 
 								ORDER BY date_count DESC
7858 7858 
 								LIMIT 10 OFFSET 0";
7859 7859 
 		} else {
7860 
-			$query  = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
7860 
+			$query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
7861 7861 
 								FROM spotter_output
7862 7862 
 								WHERE spotter_output.airline_icao <> ''
7863 7863 
 								GROUP BY spotter_output.airline_icao, date_name 
@@ -7872,7 +7872,7 @@  discard block
 
 block discarded – undo
7872 7872 
 		$date_array = array();
7873 7873 
 		$temp_array = array();
7874 7874
7875 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7875 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7876 7876 
 		{
7877 7877 
 			$temp_array['date_name'] = $row['date_name'];
7878 7878 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -7898,7 +7898,7 @@  discard block
 
 block discarded – undo
7898 7898 
 			$datetime = new DateTime();
7899 7899 
 			$offset = $datetime->format('P');
7900 7900 
 		} else $offset = '+00:00';
7901 
-		$filter_query = $this->getFilter($filters,true,true);
7901 
+		$filter_query = $this->getFilter($filters, true, true);
7902 7902 
 		if ($globalDBdriver == 'mysql') {
7903 7903 
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7904 7904 
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
 
@@ -7919,7 +7919,7 @@  discard block
 
 block discarded – undo
7919 7919 
 		$date_array = array();
7920 7920 
 		$temp_array = array();
7921 7921
7922 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7922 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7923 7923 
 		{
7924 7924 
 			$temp_array['date_name'] = $row['date_name'];
7925 7925 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -7944,7 +7944,7 @@  discard block
 
 block discarded – undo
7944 7944 
 			$datetime = new DateTime();
7945 7945 
 			$offset = $datetime->format('P');
7946 7946 
 		} else $offset = '+00:00';
7947 
-		$filter_query = $this->getFilter($filters,true,true);
7947 
+		$filter_query = $this->getFilter($filters, true, true);
7948 7948 
 		if ($globalDBdriver == 'mysql') {
7949 7949 
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7950 7950 
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
 
@@ -7965,7 +7965,7 @@  discard block
 
 block discarded – undo
7965 7965 
 		$date_array = array();
7966 7966 
 		$temp_array = array();
7967 7967
7968 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7968 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7969 7969 
 		{
7970 7970 
 			$temp_array['date_name'] = $row['date_name'];
7971 7971 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -7986,7 +7986,7 @@  discard block
 
 block discarded – undo
7986 7986 
 	public function countAllDatesLastMonthByAirlines($filters = array())
7987 7987 
 	{
7988 7988 
 		global $globalTimezone, $globalDBdriver;
7989 
-		$filter_query = $this->getFilter($filters,true,true);
7989 
+		$filter_query = $this->getFilter($filters, true, true);
7990 7990 
 		if ($globalTimezone != '') {
7991 7991 
 			date_default_timezone_set($globalTimezone);
7992 7992 
 			$datetime = new DateTime();
 
@@ -7994,13 +7994,13 @@  discard block
 
 block discarded – undo
7994 7994 
 		} else $offset = '+00:00';
7995 7995
7996 7996 
 		if ($globalDBdriver == 'mysql') {
7997 
-			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7997 
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7998 7998 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)
7999 7999 
 								GROUP BY spotter_output.airline_icao, date_name
8000 8000 
 								ORDER BY spotter_output.date ASC";
8001 8001 
 			$query_data = array(':offset' => $offset);
8002 8002 
 		} else {
8003 
-			$query  = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
8003 
+			$query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
8004 8004 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 MONTHS'
8005 8005 
 								GROUP BY spotter_output.airline_icao, date_name
8006 8006 
 								ORDER BY date_name ASC";
 
@@ -8013,7 +8013,7 @@  discard block
 
 block discarded – undo
8013 8013 
 		$date_array = array();
8014 8014 
 		$temp_array = array();
8015 8015
8016 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8016 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8017 8017 
 		{
8018 8018 
 			$temp_array['date_name'] = $row['date_name'];
8019 8019 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -8060,7 +8060,7 @@  discard block
 
 block discarded – undo
8060 8060 
 		$date_array = array();
8061 8061 
 		$temp_array = array();
8062 8062
8063 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8063 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8064 8064 
 		{
8065 8065 
 			$temp_array['month_name'] = $row['month_name'];
8066 8066 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8081,7 +8081,7 @@  discard block
 
 block discarded – undo
8081 8081 
 	public function countAllMonthsByAirlines($filters = array())
8082 8082 
 	{
8083 8083 
 		global $globalTimezone, $globalDBdriver;
8084 
-		$filter_query = $this->getFilter($filters,true,true);
8084 
+		$filter_query = $this->getFilter($filters, true, true);
8085 8085 
 		if ($globalTimezone != '') {
8086 8086 
 			date_default_timezone_set($globalTimezone);
8087 8087 
 			$datetime = new DateTime();
 
@@ -8089,12 +8089,12 @@  discard block
 
 block discarded – undo
8089 8089 
 		} else $offset = '+00:00';
8090 8090
8091 8091 
 		if ($globalDBdriver == 'mysql') {
8092 
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8092 
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8093 8093 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
8094 8094 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8095 8095 
 								ORDER BY date_count DESC";
8096 8096 
 		} else {
8097 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8097 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8098 8098 
 								FROM spotter_output
8099 8099 
 								WHERE spotter_output.airline_icao <> ''
8100 8100 
 								GROUP BY spotter_output.airline_icao, year_name, month_name 
@@ -8108,7 +8108,7 @@  discard block
 
 block discarded – undo
8108 8108 
 		$date_array = array();
8109 8109 
 		$temp_array = array();
8110 8110
8111 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8111 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8112 8112 
 		{
8113 8113 
 			$temp_array['month_name'] = $row['month_name'];
8114 8114 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8135,14 +8135,14 @@  discard block
 
 block discarded – undo
8135 8135 
 			$datetime = new DateTime();
8136 8136 
 			$offset = $datetime->format('P');
8137 8137 
 		} else $offset = '+00:00';
8138 
-		$filter_query = $this->getFilter($filters,true,true);
8138 
+		$filter_query = $this->getFilter($filters, true, true);
8139 8139 
 		if ($globalDBdriver == 'mysql') {
8140 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8140 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8141 8141 
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
8142 8142 
 								GROUP BY year_name, month_name
8143 8143 
 								ORDER BY date_count DESC";
8144 8144 
 		} else {
8145 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8145 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8146 8146 
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
8147 8147 
 								GROUP BY year_name, month_name
8148 8148 
 								ORDER BY date_count DESC";
 
@@ -8154,7 +8154,7 @@  discard block
 
 block discarded – undo
8154 8154 
 		$date_array = array();
8155 8155 
 		$temp_array = array();
8156 8156
8157 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8157 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8158 8158 
 		{
8159 8159 
 			$temp_array['month_name'] = $row['month_name'];
8160 8160 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8180,15 +8180,15 @@  discard block
 
 block discarded – undo
8180 8180 
 			$datetime = new DateTime();
8181 8181 
 			$offset = $datetime->format('P');
8182 8182 
 		} else $offset = '+00:00';
8183 
-		$filter_query = $this->getFilter($filters,true,true);
8183 
+		$filter_query = $this->getFilter($filters, true, true);
8184 8184
8185 8185 
 		if ($globalDBdriver == 'mysql') {
8186 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8186 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8187 8187 
 								FROM spotter_output".$filter_query." owner_name <> ''
8188 8188 
 								GROUP BY year_name, month_name
8189 8189 
 								ORDER BY date_count DESC";
8190 8190 
 		} else {
8191 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8191 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8192 8192 
 								FROM spotter_output".$filter_query." owner_name <> ''
8193 8193 
 								GROUP BY year_name, month_name
8194 8194 
 								ORDER BY date_count DESC";
 
@@ -8200,7 +8200,7 @@  discard block
 
 block discarded – undo
8200 8200 
 		$date_array = array();
8201 8201 
 		$temp_array = array();
8202 8202
8203 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8203 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8204 8204 
 		{
8205 8205 
 			$temp_array['month_name'] = $row['month_name'];
8206 8206 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8221,7 +8221,7 @@  discard block
 
 block discarded – undo
8221 8221 
 	public function countAllMonthsOwnersByAirlines($filters = array())
8222 8222 
 	{
8223 8223 
 		global $globalTimezone, $globalDBdriver;
8224 
-		$filter_query = $this->getFilter($filters,true,true);
8224 
+		$filter_query = $this->getFilter($filters, true, true);
8225 8225 
 		if ($globalTimezone != '') {
8226 8226 
 			date_default_timezone_set($globalTimezone);
8227 8227 
 			$datetime = new DateTime();
 
@@ -8229,12 +8229,12 @@  discard block
 
 block discarded – undo
8229 8229 
 		} else $offset = '+00:00';
8230 8230
8231 8231 
 		if ($globalDBdriver == 'mysql') {
8232 
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8232 
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8233 8233 
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> ''
8234 8234 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8235 8235 
 								ORDER BY date_count DESC";
8236 8236 
 		} else {
8237 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8237 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8238 8238 
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> ''
8239 8239 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8240 8240 
 								ORDER BY date_count DESC";
 
@@ -8246,7 +8246,7 @@  discard block
 
 block discarded – undo
8246 8246 
 		$date_array = array();
8247 8247 
 		$temp_array = array();
8248 8248
8249 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8249 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8250 8250 
 		{
8251 8251 
 			$temp_array['month_name'] = $row['month_name'];
8252 8252 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8273,15 +8273,15 @@  discard block
 
 block discarded – undo
8273 8273 
 			$datetime = new DateTime();
8274 8274 
 			$offset = $datetime->format('P');
8275 8275 
 		} else $offset = '+00:00';
8276 
-		$filter_query = $this->getFilter($filters,true,true);
8276 
+		$filter_query = $this->getFilter($filters, true, true);
8277 8277
8278 8278 
 		if ($globalDBdriver == 'mysql') {
8279 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8279 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8280 8280 
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
8281 8281 
 								GROUP BY year_name, month_name
8282 8282 
 								ORDER BY date_count DESC";
8283 8283 
 		} else {
8284 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8284 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8285 8285 
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
8286 8286 
 								GROUP BY year_name, month_name
8287 8287 
 								ORDER BY date_count DESC";
 
@@ -8293,7 +8293,7 @@  discard block
 
 block discarded – undo
8293 8293 
 		$date_array = array();
8294 8294 
 		$temp_array = array();
8295 8295
8296 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8296 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8297 8297 
 		{
8298 8298 
 			$temp_array['month_name'] = $row['month_name'];
8299 8299 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8314,7 +8314,7 @@  discard block
 
 block discarded – undo
8314 8314 
 	public function countAllMonthsPilotsByAirlines($filters = array())
8315 8315 
 	{
8316 8316 
 		global $globalTimezone, $globalDBdriver;
8317 
-		$filter_query = $this->getFilter($filters,true,true);
8317 
+		$filter_query = $this->getFilter($filters, true, true);
8318 8318 
 		if ($globalTimezone != '') {
8319 8319 
 			date_default_timezone_set($globalTimezone);
8320 8320 
 			$datetime = new DateTime();
 
@@ -8322,12 +8322,12 @@  discard block
 
 block discarded – undo
8322 8322 
 		} else $offset = '+00:00';
8323 8323
8324 8324 
 		if ($globalDBdriver == 'mysql') {
8325 
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8325 
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8326 8326 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
8327 8327 
 								GROUP BY spotter_output.airline_icao,year_name, month_name
8328 8328 
 								ORDER BY date_count DESC";
8329 8329 
 		} else {
8330 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8330 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8331 8331 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
8332 8332 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8333 8333 
 								ORDER BY date_count DESC";
 
@@ -8339,7 +8339,7 @@  discard block
 
 block discarded – undo
8339 8339 
 		$date_array = array();
8340 8340 
 		$temp_array = array();
8341 8341
8342 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8342 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8343 8343 
 		{
8344 8344 
 			$temp_array['month_name'] = $row['month_name'];
8345 8345 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8361,7 +8361,7 @@  discard block
 
 block discarded – undo
8361 8361 
 	public function countAllMonthsAirlines($filters = array())
8362 8362 
 	{
8363 8363 
 		global $globalTimezone, $globalDBdriver;
8364 
-		$filter_query = $this->getFilter($filters,true,true);
8364 
+		$filter_query = $this->getFilter($filters, true, true);
8365 8365 
 		if ($globalTimezone != '') {
8366 8366 
 			date_default_timezone_set($globalTimezone);
8367 8367 
 			$datetime = new DateTime();
 
@@ -8369,12 +8369,12 @@  discard block
 
 block discarded – undo
8369 8369 
 		} else $offset = '+00:00';
8370 8370
8371 8371 
 		if ($globalDBdriver == 'mysql') {
8372 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count
8372 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count
8373 8373 
 								FROM spotter_output".$filter_query." airline_icao <> ''
8374 8374 
 								GROUP BY year_name, month_name
8375 8375 
 								ORDER BY date_count DESC";
8376 8376 
 		} else {
8377 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count
8377 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count
8378 8378 
 								FROM spotter_output".$filter_query." airline_icao <> ''
8379 8379 
 								GROUP BY year_name, month_name
8380 8380 
 								ORDER BY date_count DESC";
 
@@ -8386,7 +8386,7 @@  discard block
 
 block discarded – undo
8386 8386 
 		$date_array = array();
8387 8387 
 		$temp_array = array();
8388 8388
8389 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8389 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8390 8390 
 		{
8391 8391 
 			$temp_array['month_name'] = $row['month_name'];
8392 8392 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8412,15 +8412,15 @@  discard block
 
 block discarded – undo
8412 8412 
 			$datetime = new DateTime();
8413 8413 
 			$offset = $datetime->format('P');
8414 8414 
 		} else $offset = '+00:00';
8415 
-		$filter_query = $this->getFilter($filters,true,true);
8415 
+		$filter_query = $this->getFilter($filters, true, true);
8416 8416
8417 8417 
 		if ($globalDBdriver == 'mysql') {
8418 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8418 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8419 8419 
 								FROM spotter_output".$filter_query." aircraft_icao <> ''
8420 8420 
 								GROUP BY year_name, month_name
8421 8421 
 								ORDER BY date_count DESC";
8422 8422 
 		} else {
8423 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8423 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8424 8424 
 								FROM spotter_output".$filter_query." aircraft_icao <> ''
8425 8425 
 								GROUP BY year_name, month_name
8426 8426 
 								ORDER BY date_count DESC";
 
@@ -8432,7 +8432,7 @@  discard block
 
 block discarded – undo
8432 8432 
 		$date_array = array();
8433 8433 
 		$temp_array = array();
8434 8434
8435 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8435 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8436 8436 
 		{
8437 8437 
 			$temp_array['month_name'] = $row['month_name'];
8438 8438 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8454,7 +8454,7 @@  discard block
 
 block discarded – undo
8454 8454 
 	public function countAllMonthsAircraftsByAirlines($filters = array())
8455 8455 
 	{
8456 8456 
 		global $globalTimezone, $globalDBdriver;
8457 
-		$filter_query = $this->getFilter($filters,true,true);
8457 
+		$filter_query = $this->getFilter($filters, true, true);
8458 8458 
 		if ($globalTimezone != '') {
8459 8459 
 			date_default_timezone_set($globalTimezone);
8460 8460 
 			$datetime = new DateTime();
 
@@ -8462,12 +8462,12 @@  discard block
 
 block discarded – undo
8462 8462 
 		} else $offset = '+00:00';
8463 8463
8464 8464 
 		if ($globalDBdriver == 'mysql') {
8465 
-			$query  = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8465 
+			$query = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8466 8466 
 								FROM spotter_output".$filter_query." aircraft_icao <> ''  AND spotter_output.airline_icao <> ''
8467 8467 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8468 8468 
 								ORDER BY date_count DESC";
8469 8469 
 		} else {
8470 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8470 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8471 8471 
 								FROM spotter_output".$filter_query." aircraft_icao <> '' AND spotter_output.airline_icao <> ''
8472 8472 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8473 8473 
 								ORDER BY date_count DESC";
 
@@ -8479,7 +8479,7 @@  discard block
 
 block discarded – undo
8479 8479 
 		$date_array = array();
8480 8480 
 		$temp_array = array();
8481 8481
8482 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8482 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8483 8483 
 		{
8484 8484 
 			$temp_array['month_name'] = $row['month_name'];
8485 8485 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8506,15 +8506,15 @@  discard block
 
 block discarded – undo
8506 8506 
 			$datetime = new DateTime();
8507 8507 
 			$offset = $datetime->format('P');
8508 8508 
 		} else $offset = '+00:00';
8509 
-		$filter_query = $this->getFilter($filters,true,true);
8509 
+		$filter_query = $this->getFilter($filters, true, true);
8510 8510
8511 8511 
 		if ($globalDBdriver == 'mysql') {
8512 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8512 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8513 8513 
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> ''
8514 8514 
 								GROUP BY year_name, month_name
8515 8515 
 								ORDER BY date_count DESC";
8516 8516 
 		} else {
8517 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8517 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8518 8518 
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> ''
8519 8519 
 								GROUP BY year_name, month_name
8520 8520 
 								ORDER BY date_count DESC";
 
@@ -8526,7 +8526,7 @@  discard block
 
 block discarded – undo
8526 8526 
 		$date_array = array();
8527 8527 
 		$temp_array = array();
8528 8528
8529 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8529 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8530 8530 
 		{
8531 8531 
 			$temp_array['month_name'] = $row['month_name'];
8532 8532 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8548,7 +8548,7 @@  discard block
 
 block discarded – undo
8548 8548 
 	public function countAllMonthsRealArrivalsByAirlines($filters = array())
8549 8549 
 	{
8550 8550 
 		global $globalTimezone, $globalDBdriver;
8551 
-		$filter_query = $this->getFilter($filters,true,true);
8551 
+		$filter_query = $this->getFilter($filters, true, true);
8552 8552 
 		if ($globalTimezone != '') {
8553 8553 
 			date_default_timezone_set($globalTimezone);
8554 8554 
 			$datetime = new DateTime();
 
@@ -8556,12 +8556,12 @@  discard block
 
 block discarded – undo
8556 8556 
 		} else $offset = '+00:00';
8557 8557
8558 8558 
 		if ($globalDBdriver == 'mysql') {
8559 
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8559 
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8560 8560 
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> ''
8561 8561 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8562 8562 
 								ORDER BY date_count DESC";
8563 8563 
 		} else {
8564 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8564 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8565 8565 
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> ''
8566 8566 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8567 8567 
 								ORDER BY date_count DESC";
 
@@ -8573,7 +8573,7 @@  discard block
 
 block discarded – undo
8573 8573 
 		$date_array = array();
8574 8574 
 		$temp_array = array();
8575 8575
8576 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8576 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8577 8577 
 		{
8578 8578 
 			$temp_array['month_name'] = $row['month_name'];
8579 8579 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8601,7 +8601,7 @@  discard block
 
 block discarded – undo
8601 8601 
 			$datetime = new DateTime();
8602 8602 
 			$offset = $datetime->format('P');
8603 8603 
 		} else $offset = '+00:00';
8604 
-		$filter_query = $this->getFilter($filters,true,true);
8604 
+		$filter_query = $this->getFilter($filters, true, true);
8605 8605 
 		if ($globalDBdriver == 'mysql') {
8606 8606 
 			$query  = "SELECT MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
8607 8607 
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
 
@@ -8622,7 +8622,7 @@  discard block
 
 block discarded – undo
8622 8622 
 		$date_array = array();
8623 8623 
 		$temp_array = array();
8624 8624
8625 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8625 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8626 8626 
 		{
8627 8627 
 			$temp_array['year_name'] = $row['year_name'];
8628 8628 
 			$temp_array['month_name'] = $row['month_name'];
 
@@ -8642,7 +8642,7 @@  discard block
 
 block discarded – undo
8642 8642 
 	* @return Array the hour list
8643 8643 
 	*
8644 8644 
 	*/
8645 
-	public function countAllHours($orderby,$filters = array())
8645 
+	public function countAllHours($orderby, $filters = array())
8646 8646 
 	{
8647 8647 
 		global $globalTimezone, $globalDBdriver;
8648 8648 
 		if ($globalTimezone != '') {
 
@@ -8690,7 +8690,7 @@  discard block
 
 block discarded – undo
8690 8690 
 		$hour_array = array();
8691 8691 
 		$temp_array = array();
8692 8692
8693 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8693 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8694 8694 
 		{
8695 8695 
 			$temp_array['hour_name'] = $row['hour_name'];
8696 8696 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8710,7 +8710,7 @@  discard block
 
 block discarded – undo
8710 8710 
 	public function countAllHoursByAirlines($orderby, $filters = array())
8711 8711 
 	{
8712 8712 
 		global $globalTimezone, $globalDBdriver;
8713 
-		$filter_query = $this->getFilter($filters,true,true);
8713 
+		$filter_query = $this->getFilter($filters, true, true);
8714 8714 
 		if ($globalTimezone != '') {
8715 8715 
 			date_default_timezone_set($globalTimezone);
8716 8716 
 			$datetime = new DateTime();
 
@@ -8728,7 +8728,7 @@  discard block
 
 block discarded – undo
8728 8728 
 		}
8729 8729
8730 8730 
 		if ($globalDBdriver == 'mysql') {
8731 
-			$query  = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8731 
+			$query = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8732 8732 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
8733 8733 
 								GROUP BY spotter_output.airline_icao, hour_name
8734 8734 
 								".$orderby_sql;
 
@@ -8741,7 +8741,7 @@  discard block
 
 block discarded – undo
8741 8741 
   */
8742 8742 
 		$query_data = array(':offset' => $offset);
8743 8743 
 		} else {
8744 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8744 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8745 8745 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
8746 8746 
 								GROUP BY spotter_output.airline_icao, hour_name
8747 8747 
 								".$orderby_sql;
 
@@ -8754,7 +8754,7 @@  discard block
 
 block discarded – undo
8754 8754 
 		$hour_array = array();
8755 8755 
 		$temp_array = array();
8756 8756
8757 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8757 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8758 8758 
 		{
8759 8759 
 			$temp_array['hour_name'] = $row['hour_name'];
8760 8760 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8777,34 +8777,34 @@  discard block
 
 block discarded – undo
8777 8777 
 	public function countAllHoursByAirline($airline_icao, $filters = array())
8778 8778 
 	{
8779 8779 
 		global $globalTimezone, $globalDBdriver;
8780 
-		$filter_query = $this->getFilter($filters,true,true);
8780 
+		$filter_query = $this->getFilter($filters, true, true);
8781 8781 
 		if ($globalTimezone != '') {
8782 8782 
 			date_default_timezone_set($globalTimezone);
8783 8783 
 			$datetime = new DateTime();
8784 8784 
 			$offset = $datetime->format('P');
8785 8785 
 		} else $offset = '+00:00';
8786 8786
8787 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
8787 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
8788 8788
8789 8789 
 		if ($globalDBdriver == 'mysql') {
8790 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8790 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8791 8791 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
8792 8792 
 								GROUP BY hour_name
8793 8793 
 								ORDER BY hour_name ASC";
8794 8794 
 		} else {
8795 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8795 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8796 8796 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
8797 8797 
 								GROUP BY hour_name
8798 8798 
 								ORDER BY hour_name ASC";
8799 8799 
 		}
8800 8800
8801 8801 
 		$sth = $this->db->prepare($query);
8802 
-		$sth->execute(array(':airline_icao' => $airline_icao,':offset' => $offset));
8802 
+		$sth->execute(array(':airline_icao' => $airline_icao, ':offset' => $offset));
8803 8803
8804 8804 
 		$hour_array = array();
8805 8805 
 		$temp_array = array();
8806 8806
8807 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8807 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8808 8808 
 		{
8809 8809 
 			$temp_array['hour_name'] = $row['hour_name'];
8810 8810 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8827,8 +8827,8 @@  discard block
 
 block discarded – undo
8827 8827 
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
8828 8828 
 	{
8829 8829 
 		global $globalTimezone, $globalDBdriver;
8830 
-		$filter_query = $this->getFilter($filters,true,true);
8831 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
8830 
+		$filter_query = $this->getFilter($filters, true, true);
8831 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
8832 8832 
 		if ($globalTimezone != '') {
8833 8833 
 			date_default_timezone_set($globalTimezone);
8834 8834 
 			$datetime = new DateTime();
 
@@ -8836,24 +8836,24 @@  discard block
 
 block discarded – undo
8836 8836 
 		} else $offset = '+00:00';
8837 8837
8838 8838 
 		if ($globalDBdriver == 'mysql') {
8839 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8839 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8840 8840 
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
8841 8841 
 								GROUP BY hour_name
8842 8842 
 								ORDER BY hour_name ASC";
8843 8843 
 		} else {
8844 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8844 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8845 8845 
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
8846 8846 
 								GROUP BY hour_name
8847 8847 
 								ORDER BY hour_name ASC";
8848 8848 
 		}
8849 8849
8850 8850 
 		$sth = $this->db->prepare($query);
8851 
-		$sth->execute(array(':aircraft_icao' => $aircraft_icao,':offset' => $offset));
8851 
+		$sth->execute(array(':aircraft_icao' => $aircraft_icao, ':offset' => $offset));
8852 8852
8853 8853 
 		$hour_array = array();
8854 8854 
 		$temp_array = array();
8855 8855
8856 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8856 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8857 8857 
 		{
8858 8858 
 			$temp_array['hour_name'] = $row['hour_name'];
8859 8859 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8874,8 +8874,8 @@  discard block
 
 block discarded – undo
8874 8874 
 	public function countAllHoursByRegistration($registration, $filters = array())
8875 8875 
 	{
8876 8876 
 		global $globalTimezone, $globalDBdriver;
8877 
-		$filter_query = $this->getFilter($filters,true,true);
8878 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
8877 
+		$filter_query = $this->getFilter($filters, true, true);
8878 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
8879 8879 
 		if ($globalTimezone != '') {
8880 8880 
 			date_default_timezone_set($globalTimezone);
8881 8881 
 			$datetime = new DateTime();
 
@@ -8883,24 +8883,24 @@  discard block
 
 block discarded – undo
8883 8883 
 		} else $offset = '+00:00';
8884 8884
8885 8885 
 		if ($globalDBdriver == 'mysql') {
8886 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8886 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8887 8887 
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
8888 8888 
 								GROUP BY hour_name
8889 8889 
 								ORDER BY hour_name ASC";
8890 8890 
 		} else {
8891 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8891 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8892 8892 
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
8893 8893 
 								GROUP BY hour_name
8894 8894 
 								ORDER BY hour_name ASC";
8895 8895 
 		}
8896 8896
8897 8897 
 		$sth = $this->db->prepare($query);
8898 
-		$sth->execute(array(':registration' => $registration,':offset' => $offset));
8898 
+		$sth->execute(array(':registration' => $registration, ':offset' => $offset));
8899 8899
8900 8900 
 		$hour_array = array();
8901 8901 
 		$temp_array = array();
8902 8902
8903 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8903 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8904 8904 
 		{
8905 8905 
 			$temp_array['hour_name'] = $row['hour_name'];
8906 8906 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8921,8 +8921,8 @@  discard block
 
 block discarded – undo
8921 8921 
 	public function countAllHoursByAirport($airport_icao, $filters = array())
8922 8922 
 	{
8923 8923 
 		global $globalTimezone, $globalDBdriver;
8924 
-		$filter_query = $this->getFilter($filters,true,true);
8925 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
8924 
+		$filter_query = $this->getFilter($filters, true, true);
8925 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
8926 8926 
 		if ($globalTimezone != '') {
8927 8927 
 			date_default_timezone_set($globalTimezone);
8928 8928 
 			$datetime = new DateTime();
 
@@ -8930,24 +8930,24 @@  discard block
 
 block discarded – undo
8930 8930 
 		} else $offset = '+00:00';
8931 8931
8932 8932 
 		if ($globalDBdriver == 'mysql') {
8933 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8933 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8934 8934 
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
8935 8935 
 								GROUP BY hour_name
8936 8936 
 								ORDER BY hour_name ASC";
8937 8937 
 		} else {
8938 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8938 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8939 8939 
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
8940 8940 
 								GROUP BY hour_name
8941 8941 
 								ORDER BY hour_name ASC";
8942 8942 
 		}
8943 8943
8944 8944 
 		$sth = $this->db->prepare($query);
8945 
-		$sth->execute(array(':airport_icao' => $airport_icao,':offset' => $offset));
8945 
+		$sth->execute(array(':airport_icao' => $airport_icao, ':offset' => $offset));
8946 8946
8947 8947 
 		$hour_array = array();
8948 8948 
 		$temp_array = array();
8949 8949
8950 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8950 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8951 8951 
 		{
8952 8952 
 			$temp_array['hour_name'] = $row['hour_name'];
8953 8953 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8966,11 +8966,11 @@  discard block
 
 block discarded – undo
8966 8966 
 	* @return Array the hour list
8967 8967 
 	*
8968 8968 
 	*/
8969 
-	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
8969 
+	public function countAllHoursByManufacturer($aircraft_manufacturer, $filters = array())
8970 8970 
 	{
8971 8971 
 		global $globalTimezone, $globalDBdriver;
8972 
-		$filter_query = $this->getFilter($filters,true,true);
8973 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
8972 
+		$filter_query = $this->getFilter($filters, true, true);
8973 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
8974 8974 
 		if ($globalTimezone != '') {
8975 8975 
 			date_default_timezone_set($globalTimezone);
8976 8976 
 			$datetime = new DateTime();
 
@@ -8978,24 +8978,24 @@  discard block
 
 block discarded – undo
8978 8978 
 		} else $offset = '+00:00';
8979 8979
8980 8980 
 		if ($globalDBdriver == 'mysql') {
8981 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8981 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8982 8982 
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
8983 8983 
 								GROUP BY hour_name
8984 8984 
 								ORDER BY hour_name ASC";
8985 8985 
 		} else {
8986 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8986 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8987 8987 
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
8988 8988 
 								GROUP BY hour_name
8989 8989 
 								ORDER BY hour_name ASC";
8990 8990 
 		}
8991 8991
8992 8992 
 		$sth = $this->db->prepare($query);
8993 
-		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer,':offset' => $offset));
8993 
+		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer, ':offset' => $offset));
8994 8994
8995 8995 
 		$hour_array = array();
8996 8996 
 		$temp_array = array();
8997 8997
8998 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8998 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8999 8999 
 		{
9000 9000 
 			$temp_array['hour_name'] = $row['hour_name'];
9001 9001 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9017,8 +9017,8 @@  discard block
 
 block discarded – undo
9017 9017 
 	public function countAllHoursByDate($date, $filters = array())
9018 9018 
 	{
9019 9019 
 		global $globalTimezone, $globalDBdriver;
9020 
-		$filter_query = $this->getFilter($filters,true,true);
9021 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
9020 
+		$filter_query = $this->getFilter($filters, true, true);
9021 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
9022 9022 
 		if ($globalTimezone != '') {
9023 9023 
 			date_default_timezone_set($globalTimezone);
9024 9024 
 			$datetime = new DateTime($date);
 
@@ -9026,12 +9026,12 @@  discard block
 
 block discarded – undo
9026 9026 
 		} else $offset = '+00:00';
9027 9027
9028 9028 
 		if ($globalDBdriver == 'mysql') {
9029 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9029 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9030 9030 
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
9031 9031 
 								GROUP BY hour_name
9032 9032 
 								ORDER BY hour_name ASC";
9033 9033 
 		} else {
9034 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9034 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9035 9035 
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
9036 9036 
 								GROUP BY hour_name
9037 9037 
 								ORDER BY hour_name ASC";
 
@@ -9043,7 +9043,7 @@  discard block
 
 block discarded – undo
9043 9043 
 		$hour_array = array();
9044 9044 
 		$temp_array = array();
9045 9045
9046 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9046 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9047 9047 
 		{
9048 9048 
 			$temp_array['hour_name'] = $row['hour_name'];
9049 9049 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9065,8 +9065,8 @@  discard block
 
 block discarded – undo
9065 9065 
 	public function countAllHoursByIdent($ident, $filters = array())
9066 9066 
 	{
9067 9067 
 		global $globalTimezone, $globalDBdriver;
9068 
-		$filter_query = $this->getFilter($filters,true,true);
9069 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
9068 
+		$filter_query = $this->getFilter($filters, true, true);
9069 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
9070 9070 
 		if ($globalTimezone != '') {
9071 9071 
 			date_default_timezone_set($globalTimezone);
9072 9072 
 			$datetime = new DateTime();
 
@@ -9074,12 +9074,12 @@  discard block
 
 block discarded – undo
9074 9074 
 		} else $offset = '+00:00';
9075 9075
9076 9076 
 		if ($globalDBdriver == 'mysql') {
9077 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9077 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9078 9078 
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident
9079 9079 
 								GROUP BY hour_name
9080 9080 
 								ORDER BY hour_name ASC";
9081 9081 
 		} else {
9082 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9082 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9083 9083 
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident
9084 9084 
 								GROUP BY hour_name
9085 9085 
 								ORDER BY hour_name ASC";
 
@@ -9087,12 +9087,12 @@  discard block
 
 block discarded – undo
9087 9087
9088 9088
9089 9089 
 		$sth = $this->db->prepare($query);
9090 
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
9090 
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
9091 9091
9092 9092 
 		$hour_array = array();
9093 9093 
 		$temp_array = array();
9094 9094
9095 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9095 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9096 9096 
 		{
9097 9097 
 			$temp_array['hour_name'] = $row['hour_name'];
9098 9098 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9111,12 +9111,12 @@  discard block
 
 block discarded – undo
9111 9111 
 	* @return Array the hour list
9112 9112 
 	*
9113 9113 
 	*/
9114 
-	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
9114 
+	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
9115 9115 
 	{
9116 9116 
 		global $globalTimezone, $globalDBdriver;
9117 
-		$filter_query = $this->getFilter($filters,true,true);
9118 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
9119 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
9117 
+		$filter_query = $this->getFilter($filters, true, true);
9118 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
9119 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
9120 9120 
 		if ($globalTimezone != '') {
9121 9121 
 			date_default_timezone_set($globalTimezone);
9122 9122 
 			$datetime = new DateTime();
 
@@ -9124,24 +9124,24 @@  discard block
 
 block discarded – undo
9124 9124 
 		} else $offset = '+00:00';
9125 9125
9126 9126 
 		if ($globalDBdriver == 'mysql') {
9127 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9127 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9128 9128 
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
9129 9129 
 								GROUP BY hour_name
9130 9130 
 								ORDER BY hour_name ASC";
9131 9131 
 		} else {
9132 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9132 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9133 9133 
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
9134 9134 
 								GROUP BY hour_name
9135 9135 
 								ORDER BY hour_name ASC";
9136 9136 
 		}
9137 9137
9138 9138 
 		$sth = $this->db->prepare($query);
9139 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':offset' => $offset));
9139 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':offset' => $offset));
9140 9140
9141 9141 
 		$hour_array = array();
9142 9142 
 		$temp_array = array();
9143 9143
9144 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9144 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9145 9145 
 		{
9146 9146 
 			$temp_array['hour_name'] = $row['hour_name'];
9147 9147 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9162,8 +9162,8 @@  discard block
 
 block discarded – undo
9162 9162 
 	public function countAllHoursByCountry($country, $filters = array())
9163 9163 
 	{
9164 9164 
 		global $globalTimezone, $globalDBdriver;
9165 
-		$filter_query = $this->getFilter($filters,true,true);
9166 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
9165 
+		$filter_query = $this->getFilter($filters, true, true);
9166 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
9167 9167 
 		if ($globalTimezone != '') {
9168 9168 
 			date_default_timezone_set($globalTimezone);
9169 9169 
 			$datetime = new DateTime();
 
@@ -9171,24 +9171,24 @@  discard block
 
 block discarded – undo
9171 9171 
 		} else $offset = '+00:00';
9172 9172
9173 9173 
 		if ($globalDBdriver == 'mysql') {
9174 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9174 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9175 9175 
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
9176 9176 
 								GROUP BY hour_name
9177 9177 
 								ORDER BY hour_name ASC";
9178 9178 
 		} else {
9179 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9179 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9180 9180 
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
9181 9181 
 								GROUP BY hour_name
9182 9182 
 								ORDER BY hour_name ASC";
9183 9183 
 		}
9184 9184
9185 9185 
 		$sth = $this->db->prepare($query);
9186 
-		$sth->execute(array(':country' => $country,':offset' => $offset));
9186 
+		$sth->execute(array(':country' => $country, ':offset' => $offset));
9187 9187
9188 9188 
 		$hour_array = array();
9189 9189 
 		$temp_array = array();
9190 9190
9191 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9191 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9192 9192 
 		{
9193 9193 
 			$temp_array['hour_name'] = $row['hour_name'];
9194 9194 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9210,8 +9210,8 @@  discard block
 
 block discarded – undo
9210 9210 
 	*/
9211 9211 
 	public function countOverallAircrafts($filters = array())
9212 9212 
 	{
9213 
-		$filter_query = $this->getFilter($filters,true,true);
9214 
-		$query  = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count
9213 
+		$filter_query = $this->getFilter($filters, true, true);
9214 
+		$query = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count
9215 9215 
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''";
9216 9216 
 		$sth = $this->db->prepare($query);
9217 9217 
 		$sth->execute();
 
@@ -9226,8 +9226,8 @@  discard block
 
 block discarded – undo
9226 9226 
 	*/
9227 9227 
 	public function countOverallArrival($filters = array())
9228 9228 
 	{
9229 
-		$filter_query = $this->getFilter($filters,true,true);
9230 
-		$query  = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count
9229 
+		$filter_query = $this->getFilter($filters, true, true);
9230 
+		$query = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count
9231 9231 
                     FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> ''";
9232 9232
9233 9233 
 		$sth = $this->db->prepare($query);
 
@@ -9243,8 +9243,8 @@  discard block
 
 block discarded – undo
9243 9243 
 	*/
9244 9244 
 	public function countOverallPilots($filters = array())
9245 9245 
 	{
9246 
-		$filter_query = $this->getFilter($filters,true,true);
9247 
-		$query  = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count
9246 
+		$filter_query = $this->getFilter($filters, true, true);
9247 
+		$query = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count
9248 9248 
                     FROM spotter_output".$filter_query." spotter_output.pilot_id <> ''";
9249 9249 
 		$sth = $this->db->prepare($query);
9250 9250 
 		$sth->execute();
 
@@ -9259,8 +9259,8 @@  discard block
 
 block discarded – undo
9259 9259 
 	*/
9260 9260 
 	public function countOverallOwners($filters = array())
9261 9261 
 	{
9262 
-		$filter_query = $this->getFilter($filters,true,true);
9263 
-		$query  = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count
9262 
+		$filter_query = $this->getFilter($filters, true, true);
9263 
+		$query = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count
9264 9264 
                     FROM spotter_output".$filter_query." spotter_output.owner_name <> ''";
9265 9265 
 		$sth = $this->db->prepare($query);
9266 9266 
 		$sth->execute();
 
@@ -9293,8 +9293,8 @@  discard block
 
 block discarded – undo
9293 9293 
 	*/
9294 9294 
 	public function countOverallMilitaryFlights($filters = array())
9295 9295 
 	{
9296 
-		$filter_query = $this->getFilter($filters,true,true);
9297 
-		$query  = "SELECT COUNT(spotter_output.spotter_id) AS flight_count
9296 
+		$filter_query = $this->getFilter($filters, true, true);
9297 
+		$query = "SELECT COUNT(spotter_output.spotter_id) AS flight_count
9298 9298 
                     FROM airlines,spotter_output".$filter_query." spotter_output.airline_icao = airlines.icao AND airlines.type = 'military'";
9299 9299
9300 9300 
 		$sth = $this->db->prepare($query);
 
@@ -9331,7 +9331,7 @@  discard block
 
 block discarded – undo
9331 9331 
 	public function countAllHoursFromToday($filters = array())
9332 9332 
 	{
9333 9333 
 		global $globalTimezone, $globalDBdriver;
9334 
-		$filter_query = $this->getFilter($filters,true,true);
9334 
+		$filter_query = $this->getFilter($filters, true, true);
9335 9335 
 		if ($globalTimezone != '') {
9336 9336 
 			date_default_timezone_set($globalTimezone);
9337 9337 
 			$datetime = new DateTime();
 
@@ -9339,12 +9339,12 @@  discard block
 
 block discarded – undo
9339 9339 
 		} else $offset = '+00:00';
9340 9340
9341 9341 
 		if ($globalDBdriver == 'mysql') {
9342 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9342 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9343 9343 
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = CURDATE()
9344 9344 
 								GROUP BY hour_name
9345 9345 
 								ORDER BY hour_name ASC";
9346 9346 
 		} else {
9347 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9347 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9348 9348 
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
9349 9349 
 								GROUP BY hour_name
9350 9350 
 								ORDER BY hour_name ASC";
 
@@ -9356,7 +9356,7 @@  discard block
 
 block discarded – undo
9356 9356 
 		$hour_array = array();
9357 9357 
 		$temp_array = array();
9358 9358
9359 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9359 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9360 9360 
 		{
9361 9361 
 			$temp_array['hour_name'] = $row['hour_name'];
9362 9362 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9375,14 +9375,14 @@  discard block
 
 block discarded – undo
9375 9375 
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
9376 9376 
 	{
9377 9377 
 		global $global_query, $globalDBdriver, $globalTimezone;
9378 
-		$filter_query = $this->getFilter($filters,true,true);
9378 
+		$filter_query = $this->getFilter($filters, true, true);
9379 9379 
 		date_default_timezone_set('UTC');
9380 9380 
 		$limit_query = '';
9381 9381 
 		if ($limit != "")
9382 9382 
 		{
9383 9383 
 			$limit_array = explode(",", $limit);
9384 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
9385 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
9384 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
9385 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
9386 9386 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
9387 9387 
 			{
9388 9388 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 
@@ -9435,7 +9435,7 @@  discard block
 
 block discarded – undo
9435 9435 
 			    GROUP BY spotter_output.ident,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time, to_char(spotter_output.date,'HH')
9436 9436 
 			    HAVING count(spotter_output.ident) > 5$orderby_query";
9437 9437 
 			//echo $query;
9438 
-			$spotter_array = $this->getDataFromDB($query.$limit_query,array(':timezone' => $globalTimezone));
9438 
+			$spotter_array = $this->getDataFromDB($query.$limit_query, array(':timezone' => $globalTimezone));
9439 9439 
 			/*
9440 9440 
 			$sth = $this->db->prepare($query);
9441 9441 
 			$sth->execute(array(':timezone' => $globalTimezone));
 
@@ -9454,9 +9454,9 @@  discard block
 
 block discarded – undo
9454 9454 
 	*/
9455 9455 
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
9456 9456 
 	{
9457 
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
9457 
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
9458 9458
9459 
-		$query  = "SELECT spotter_output.spotter_id
9459 
+		$query = "SELECT spotter_output.spotter_id
9460 9460 
 								FROM spotter_output
9461 9461 
 								WHERE spotter_output.flightaware_id = '".$flightaware_id."'";
9462 9462 
         
@@ -9464,7 +9464,7 @@  discard block
 
 block discarded – undo
9464 9464 
 		$sth = $this->db->prepare($query);
9465 9465 
 		$sth->execute();
9466 9466
9467 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9467 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9468 9468 
 		{
9469 9469 
 			return $row['spotter_id'];
9470 9470 
 		}
 
@@ -9489,23 +9489,23 @@  discard block
 
 block discarded – undo
9489 9489 
 		}
9490 9490
9491 9491 
 		$current_date = date("Y-m-d H:i:s");
9492 
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
9492 
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
9493 9493
9494 9494 
 		$diff = abs(strtotime($current_date) - strtotime($date));
9495 9495
9496 
-		$time_array['years'] = floor($diff / (365*60*60*24));
9496 
+		$time_array['years'] = floor($diff/(365*60*60*24));
9497 9497 
 		$years = $time_array['years'];
9498 9498
9499 
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
9499 
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
9500 9500 
 		$months = $time_array['months'];
9501 9501
9502 
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
9502 
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
9503 9503 
 		$days = $time_array['days'];
9504 
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
9504 
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
9505 9505 
 		$hours = $time_array['hours'];
9506 
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
9506 
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
9507 9507 
 		$minutes = $time_array['minutes'];
9508 
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
9508 
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
9509 9509
9510 9510 
 		return $time_array;
9511 9511 
 	}	
@@ -9531,63 +9531,63 @@  discard block
 
 block discarded – undo
9531 9531 
 			$temp_array['direction_degree'] = $direction;
9532 9532 
 			$temp_array['direction_shortname'] = "N";
9533 9533 
 			$temp_array['direction_fullname'] = "North";
9534 
-		} elseif ($direction >= 22.5 && $direction < 45){
9534 
+		} elseif ($direction >= 22.5 && $direction < 45) {
9535 9535 
 			$temp_array['direction_degree'] = $direction;
9536 9536 
 			$temp_array['direction_shortname'] = "NNE";
9537 9537 
 			$temp_array['direction_fullname'] = "North-Northeast";
9538 
-		} elseif ($direction >= 45 && $direction < 67.5){
9538 
+		} elseif ($direction >= 45 && $direction < 67.5) {
9539 9539 
 			$temp_array['direction_degree'] = $direction;
9540 9540 
 			$temp_array['direction_shortname'] = "NE";
9541 9541 
 			$temp_array['direction_fullname'] = "Northeast";
9542 
-		} elseif ($direction >= 67.5 && $direction < 90){
9542 
+		} elseif ($direction >= 67.5 && $direction < 90) {
9543 9543 
 			$temp_array['direction_degree'] = $direction;
9544 9544 
 			$temp_array['direction_shortname'] = "ENE";
9545 9545 
 			$temp_array['direction_fullname'] = "East-Northeast";
9546 
-		} elseif ($direction >= 90 && $direction < 112.5){
9546 
+		} elseif ($direction >= 90 && $direction < 112.5) {
9547 9547 
 			$temp_array['direction_degree'] = $direction;
9548 9548 
 			$temp_array['direction_shortname'] = "E";
9549 9549 
 			$temp_array['direction_fullname'] = "East";
9550 
-		} elseif ($direction >= 112.5 && $direction < 135){
9550 
+		} elseif ($direction >= 112.5 && $direction < 135) {
9551 9551 
 			$temp_array['direction_degree'] = $direction;
9552 9552 
 			$temp_array['direction_shortname'] = "ESE";
9553 9553 
 			$temp_array['direction_fullname'] = "East-Southeast";
9554 
-		} elseif ($direction >= 135 && $direction < 157.5){
9554 
+		} elseif ($direction >= 135 && $direction < 157.5) {
9555 9555 
 			$temp_array['direction_degree'] = $direction;
9556 9556 
 			$temp_array['direction_shortname'] = "SE";
9557 9557 
 			$temp_array['direction_fullname'] = "Southeast";
9558 
-		} elseif ($direction >= 157.5 && $direction < 180){
9558 
+		} elseif ($direction >= 157.5 && $direction < 180) {
9559 9559 
 			$temp_array['direction_degree'] = $direction;
9560 9560 
 			$temp_array['direction_shortname'] = "SSE";
9561 9561 
 			$temp_array['direction_fullname'] = "South-Southeast";
9562 
-		} elseif ($direction >= 180 && $direction < 202.5){
9562 
+		} elseif ($direction >= 180 && $direction < 202.5) {
9563 9563 
 			$temp_array['direction_degree'] = $direction;
9564 9564 
 			$temp_array['direction_shortname'] = "S";
9565 9565 
 			$temp_array['direction_fullname'] = "South";
9566 
-		} elseif ($direction >= 202.5 && $direction < 225){
9566 
+		} elseif ($direction >= 202.5 && $direction < 225) {
9567 9567 
 			$temp_array['direction_degree'] = $direction;
9568 9568 
 			$temp_array['direction_shortname'] = "SSW";
9569 9569 
 			$temp_array['direction_fullname'] = "South-Southwest";
9570 
-		} elseif ($direction >= 225 && $direction < 247.5){
9570 
+		} elseif ($direction >= 225 && $direction < 247.5) {
9571 9571 
 			$temp_array['direction_degree'] = $direction;
9572 9572 
 			$temp_array['direction_shortname'] = "SW";
9573 9573 
 			$temp_array['direction_fullname'] = "Southwest";
9574 
-		} elseif ($direction >= 247.5 && $direction < 270){
9574 
+		} elseif ($direction >= 247.5 && $direction < 270) {
9575 9575 
 			$temp_array['direction_degree'] = $direction;
9576 9576 
 			$temp_array['direction_shortname'] = "WSW";
9577 9577 
 			$temp_array['direction_fullname'] = "West-Southwest";
9578 
-		} elseif ($direction >= 270 && $direction < 292.5){
9578 
+		} elseif ($direction >= 270 && $direction < 292.5) {
9579 9579 
 			$temp_array['direction_degree'] = $direction;
9580 9580 
 			$temp_array['direction_shortname'] = "W";
9581 9581 
 			$temp_array['direction_fullname'] = "West";
9582 
-		} elseif ($direction >= 292.5 && $direction < 315){
9582 
+		} elseif ($direction >= 292.5 && $direction < 315) {
9583 9583 
 			$temp_array['direction_degree'] = $direction;
9584 9584 
 			$temp_array['direction_shortname'] = "WNW";
9585 9585 
 			$temp_array['direction_fullname'] = "West-Northwest";
9586 
-		} elseif ($direction >= 315 && $direction < 337.5){
9586 
+		} elseif ($direction >= 315 && $direction < 337.5) {
9587 9587 
 			$temp_array['direction_degree'] = $direction;
9588 9588 
 			$temp_array['direction_shortname'] = "NW";
9589 9589 
 			$temp_array['direction_fullname'] = "Northwest";
9590 
-		} elseif ($direction >= 337.5 && $direction < 360){
9590 
+		} elseif ($direction >= 337.5 && $direction < 360) {
9591 9591 
 			$temp_array['direction_degree'] = $direction;
9592 9592 
 			$temp_array['direction_shortname'] = "NNW";
9593 9593 
 			$temp_array['direction_fullname'] = "North-Northwest";
 
@@ -9640,9 +9640,9 @@  discard block
 
 block discarded – undo
9640 9640 
 	*/
9641 9641 
 	public function getAircraftRegistrationBymodeS($aircraft_modes)
9642 9642 
 	{
9643 
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
9643 
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
9644 9644
9645 
-		$query  = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
9645 
+		$query = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
9646 9646
9647 9647 
 		$sth = $this->db->prepare($query);
9648 9648 
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
 
@@ -9665,9 +9665,9 @@  discard block
 
 block discarded – undo
9665 9665 
 	*/
9666 9666 
 	public function getAircraftTypeBymodeS($aircraft_modes)
9667 9667 
 	{
9668 
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
9668 
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
9669 9669
9670 
-		$query  = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
9670 
+		$query = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
9671 9671
9672 9672 
 		$sth = $this->db->prepare($query);
9673 9673 
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
 
@@ -9688,11 +9688,11 @@  discard block
 
 block discarded – undo
9688 9688 
 	* @param Float $longitude longitute of the flight
9689 9689 
 	* @return String the countrie
9690 9690 
 	*/
9691 
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
9691 
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
9692 9692 
 	{
9693 9693 
 		global $globalDBdriver, $globalDebug;
9694 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9695 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9694 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
9695 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
9696 9696
9697 9697 
 		$Connection = new Connection($this->db);
9698 9698 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -9732,19 +9732,19 @@  discard block
 
 block discarded – undo
9732 9732 
 	*/
9733 9733 
 	public function convertAircraftRegistration($registration)
9734 9734 
 	{
9735 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9735 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9736 9736 
 		$registration_prefix = '';
9737 9737 
 		$registration_1 = substr($registration, 0, 1);
9738 9738 
 		$registration_2 = substr($registration, 0, 2);
9739 9739
9740 9740 
 		//first get the prefix based on two characters
9741 
-		$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
9741 
+		$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
9742 9742
9743 9743
9744 9744 
 		$sth = $this->db->prepare($query);
9745 9745 
 		$sth->execute(array(':registration_2' => $registration_2));
9746 9746
9747 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9747 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9748 9748 
 		{
9749 9749 
 			$registration_prefix = $row['registration_prefix'];
9750 9750 
 		}
 
@@ -9752,11 +9752,11 @@  discard block
 
 block discarded – undo
9752 9752 
 		//if we didn't find a two chracter prefix lets just search the one with one character
9753 9753 
 		if ($registration_prefix == '')
9754 9754 
 		{
9755 
-			$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
9755 
+			$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
9756 9756 
 			$sth = $this->db->prepare($query);
9757 9757 
 			$sth->execute(array(':registration_1' => $registration_1));
9758 9758
9759 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9759 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9760 9760 
 			{
9761 9761 
 				$registration_prefix = $row['registration_prefix'];
9762 9762 
 			}
 
@@ -9770,7 +9770,7 @@  discard block
 
 block discarded – undo
9770 9770 
 			} else {
9771 9771 
 				$registration = preg_replace("/^(.{1})/", "$1-", $registration);
9772 9772 
 			}
9773 
-		} else if(strlen($registration_prefix) == 2){
9773 
+		} else if (strlen($registration_prefix) == 2) {
9774 9774 
 			if (0 === strpos($registration, 'N')) {
9775 9775 
 				$registration = preg_replace("/^(.{2})/", "$1", $registration);
9776 9776 
 			} else {
 
@@ -9789,17 +9789,17 @@  discard block
 
 block discarded – undo
9789 9789 
 	*/
9790 9790 
 	public function countryFromAircraftRegistration($registration)
9791 9791 
 	{
9792 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9792 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9793 9793
9794 9794 
 		$registration_prefix = '';
9795 
-		$registration_test = explode('-',$registration);
9795 
+		$registration_test = explode('-', $registration);
9796 9796 
 		$country = '';
9797 9797 
 		if ($registration_test[0] != $registration) {
9798 9798 
 			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9799 9799
9800 9800 
 			$sth = $this->db->prepare($query);
9801 9801 
 			$sth->execute(array(':registration_1' => $registration_test[0]));
9802 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9802 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9803 9803 
 			{
9804 9804 
 				//$registration_prefix = $row['registration_prefix'];
9805 9805 
 				$country = $row['country'];
 
@@ -9810,13 +9810,13 @@  discard block
 
 block discarded – undo
9810 9810
9811 9811 
 			$country = '';
9812 9812 
 			//first get the prefix based on two characters
9813 
-			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
9813 
+			$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
9814 9814
9815 9815
9816 9816 
 			$sth = $this->db->prepare($query);
9817 9817 
 			$sth->execute(array(':registration_2' => $registration_2));
9818 9818
9819 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9819 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9820 9820 
 			{
9821 9821 
 				$registration_prefix = $row['registration_prefix'];
9822 9822 
 				$country = $row['country'];
 
@@ -9825,12 +9825,12 @@  discard block
 
 block discarded – undo
9825 9825 
 			//if we didn't find a two chracter prefix lets just search the one with one character
9826 9826 
 			if ($registration_prefix == "")
9827 9827 
 			{
9828 
-				$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9828 
+				$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9829 9829
9830 9830 
 				$sth = $this->db->prepare($query);
9831 9831 
 				$sth->execute(array(':registration_1' => $registration_1));
9832 9832
9833 
-				while($row = $sth->fetch(PDO::FETCH_ASSOC))
9833 
+				while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9834 9834 
 				{
9835 9835 
 					//$registration_prefix = $row['registration_prefix'];
9836 9836 
 					$country = $row['country'];
 
@@ -9847,9 +9847,9 @@  discard block
 
 block discarded – undo
9847 9847 
 	* @param String $flightaware_id flightaware_id from spotter_output table
9848 9848 
 	* @param String $highlight New highlight value
9849 9849 
 	*/
9850 
-	public function setHighlightFlight($flightaware_id,$highlight) {
9850 
+	public function setHighlightFlight($flightaware_id, $highlight) {
9851 9851
9852 
-		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
9852 
+		$query = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
9853 9853 
 		$sth = $this->db->prepare($query);
9854 9854 
 		$sth->execute(array(':flightaware_id' => $flightaware_id, ':highlight' => $highlight));
9855 9855 
 	}
 
@@ -9878,7 +9878,7 @@  discard block
 
 block discarded – undo
9878 9878
9879 9879 
 		$bitly_data = json_decode($bitly_data);
9880 9880 
 		$bitly_url = '';
9881 
-		if ($bitly_data->status_txt = "OK"){
9881 
+		if ($bitly_data->status_txt = "OK") {
9882 9882 
 			$bitly_url = $bitly_data->data->url;
9883 9883 
 		}
9884 9884 
 
@@ -9888,7 +9888,7 @@  discard block
 
 block discarded – undo
9888 9888
9889 9889 
 	public function getOrderBy()
9890 9890 
 	{
9891 
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
9891 
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
9892 9892
9893 9893 
 		return $orderby;
9894 9894 
 		
@@ -10022,14 +10022,14 @@  discard block
 
 block discarded – undo
10022 10022 
 		}
10023 10023 
 		$sth = $this->db->prepare($query);
10024 10024 
 		$sth->execute();
10025 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10025 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10026 10026 
 		{
10027 10027 
 			$departure_airport_array = $this->getAllAirportInfo($row['fromairport_icao']);
10028 10028 
 			$arrival_airport_array = $this->getAllAirportInfo($row['toairport_icao']);
10029 10029 
 			if (count($departure_airport_array) > 0 && count($arrival_airport_array) > 0) {
10030 
-				$update_query="UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id";
10030 
+				$update_query = "UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id";
10031 10031 
 				$sthu = $this->db->prepare($update_query);
10032 
-				$sthu->execute(array(':fromicao' => $row['fromairport_icao'],':toicao' => $row['toairport_icao'],':spotter_id' => $row['spotter_id'],':departure_airport_name' => $departure_airport_array[0]['name'],':departure_airport_city' => $departure_airport_array[0]['city'],':departure_airport_country' => $departure_airport_array[0]['country'],':arrival_airport_name' => $arrival_airport_array[0]['name'],':arrival_airport_city' => $arrival_airport_array[0]['city'],':arrival_airport_country' => $arrival_airport_array[0]['country']));
10032 
+				$sthu->execute(array(':fromicao' => $row['fromairport_icao'], ':toicao' => $row['toairport_icao'], ':spotter_id' => $row['spotter_id'], ':departure_airport_name' => $departure_airport_array[0]['name'], ':departure_airport_city' => $departure_airport_array[0]['city'], ':departure_airport_country' => $departure_airport_array[0]['country'], ':arrival_airport_name' => $arrival_airport_array[0]['name'], ':arrival_airport_city' => $arrival_airport_array[0]['city'], ':arrival_airport_country' => $arrival_airport_array[0]['country']));
10033 10033 
 			}
10034 10034 
 		}
10035 10035 
 		
@@ -10042,7 +10042,7 @@  discard block
 
 block discarded – undo
10042 10042 
 		}
10043 10043 
 		$sth = $this->db->prepare($query);
10044 10044 
 		$sth->execute();
10045 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10045 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10046 10046 
 		{
10047 10047 
 			if (is_numeric(substr($row['ident'], -1, 1)))
10048 10048 
 			{
 
@@ -10051,11 +10051,11 @@  discard block
 
 block discarded – undo
10051 10051 
 				elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
10052 10052 
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
10053 10053 
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
10054 
-				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
10054 
+				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
10055 10055 
 				if (isset($airline_array[0]['name'])) {
10056 
-					$update_query  = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id";
10056 
+					$update_query = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id";
10057 10057 
 					$sthu = $this->db->prepare($update_query);
10058 
-					$sthu->execute(array(':airline_name' => $airline_array[0]['name'],':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id']));
10058 
+					$sthu->execute(array(':airline_name' => $airline_array[0]['name'], ':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id']));
10059 10059 
 				}
10060 10060 
 			}
10061 10061 
 		}
 
@@ -10075,18 +10075,18 @@  discard block
 
 block discarded – undo
10075 10075 
 		}
10076 10076 
 		$sth = $this->db->prepare($query);
10077 10077 
 		$sth->execute();
10078 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10078 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10079 10079 
 		{
10080 10080 
 			if ($row['aircraft_icao'] != '') {
10081 10081 
 				$aircraft_name = $this->getAllAircraftInfo($row['aircraft_icao']);
10082 
-				if ($row['registration'] != ""){
10082 
+				if ($row['registration'] != "") {
10083 10083 
 					$image_array = $Image->getSpotterImage($row['registration']);
10084 10084 
 					if (!isset($image_array[0]['registration'])) {
10085 10085 
 						$Image->addSpotterImage($row['registration']);
10086 10086 
 					}
10087 10087 
 				}
10088 10088 
 				if (count($aircraft_name) > 0) {
10089 
-					$update_query  = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id";
10089 
+					$update_query = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id";
10090 10090 
 					$sthu = $this->db->prepare($update_query);
10091 10091 
 					$sthu->execute(array(':aircraft_name' => $aircraft_name[0]['type'], ':aircraft_manufacturer' => $aircraft_name[0]['manufacturer'], ':spotter_id' => $row['spotter_id']));
10092 10092 
 				}
 
@@ -10101,10 +10101,10 @@  discard block
 
 block discarded – undo
10101 10101 
 		$query = "SELECT spotter_output.spotter_id, spotter_output.last_latitude, spotter_output.last_longitude, spotter_output.last_altitude, spotter_output.arrival_airport_icao, spotter_output.real_arrival_airport_icao FROM spotter_output";
10102 10102 
 		$sth = $this->db->prepare($query);
10103 10103 
 		$sth->execute();
10104 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10104 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10105 10105 
 		{
10106 10106 
 			if ($row['last_latitude'] != '' && $row['last_longitude'] != '') {
10107 
-				$closestAirports = $this->closestAirports($row['last_latitude'],$row['last_longitude'],$globalClosestMinDist);
10107 
+				$closestAirports = $this->closestAirports($row['last_latitude'], $row['last_longitude'], $globalClosestMinDist);
10108 10108 
 				$airport_icao = '';
10109 10109 
 				 if (isset($closestAirports[0])) {
10110 10110 
 					if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) {
 
@@ -10118,7 +10118,7 @@  discard block
 
 block discarded – undo
10118 10118 
 								break;
10119 10119 
 							}
10120 10120 
 						}
10121 
-					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) {
10121 
+					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100 + 1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude'] + 5000))) {
10122 10122 
 						$airport_icao = $closestAirports[0]['icao'];
10123 10123 
 						if ($globalDebug) echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." !  Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
10124 10124 
 					} else {
 
@@ -10129,28 +10129,28 @@  discard block
 
 block discarded – undo
10129 10129 
 				}
10130 10130 
 				if ($row['real_arrival_airport_icao'] != $airport_icao) {
10131 10131 
 					if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n";
10132 
-					$update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10132 
+					$update_query = "UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10133 10133 
 					$sthu = $this->db->prepare($update_query);
10134 
-					$sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id']));
10134 
+					$sthu->execute(array(':airport_icao' => $airport_icao, ':spotter_id' => $row['spotter_id']));
10135 10135 
 				}
10136 10136 
 			}
10137 10137 
 		}
10138 10138 
 	}
10139 10139
10140 
-	public function closestAirports($origLat,$origLon,$dist = 10) {
10140 
+	public function closestAirports($origLat, $origLon, $dist = 10) {
10141 10141 
 		global $globalDBdriver;
10142 
-		$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
10142 
+		$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
10143 10143 
 /*
10144 10144 
 		$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - abs(latitude))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(abs(latitude)*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance
10145 10145 
                       FROM airport WHERE longitude between ($origLon-$dist/abs(cos(radians($origLat))*69)) and ($origLon+$dist/abs(cos(radians($origLat))*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
10146 10146 
                       having distance < $dist ORDER BY distance limit 100;";
10147 10147 
 */
10148 10148 
 		if ($globalDBdriver == 'mysql') {
10149 
-			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance
10149 
+			$query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance
10150 10150 
 	                      FROM airport WHERE longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
10151 10151 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
10152 10152 
                 } else {
10153 
-			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance
10153 
+			$query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance
10154 10154 
 	                      FROM airport WHERE CAST(longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
10155 10155 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
10156 10156 
     		}
Please login to merge, or discard this patch.