Ysurac / FlightAirMap

require/class.GeoidHeight.php

Doc Comments +4 added lines

@@ -91,6 +91,10 @@
 		$this->rlatres = (($this->height - 1) / 180.0);
 	}
 
+	/**
+	 * @param integer $ix
+	 * @param integer $iy
+	 */
 	private function _rawval($ix,$iy) {
 		if (($iy < 0)) {
 			$iy = -$iy;

Spacing +35 added lines, -35 removed lines

@@ -11,7 +11,7 @@ 
 * Translated to PHP of GeographicLib/src/Geoid.cpp
 * by Ycarus <ycarus@zugaina.org> in 2017
 */
-class GeoidHeight  {
+class GeoidHeight {
 	private $c0 = 240;
 	private $c3 = [[9, -18, -88, 0, 96, 90, 0, 0, -60, -20], [-9, 18, 8, 0, -96, 30, 0, 0, 60, -20], [9, -88, -18, 90, 96, 0, -20, -60, 0, 0], [186, -42, -42, -150, -96, -150, 60, 60, 60, 60], [54, 162, -78, 30, -24, -90, -60, 60, -60, 60], [-9, -32, 18, 30, 24, 0, 20, -60, 0, 0], [-9, 8, 18, 30, -96, 0, -20, 60, 0, 0], [54, -78, 162, -90, -24, 30, 60, -60, 60, -60], [-54, 78, 78, 90, 144, 90, -60, -60, -60, -60], [9, -8, -18, -30, -24, 0, 20, 60, 0, 0], [-9, 18, -32, 0, 24, 30, 0, 0, -60, 20], [9, -18, -8, 0, -24, -30, 0, 0, 60, 20]];
 	private $c0n = 372;
@@ -34,7 +34,7 @@ 
 	private $v10 = null;
 	private $v11 = null;
 
-	public function __construct($name='') {
+	public function __construct($name = '') {
 		global $globalGeoidSource;
 		//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
 		if ($name == '') {
@@ -45,35 +45,35 @@ 
 		if (file_exists($name) === FALSE) {
 			throw new Exception($name." doesn't exist");
 		}
-		$f = @fopen($name,"r");
+		$f = @fopen($name, "r");
 		if ($f === FALSE) {
 			throw new Exception("Can't open ".$name);
 		}
-		$line = fgets($f,4096);
+		$line = fgets($f, 4096);
 		if (trim($line) != 'P5') {
 			throw new Exception('No PGM header');
 		}
 		$headerlen = strlen($line);
 		while (true) {
-			$line = fgets($f,4096);
+			$line = fgets($f, 4096);
 			if ((strlen($line) == 0)) {
 				throw new Exception('EOF before end of file header');
 			}
 			$headerlen += strlen($line);
-			if (strpos($line,'# Offset ') !== FALSE) {
+			if (strpos($line, '# Offset ') !== FALSE) {
 				$this->offset = substr($line, 9);
-			} else if (strpos($line,'# Scale ') !== FALSE) {
+			} else if (strpos($line, '# Scale ') !== FALSE) {
 				$this->scale = substr($line, 8);
-			} else if ((strpos($line,'#') === FALSE)) {
-				list($this->width, $this->height) = preg_split('/\s+/',$line);
+			} else if ((strpos($line, '#') === FALSE)) {
+				list($this->width, $this->height) = preg_split('/\s+/', $line);
 				break;
 			}
 		}
-		$line = fgets($f,4096);
+		$line = fgets($f, 4096);
 		$headerlen += strlen($line);
-		$levels = (int)$line;
-		$this->width = (int)$this->width;
-		$this->height = (int)$this->height;
+		$levels = (int) $line;
+		$this->width = (int) $this->width;
+		$this->height = (int) $this->height;
 		if (($levels != 65535)) {
 			throw new Exception('PGM file must have 65535 gray levels ('.$levels.')');
 		}
@@ -88,42 +88,42 @@ 
 		}
 
 		$fullsize = filesize($name);
-		if ((($fullsize - $headerlen) != (($this->width * $this->height) * 2))) {
+		if ((($fullsize - $headerlen) != (($this->width*$this->height)*2))) {
 			throw new Exception('File has the wrong length');
 		}
 
 		$this->headerlen = $headerlen;
-		$this->raw= $f;
-		$this->rlonres = ($this->width / 360.0);
-		$this->rlatres = (($this->height - 1) / 180.0);
+		$this->raw = $f;
+		$this->rlonres = ($this->width/360.0);
+		$this->rlatres = (($this->height - 1)/180.0);
 	}
 
-	private function _rawval($ix,$iy) {
+	private function _rawval($ix, $iy) {
 		if (($iy < 0)) {
 			$iy = -$iy;
-			$ix += ($this->width / 2);
+			$ix += ($this->width/2);
 		} else if (($iy >= $this->height)) {
-			$iy = ((2 * ($this->height - 1)) - $iy);
-			$ix += ($this->width / 2);
+			$iy = ((2*($this->height - 1)) - $iy);
+			$ix += ($this->width/2);
 		}
 		if (($ix < 0)) {
 			$ix += $this->width;
 		} else if (($ix >= $this->width)) {
 			$ix -= $this->width;
 		}
-		$k = ((($iy * $this->width) + $ix) * 2) + $this->headerlen;
-		fseek($this->raw,$k);
-		return unpack('n',fread($this->raw,2))[1];
+		$k = ((($iy*$this->width) + $ix)*2) + $this->headerlen;
+		fseek($this->raw, $k);
+		return unpack('n', fread($this->raw, 2))[1];
 	}
 
-	public function get($lat,$lon,$cubic=true) {
+	public function get($lat, $lon, $cubic = true) {
 		if (($lon < 0)) {
 			$lon += 360;
 		}
-		$fy = ((90 - $lat) * $this->rlatres);
-		$fx = ($lon * $this->rlonres);
-		$iy = (int)$fy;
-		$ix = (int)$fx;
+		$fy = ((90 - $lat)*$this->rlatres);
+		$fx = ($lon*$this->rlonres);
+		$iy = (int) $fy;
+		$ix = (int) $fx;
 		$fx -= $ix;
 		$fy -= $iy;
 		$t = array();
@@ -150,7 +150,7 @@ 
 					$c3x = $this->c3;
 					$c0x = $this->c0;
 				}
-				for ($i = 0; $i < 10;++$i) {
+				for ($i = 0; $i < 10; ++$i) {
 					$t[$i] = 0;
 					for ($j = 0; $j < 12; ++$j) {
 						$t[$i] += $v[$j]*$c3x[$j][$i];
@@ -161,13 +161,13 @@ 
 			$this->t = $t;
 		} else $t = $this->t;
 		if (!($cubic)) {
-			$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
-			$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));
-			$h = (((1 - $fy) * $a) + ($fy * $b));
+			$a = (((1 - $fx)*$this->v00) + ($fx*$this->v01));
+			$b = (((1 - $fx)*$this->v10) + ($fx*$this->v11));
+			$h = (((1 - $fy)*$a) + ($fy*$b));
 		} else {
-			$h = (($t[0] + ($fx * ($t[1] + ($fx * ($t[3] + ($fx * $t[6])))))) + ($fy * (($t[2] + ($fx * ($t[4] + ($fx * $t[7])))) + ($fy * (($t[5] + ($fx * $t[8])) + ($fy * $t[9]))))));
+			$h = (($t[0] + ($fx*($t[1] + ($fx*($t[3] + ($fx*$t[6])))))) + ($fy*(($t[2] + ($fx*($t[4] + ($fx*$t[7])))) + ($fy*(($t[5] + ($fx*$t[8])) + ($fy*$t[9]))))));
 		}
-		return ((float)$this->offset + ((float)$this->scale * (float)$h));
+		return ((float) $this->offset + ((float) $this->scale*(float) $h));
 	}
 }
 /*

Braces +8 added lines, -3 removed lines

@@ -38,8 +38,11 @@ 
 		global $globalGeoidSource;
 		//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
 		if ($name == '') {
-			if (isset($globalGeoidSource) && $globalGeoidSource != '') $name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm';
-			else $name = dirname(__FILE__).'/../data/egm96-15.pgm';
+			if (isset($globalGeoidSource) && $globalGeoidSource != '') {
+				$name = dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm';
+			} else {
+				$name = dirname(__FILE__).'/../data/egm96-15.pgm';
+			}
 		}
 
 		if (file_exists($name) === FALSE) {
@@ -159,7 +162,9 @@ 
 				}
 			}
 			$this->t = $t;
-		} else $t = $this->t;
+		} else {
+			$t = $this->t;
+		}
 		if (!($cubic)) {
 			$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
 			$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));

require/settings.php

Spacing +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
 $globalLongitudeMin = '1.0'; //the minimum longitude (east)
 
 $globalCenterLatitude = '46.38'; //the latitude center of your coverage area
-$globalCenterLongitude = '5.29';//the longitude center of your coverage area
+$globalCenterLongitude = '5.29'; //the longitude center of your coverage area
 
 $globalLiveZoom = '9'; //default zoom on Live Map
 $globalAirportZoom = '7'; //default zoom to begin to display airports icons
@@ -151,7 +151,7 @@ 
 $globalACARS = FALSE;
 $globalACARSHost = '0.0.0.0'; // Local IP to listen
 $globalACARSPort = '9999';
-$globalACARSArchive = array('10','80','81','82','3F'); // labels of messages to archive
+$globalACARSArchive = array('10', '80', '81', '82', '3F'); // labels of messages to archive
 $globalACARSArchiveKeepMonths = '0';
 
 //APRS configuration (for glidernet)
@@ -248,7 +248,7 @@ 
 //Check by aircraft ICAO if image is not found by registration
 $globalAircraftImageCheckICAO = TRUE;
 //Sources for Aircraft image
-$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters','customsources');
+$globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters', 'customsources');
 // Custom source configuration {registration} will be replaced by aircraft registration (exif get copyright from exif data for each pic)
 // example of config : $globalAircraftImageCustomSources = array('thumbnail' => 'http://pics.myurl.com/thumbnail/{registration}.jpg','original' => 'http://myurl/original/{registration}.jpg','source_website' => 'https://www.myurl.com', 'source' => 'customsite', 'copyright' => 'myself','exif' => true);
 // ************************
@@ -257,7 +257,7 @@ 
 //Retrieve Image from externals sources
 $globalMarineImageFetch = TRUE;
 //Sources for Marine image
-$globalMarineImageSources = array('wikimedia','flickr','deviantart','bing','customsources');
+$globalMarineImageSources = array('wikimedia', 'flickr', 'deviantart', 'bing', 'customsources');
 // Custom source configuration {mmsi} will be replaced by vessel mmsi, {name} by it's name (exif get copyright from exif data for each pic)
 // example of config : $globalMarineImageCustomSources = array('thumbnail' => 'http://pics.myurl.com/thumbnail/{name}.jpg','original' => 'http://myurl/original/{name}.jpg','source_website' => 'https://www.myurl.com', 'source' => 'customsite', 'copyright' => 'myself','exif' => true);
 // ************************
@@ -265,7 +265,7 @@ 
 //Retrieve schedules from externals sources (set to FALSE for IVAO or if $globalFork = FALSE)
 $globalSchedulesFetch = TRUE;
 //Sources for airline schedule if not official airline site
-$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+$globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
 
 //Retrieve translation from external sources (set to FALSE for IVAO)
 $globalTranslationFetch = TRUE;

import/callback.php

Braces +39 added lines, -13 removed lines

@@ -27,15 +27,21 @@ 
 		}
 	}
 }
-if ($authorize === false) die;
+if ($authorize === false) {
+	die;
+}
 
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+if (isset($globalTracker) && $globalTracker) {
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+}
 if (isset($globalMarine) && $globalMarine) {
 	require_once(dirname(__FILE__).'/../require/class.AIS.php');
 	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
-if (!isset($globalDebug)) $globalDebug = FALSE;
+if (!isset($globalDebug)) {
+	$globalDebug = FALSE;
+}
 
 // Check if schema is at latest version
 $Connection = new Connection();
@@ -45,10 +51,16 @@ 
 }
 
 if (isset($globalServer) && $globalServer) {
-	if ($globalDebug) echo "Using Server Mode\n";
+	if ($globalDebug) {
+		echo "Using Server Mode\n";
+	}
 	$SI=new SpotterServer();
-} else $SI=new SpotterImport($Connection->db);
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
+} else {
+	$SI=new SpotterImport($Connection->db);
+}
+if (isset($globalTracker) && $globalTracker) {
+	$TI = new TrackerImport($Connection->db);
+}
 if (isset($globalMarine) && $globalMarine) {
 	$AIS = new AIS();
 	$MI = new MarineImport($Connection->db);
@@ -57,7 +69,9 @@ 
 date_default_timezone_set('UTC');
 
 $buffer = '';
-if (isset($_POST)) $buffer = $_POST;
+if (isset($_POST)) {
+	$buffer = $_POST;
+}
 $data = array();
 if (isset($buffer['type_event']) && isset($buffer['lat']) && isset($buffer['lon'])) {
 	$data['ident'] = $buffer['device_id'];
@@ -68,15 +82,27 @@ 
 	//$data['heading'] = $buffer['cap']; // Only N/S/E/W
 	$data['datetime'] = date('Y-m-d H:i:s',$buffer['timestamp']);
 	$data['comment'] = '';
-	if (isset($buffer['battery']) && $buffer['battery'] != '') $data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
+	if (isset($buffer['battery']) && $buffer['battery'] != '') {
+		$data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
+	}
 	//if (isset($buffer['snr']) && $buffer['snr'] != '') $data['comment'] .= 'SNR: '.$buffer['snr'].' ';
-	if (isset($buffer['temp']) && $buffer['temp'] != '') $data['comment'] .= 'Temperature: '.$buffer['temp'].'°C ';
-	if (isset($buffer['press']) && $buffer['press'] != '') $data['comment'] .= 'Pressure: '.$buffer['press'].'hPa ';
+	if (isset($buffer['temp']) && $buffer['temp'] != '') {
+		$data['comment'] .= 'Temperature: '.$buffer['temp'].'°C ';
+	}
+	if (isset($buffer['press']) && $buffer['press'] != '') {
+		$data['comment'] .= 'Pressure: '.$buffer['press'].'hPa ';
+	}
 	$TI->add($data);
 	unset($data);
 }
-if (isset($SI)) $SI->checkAll();
-if (isset($MI)) $MI->checkAll();
-if (isset($TI)) $TI->checkAll();
+if (isset($SI)) {
+	$SI->checkAll();
+}
+if (isset($MI)) {
+	$MI->checkAll();
+}
+if (isset($TI)) {
+	$TI->checkAll();
+}
 
 ?>

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
 require_once(dirname(__FILE__).'/../require/class.Source.php');
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
-$Common=new Common();
+$Common = new Common();
 $authorize = false;
 $params = array();
 $userip = $Common->getUserIP();
@@ -20,7 +20,7 @@ 
 			$authorize = true;
 			break;
 		}
-		if ($userip != '' && isset($cb['host']) && in_array($userip,explode(',',$cb['host']))) {
+		if ($userip != '' && isset($cb['host']) && in_array($userip, explode(',', $cb['host']))) {
 			$params = $globalSources[$key];
 			$authorize = true;
 			break;
@@ -46,14 +46,14 @@ 
 
 if (isset($globalServer) && $globalServer) {
 	if ($globalDebug) echo "Using Server Mode\n";
-	$SI=new SpotterServer();
-} else $SI=new SpotterImport($Connection->db);
+	$SI = new SpotterServer();
+} else $SI = new SpotterImport($Connection->db);
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
 if (isset($globalMarine) && $globalMarine) {
 	$AIS = new AIS();
 	$MI = new MarineImport($Connection->db);
 }
-$Source=new Source($Connection->db);
+$Source = new Source($Connection->db);
 date_default_timezone_set('UTC');
 
 $buffer = '';
@@ -66,7 +66,7 @@ 
 	$data['altitude'] = round($buffer['altitude']*3.28084);
 	$data['speed'] = $buffer['speed'];
 	//$data['heading'] = $buffer['cap']; // Only N/S/E/W
-	$data['datetime'] = date('Y-m-d H:i:s',$buffer['timestamp']);
+	$data['datetime'] = date('Y-m-d H:i:s', $buffer['timestamp']);
 	$data['comment'] = '';
 	if (isset($buffer['battery']) && $buffer['battery'] != '') $data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
 	//if (isset($buffer['snr']) && $buffer['snr'] != '') $data['comment'] .= 'SNR: '.$buffer['snr'].' ';

require/class.ATC.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	/**
 	* Get SQL query part for filter used
 	* @param Array $filter the filter
-	* @return Array the SQL part
+	* @return string the SQL part
 	*/
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;

Indentation +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {

Braces +20 added lines, -7 removed lines

@@ -7,7 +7,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (ATC)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (ATC)');
+		}
 	}
 
 	/**
@@ -20,20 +22,27 @@ 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				foreach($globalStatsFilters[$globalFilterName] as $source) {
-					if (isset($source['source'])) $filter['source'][] = $source['source'];
+					if (isset($source['source'])) {
+						$filter['source'][] = $source['source'];
+					}
 				}
 			} else {
 				$filter = $globalStatsFilters[$globalFilterName];
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
 			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
@@ -90,7 +99,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {
@@ -106,7 +117,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {

Spacing +31 added lines, -31 removed lines

@@ -26,22 +26,22 @@ 
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
-				foreach($globalStatsFilters[$globalFilterName] as $source) {
+				foreach ($globalStatsFilters[$globalFilterName] as $source) {
 					if (isset($source['source'])) $filter['source'][] = $source['source'];
 				}
 			} else {
 				$filter = $globalStatsFilters[$globalFilterName];
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
@@ -60,7 +60,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -73,13 +73,13 @@ 
 	 * @return Array Return ATC
 	*/
 	public function getById($id) {
-		$filter_query = $this->getFilter(array(),true,true);
+		$filter_query = $this->getFilter(array(), true, true);
 		$query = "SELECT * FROM atc".$filter_query." atc_id = :id";
 		$query_values = array(':id' => $id);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -92,19 +92,19 @@ 
 	 * @param String $format_source Format source
 	 * @return Array Return ATC
 	*/
-	public function getByIdent($ident,$format_source = '') {
-		$filter_query = $this->getFilter(array(),true,true);
+	public function getByIdent($ident, $format_source = '') {
+		$filter_query = $this->getFilter(array(), true, true);
 		if ($format_source == '') {
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident";
 			$query_values = array(':ident' => $ident);
 		} else {
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source";
-			$query_values = array(':ident' => $ident,':format_source' => $format_source);
+			$query_values = array(':ident' => $ident, ':format_source' => $format_source);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -126,18 +126,18 @@ 
 	 * @param String $format_source Format source
 	 * @param String $source_name Source name
 	*/
-	public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-		$info = str_replace('^','<br />',$info);
-		$info = str_replace('&amp;sect;','',$info);
-		$info = str_replace('"','',$info);
+	public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+		$info = str_replace('^', '<br />', $info);
+		$info = str_replace('&amp;sect;', '', $info);
+		$info = str_replace('"', '', $info);
 		if ($type == '') $type = NULL;
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -157,18 +157,18 @@ 
 	 * @param String $format_source Format source
 	 * @param String $source_name Source name
 	*/
-	public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-		$info = str_replace('^','<br />',$info);
-		$info = str_replace('&amp;sect;','',$info);
-		$info = str_replace('"','',$info);
+	public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+		$info = str_replace('^', '<br />', $info);
+		$info = str_replace('&amp;sect;', '', $info);
+		$info = str_replace('"', '', $info);
 		if ($type == '') $type = NULL;
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -183,7 +183,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -193,13 +193,13 @@ 
 	 * @param String $ident Flight ident
 	 * @param String $format_source Format source
 	*/
-	public function deleteByIdent($ident,$format_source) {
+	public function deleteByIdent($ident, $format_source) {
 		$query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source";
-		$query_values = array(':ident' => $ident,':format_source' => $format_source);
+		$query_values = array(':ident' => $ident, ':format_source' => $format_source);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -213,7 +213,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -231,7 +231,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";

tools-geoid.php

Spacing +5 added lines, -5 removed lines

@@ -12,9 +12,9 @@ 
 
 $page_url = $globalURL.'/tools-geoid';
 
-$latitude = filter_input(INPUT_POST,'latitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-$longitude = filter_input(INPUT_POST,'longitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-$altitude = filter_input(INPUT_POST,'altitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+$latitude = filter_input(INPUT_POST, 'latitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+$longitude = filter_input(INPUT_POST, 'longitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+$altitude = filter_input(INPUT_POST, 'altitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 
 print '<div class="info column">';
 print '<h1>'._("Geoid Height Calculator").'</h1>';
@@ -51,14 +51,14 @@ 
 
 if ($latitude != '' && $longitude != '') {
 	$globalDebug = FALSE;
-	$geoid = $GeoidHeight->get($latitude,$longitude);
+	$geoid = $GeoidHeight->get($latitude, $longitude);
 	print '<div class="row">';
 	print '<div class="col-md-3 col-md-offset-5">';
 	print '<div class="col-sm-6"><b>Geoid</b></div>';
 	print '<div class="col-sm-6">'.$geoid.'</div>';
 	if ($altitude != '') {
 		print '<div class="col-sm-6"><b>AMSL Elevation</b></div>';
-		print '<div class="col-sm-6">'.round($altitude-$geoid,3).'</div>';
+		print '<div class="col-sm-6">'.round($altitude - $geoid, 3).'</div>';
 	}
 	print '<div class="col-sm-6"><b>Earth Gravity Model</b></div>';
 	if (isset($globalGeoidSource) && $globalGeoidSource != '') $geoidsource = $globalGeoidSource;

Braces +8 added lines, -3 removed lines

@@ -11,7 +11,9 @@ 
 	print '<h1>'._("Geoid Height Calculator").'</h1>';
 	print '</div>';
 	print '<p>Not available</p>';
-	if (isset($globalDebug) && $globalDebug) echo '<p>'.$e.'</p>';
+	if (isset($globalDebug) && $globalDebug) {
+		echo '<p>'.$e.'</p>';
+	}
 	require_once('footer.php');
 	exit();
 }
@@ -69,8 +71,11 @@ 
 		print '<div class="col-sm-6">'.round($altitude-$geoid,3).'</div>';
 	}
 	print '<div class="col-sm-6"><b>Earth Gravity Model</b></div>';
-	if (isset($globalGeoidSource) && $globalGeoidSource != '') $geoidsource = $globalGeoidSource;
-	else $geoidsource = 'EGM96-15';
+	if (isset($globalGeoidSource) && $globalGeoidSource != '') {
+		$geoidsource = $globalGeoidSource;
+	} else {
+		$geoidsource = 'EGM96-15';
+	}
 	print '<div class="col-sm-6">'.$geoidsource.'</div>';
 	print '</div>';
 }

flightid-overview.php

Braces +10 added lines, -4 removed lines

@@ -48,7 +48,9 @@ 
 		$all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']);
 		if (isset($globalTimezone)) {
 			date_default_timezone_set($globalTimezone);
-		} else date_default_timezone_set('UTC');
+		} else {
+			date_default_timezone_set('UTC');
+		}
 		
 		if (is_array($all_data) && count($all_data) > 1) {
 			print '<br/>';
@@ -327,9 +329,13 @@ 
 			print '<div>';
 			if (isset($spotter_item['pilot_id']) && $spotter_item['pilot_id'] != "")
 			{
-				if ($spotter_item['format_source'] == 'whazzup') print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
-				elseif ($spotter_item['format_source'] == 'vatsimtxt') print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
-				else print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+				if ($spotter_item['format_source'] == 'whazzup') {
+					print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
+				} elseif ($spotter_item['format_source'] == 'vatsimtxt') {
+					print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
+				} else {
+					print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+				}
 			} else {
 				if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != "")
 				{

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-$id = filter_input(INPUT_GET,'id',FILTER_SANITIZE_STRING);
+$id = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_STRING);
 if ($id == "")
 {
 	header('Location: /');
@@ -16,30 +16,30 @@ 
 
 if (!empty($spotter_array))
 {
-	if(isset($spotter_array[0]['flightaware_id'])) {
+	if (isset($spotter_array[0]['flightaware_id'])) {
 		$flightaware_id = $spotter_array[0]['flightaware_id'];
 	}
-	if(isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') {
+	if (isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') {
 		$latitude = $spotter_array[0]['last_latitude'];
-	} elseif(isset($spotter_array[0]['latitude'])) {
+	} elseif (isset($spotter_array[0]['latitude'])) {
 		$latitude = $spotter_array[0]['latitude'];
 	}
-	if(isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') {
+	if (isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') {
 		$longitude = $spotter_array[0]['last_longitude'];
-	} elseif(isset($spotter_array[0]['longitude'])) {
+	} elseif (isset($spotter_array[0]['longitude'])) {
 		$longitude = $spotter_array[0]['longitude'];
 	}
 	$title = '';
-	if(isset($spotter_array[0]['ident'])) {
+	if (isset($spotter_array[0]['ident'])) {
 		$title .= $spotter_array[0]['ident'];
 	}
-	if(isset($spotter_array[0]['airline_name'])) {
+	if (isset($spotter_array[0]['airline_name'])) {
 		$title .= ' - '.$spotter_array[0]['airline_name'];
 	}
-	if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
+	if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
 		$title .= ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')';
 	}
-	if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') {
+	if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') {
 		$title .= ' - '.$spotter_array[0]['registration'];
 	}
 	//$facebook_meta_image = $spotter_array[0]['image'];
@@ -59,7 +59,7 @@ 
 			$altitude_data = '';
 			$hour_data = '';
 			$speed_data = '';
-			foreach($all_data as $data)
+			foreach ($all_data as $data)
 			{
 				$hour_data .= '"'.$data['date'].'",';
 				if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
@@ -87,8 +87,8 @@ 
 				$speed_data .= $speed.',';
 			}
 			$hour_data = "['x',".substr($hour_data, 0, -1)."]";
-			$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
-			$speed_data = "['speed',".substr($speed_data,0,-1)."]";
+			$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
+			$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart",
 			    data: {
@@ -134,16 +134,16 @@ 
 			print '<a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a> ';
 		}
 	}
-	if(isset($spotter_array[0]['ident'])) {
+	if (isset($spotter_array[0]['ident'])) {
 		print $spotter_array[0]['ident'];
 	}
-	if(isset($spotter_array[0]['airline_name'])) {
+	if (isset($spotter_array[0]['airline_name'])) {
 		print ' - '.$spotter_array[0]['airline_name'];
 	}
-	if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
+	if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
 		print ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')';
 	}
-	if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') {
+	if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') {
 		print ' - '.$spotter_array[0]['registration'];
 	}
 	print '</h1>';
@@ -297,7 +297,7 @@ 
 	 print '</div>';
 */
 
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		print '<div class="details">';
 		print '<h3>'._("Flight Information").'</h3>';
@@ -397,7 +397,7 @@ 
 			if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') {
 				if ($spotter_item['departure_airport_time'] > 2460) {
 					print '<div class="time">';
-					print 'at '.date('H:m',$spotter_item['departure_airport_time']);
+					print 'at '.date('H:m', $spotter_item['departure_airport_time']);
 					print '</div>';
 				} else {
 					print '<div class="time">';
@@ -547,19 +547,19 @@ 
 			if (count($departure_airport_info) > 0) {
 				if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-						print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm';
+						print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm';
 					} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-						print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi';
+						print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi';
 					} else {
-						print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km';
+						print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km';
 					}
 				} else {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-						print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm';
+						print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm';
 					} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-						print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi';
+						print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi';
 					} else {
-						print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km';
+						print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km';
 					}
 				}
 			}
@@ -575,19 +575,19 @@ 
 			if (count($arrival_airport_info) > 0) {
 				if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-						print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm';
+						print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm';
 					} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-						print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi';
+						print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi';
 					} else {
-						print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km';
+						print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km';
 					}
 				} else {
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-						print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm';
+						print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm';
 					} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-						print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi';
+						print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi';
 					} else {
-						print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km';
+						print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km';
 					}
 				}
 			}
@@ -606,7 +606,7 @@ 
 		print '<div class="last-flights">';
 		print '<h3>'._("Last 5 Flights of this Aircraft").' ('.$registration.')</h3>';
 		$hide_th_links = true;
-		$spotter_array = $Spotter->getSpotterDataByRegistration($registration,"0,5", "");
+		$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,5", "");
 		include('table-output.php'); 
 		print '<div class="more">';
 		print '<a href="'.$globalURL.'/registration/'.$registration.'" class="btn btn-default btn" role="button">See all Flights&raquo;</a>';

ident-detailed.php

Braces +22 added lines, -8 removed lines

@@ -118,8 +118,12 @@ 
 	{
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
 		$ident = $spotter_array[0]['ident'];
-		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
-		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
+		if (isset($spotter_array[0]['latitude'])) {
+			$latitude = $spotter_array[0]['latitude'];
+		}
+		if (isset($spotter_array[0]['longitude'])) {
+			$longitude = $spotter_array[0]['longitude'];
+		}
 		require_once('header.php');
 		if (isset($globalArchive) && $globalArchive && $type == 'aircraft') {
 			// Requirement for altitude graph
@@ -127,7 +131,9 @@ 
 			$all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']);
 			if (isset($globalTimezone)) {
 				date_default_timezone_set($globalTimezone);
-			} else date_default_timezone_set('UTC');
+			} else {
+				date_default_timezone_set('UTC');
+			}
 			if (is_array($all_data) && count($all_data) > 1) {
 				print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
 				print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -204,14 +210,22 @@ 
 		if (isset($spotter_array[0]['airline_icao'])) {
 			print '<div><span class="label">'._("Airline").'</span><a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a></div>'; 
 		}
-		if ($type == 'aircraft') print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
+		if ($type == 'aircraft') {
+			print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
+		}
 		print '</div>';
 	
-		if ($type == 'aircraft') include('ident-sub-menu.php');
+		if ($type == 'aircraft') {
+			include('ident-sub-menu.php');
+		}
 		print '<div class="table column">';
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		if ($type == 'aircraft') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		} elseif ($type == 'marine') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		} elseif ($type == 'tracker') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		}
 
 		include('table-output.php'); 
 		print '<div class="pagination">';

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
 require_once('require/class.Language.php');
 require_once('require/class.Translation.php');
 $type = '';
-$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
+$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
 if (isset($_GET['marine'])) {
 	require_once('require/class.Marine.php');
 	require_once('require/class.MarineLive.php');
@@ -30,12 +30,12 @@ 
 	$page_url = $globalURL.'/ident/'.$_GET['ident'];
 }
 
-if (!isset($_GET['ident'])){
+if (!isset($_GET['ident'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Translation = new Translation();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
@@ -54,18 +54,18 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($type == 'aircraft') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 		if (empty($spotter_array)) {
@@ -74,14 +74,14 @@ 
 				$ident = $new_ident;
 				if ($sort != '') 
 				{
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					}
 				} else {
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					}
 				}
 			}
@@ -89,34 +89,34 @@ 
 	} elseif ($type == 'marine') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	} elseif ($type == 'tracker') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	}
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['ident']);
 		$ident = $spotter_array[0]['ident'];
 		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
 		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
@@ -135,7 +135,7 @@ 
 				$altitude_data = '';
 				$hour_data = '';
 				$speed_data = '';
-				foreach($all_data as $data)
+				foreach ($all_data as $data)
 				{
 					$hour_data .= '"'.$data['date'].'",';
 					if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
@@ -163,8 +163,8 @@ 
 					$speed_data .= $speed.',';
 				}
 				$hour_data = "['x',".substr($hour_data, 0, -1)."]";
-				$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
-				$speed_data = "['speed',".substr($speed_data,0,-1)."]";
+				$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
+				$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
 				print 'c3.generate({
 				    bindto: "#chart",
 				    data: {
@@ -208,9 +208,9 @@ 
 	
 		if ($type == 'aircraft') include('ident-sub-menu.php');
 		print '<div class="table column">';
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
+		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
+		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
 
 		include('table-output.php'); 
 		print '<div class="pagination">';

airport-detailed.php

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 			$metar_info = $METAR->getMETAR($airport_icao);
 			//print_r($metar_info);
 			if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
-            		//print_r($metar_parse);
+					//print_r($metar_parse);
 		}
 		
 		$title = sprintf(_("Detailed View for %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);

Spacing +16 added lines, -16 removed lines

@@ -5,17 +5,17 @@ 
 require_once('require/class.Stats.php');
 require_once('require/class.METAR.php');
 
-if (!isset($_GET['airport'])){
+if (!isset($_GET['airport'])) {
 	header('Location: '.$globalURL.'/airport');
 } else {
 	$Spotter = new Spotter();
 	//calculation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -28,15 +28,15 @@ 
 	$limit_next = $limit_end + $absolute_difference;
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
-	$airport_icao = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
+	$airport_icao = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
 	$airport = $airport_icao;
 	$page_url = $globalURL.'/airport/'.$airport_icao;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($sort != '') {
-		$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao,$limit_start.",".$absolute_difference, $sort);
+		$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao, $limit_start.",".$absolute_difference, $sort);
 	} else {
-		$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao,$limit_start.",".$absolute_difference, '');
+		$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao, $limit_start.",".$absolute_difference, '');
 	}
 	$airport_array = $Spotter->getAllAirportInfo($airport_icao);
 	
@@ -51,7 +51,7 @@ 
             		//print_r($metar_parse);
 		}
 		
-		$title = sprintf(_("Detailed View for %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+		$title = sprintf(_("Detailed View for %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 
 		require_once('header.php');
 		
@@ -63,9 +63,9 @@ 
 		$airport_names = $Stats->getAllAirportNames();
 		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
 		ksort($airport_names);
-		foreach($airport_names as $airport_name)
+		foreach ($airport_names as $airport_name)
 		{
-			if($airport_icao == $airport_name['airport_icao'])
+			if ($airport_icao == $airport_name['airport_icao'])
 			{
 				print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 			} else {
@@ -111,15 +111,15 @@ 
 				$date_data = '';
 				$departure_data = '';
 				$arrival_data = '';
-				foreach($all_data as $data)
+				foreach ($all_data as $data)
 				{
 					$date_data .= '"'.$data['date'].'",';
 					$departure_data .= $data['departure'].',';
 					$arrival_data .= $data['arrival'].',';
 				}
-				$date_data = "['x',".substr($date_data,0,-1)."]";
-				$departure_data = "['departure',".substr($departure_data,0,-1)."]";
-				$arrival_data = "['arrival',".substr($arrival_data,0,-1)."]";
+				$date_data = "['x',".substr($date_data, 0, -1)."]";
+				$departure_data = "['departure',".substr($departure_data, 0, -1)."]";
+				$arrival_data = "['arrival',".substr($arrival_data, 0, -1)."]";
 				print 'c3.generate({
 				    bindto: "#chart",
 				    data: {
@@ -176,7 +176,7 @@ 
 					print _("Dew point:").' '.$metar_parse['dew'].' °C'." - ";
 				}
 				if (isset($metar_parse['temperature']) && isset($metar_parse['dew'])) {
-					$humidity = round(100 * pow((112 - (0.1 * $metar_parse['temperature']) + $metar_parse['dew']) / (112 + (0.9 * $metar_parse['temperature'])), 8),1);
+					$humidity = round(100*pow((112 - (0.1*$metar_parse['temperature']) + $metar_parse['dew'])/(112 + (0.9*$metar_parse['temperature'])), 8), 1);
 					print _("Humidity:").' '.$humidity.'%'." - ";
 				}
 				if (isset($metar_parse['QNH'])) {
@@ -192,7 +192,7 @@ 
 		print '<div class="table column">';
 		if ($airport_array[0]['iata'] != "NA")
 		{
-			print '<p>'.sprintf(_("The table below shows the detailed information of all flights to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 		}
 		include('table-output.php');  
 		print '<div class="pagination">';

Braces +13 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -47,7 +47,9 @@ 
 			$METAR = new METAR();
 			$metar_info = $METAR->getMETAR($airport_icao);
 			//print_r($metar_info);
-			if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
+			if (isset($metar_info[0]['metar'])) {
+				$metar_parse = $METAR->parse($metar_info[0]['metar']);
+			}
             		//print_r($metar_parse);
 		}
 		
@@ -61,7 +63,9 @@ 
 		print '<option></option>';
 		$Stats = new Stats();
 		$airport_names = $Stats->getAllAirportNames();
-		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+		if (empty($airport_names)) {
+			$airport_names = $Spotter->getAllAirportNames();
+		}
 		ksort($airport_names);
 		foreach($airport_names as $airport_name)
 		{
@@ -95,7 +99,9 @@ 
 			print '</div>';
 			print '<div><span class="label">'._("Coordinates").'</span><a href="http://maps.google.ca/maps?z=10&t=k&q='.$airport_array[0]['latitude'].','.$airport_array[0]['longitude'].'" target="_blank">Google Map<i class="fa fa-angle-double-right"></i></a></div>';
 			print '<div><span class="label">'._("Live Air Traffic").'</span><a href="http://www.liveatc.net/search/?icao='.$airport_array[0]['icao'].'" target="_blank">LiveATC.net<i class="fa fa-angle-double-right"></i></a></div>';
-			if (isset($airport_array[0]['diagram_pdf']) && $airport_array[0]['diagram_pdf'] != '') print '<div><span class="label">'._("Diagram").'</span><a href="'.$airport_array[0]['diagram_pdf'].'" target="_blank">'.$airport_array[0]['icao'].'<i class="fa fa-angle-double-right"></i></a></div>';
+			if (isset($airport_array[0]['diagram_pdf']) && $airport_array[0]['diagram_pdf'] != '') {
+				print '<div><span class="label">'._("Diagram").'</span><a href="'.$airport_array[0]['diagram_pdf'].'" target="_blank">'.$airport_array[0]['icao'].'<i class="fa fa-angle-double-right"></i></a></div>';
+			}
 			print '</div>';
 			
 			$Stats = new Stats();
@@ -103,7 +109,9 @@ 
 			// Use spotter also
 			if (isset($globalTimezone)) {
 				date_default_timezone_set($globalTimezone);
-			} else date_default_timezone_set('UTC');
+			} else {
+				date_default_timezone_set('UTC');
+			}
 			if (count($all_data) > 0) {
 				print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
 				print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';

registration-statistics-time.php

Spacing +8 added lines, -8 removed lines

@@ -3,14 +3,14 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Time of Day of aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Time of Day of aircraft with registration %s"), $registration);
 	require_once('header.php');
   
 	print '<div class="info column">';
@@ -23,7 +23,7 @@ 
 	include('registration-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day from aircraft with registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day from aircraft with registration <strong>%s</strong>."), $registration).'</p>';
 
 	$hour_array = $Spotter->countAllHoursByRegistration($registration);
 	print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
@@ -33,9 +33,9 @@ 
 	$hour_data = '';
 	$hour_cnt = '';
 	$last = 0;
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
-		while($last != $hour_item['hour_name']) {
+		while ($last != $hour_item['hour_name']) {
 			$hour_data .= '"'.$last.':00",';
 			$hour_cnt .= '0,';
 			$last++;
@@ -45,7 +45,7 @@ 
 		$hour_cnt .= $hour_item['hour_count'].',';
 	}
 	$hour_data = "[".substr($hour_data, 0, -1)."]";
-	$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
+	$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
 	print 'c3.generate({
 	    bindto: "#chartHour",
 	    data: {
@@ -68,7 +68,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($hour_array as $hour_item)
+		foreach ($hour_array as $hour_item)
 		{
 			print '<tr>';
 			print '<td>'.$hour_item['hour_name'].':00</td>';