View GitHub Repository FlightAirMap

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