Ysurac / FlightAirMap

statistics-aircraft.php

Braces +13 added lines, -6 removed lines

@@ -5,11 +5,15 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Aircraft");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 
@@ -28,9 +32,12 @@ 
 $aircraft_data = '';
 foreach($aircraft_array as $aircraft_item)
 {
-	if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
-	else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
-}
+	if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') {
+		$aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+	} else {
+		$aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+	}
+	}
 $aircraft_data = substr($aircraft_data, 0, -1);
 print 'var series = ['.$aircraft_data.'];';
 print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';

atc-data.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
 	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
 	$atc_data = $ATC->getById($atcid);
-	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
+	if (!isset($atc_data[0])) {
+		$atc_data = $ATC->getByIdent($atcident);
+	}
  ?>
 <div class="alldetails">
 <button type="button" class="close">&times;</button>

require/class.Elevation.php

Braces +18 added lines, -6 removed lines

@@ -28,7 +28,9 @@ 
 	private $openedFiles = [];
 
 	public function __construct($htgFilesDestination = '', $resolution = 3) {
-		if ($htgFilesDestination == '') $htgFilesDestination = dirname(__FILE__).'/../data/';
+		if ($htgFilesDestination == '') {
+			$htgFilesDestination = dirname(__FILE__).'/../data/';
+		}
 		$this->htgFilesDestination = $htgFilesDestination;
 		$this->resolution          = $resolution;
 		switch ($resolution) {
@@ -171,16 +173,26 @@ 
 		$fileName  = "N{$N}E{$E}.hgt";
 		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
 			$Common = new Common();
-			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
+			if ($debug) {
+				echo 'Downloading '.$fileName.'.gz ...';
+			}
 			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
 			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
-				if ($debug) echo "File '{$fileName}.gz' not exists.";
+				if ($debug) {
+					echo "File '{$fileName}.gz' not exists.";
+				}
 				return false;
 			}
-			if ($debug) echo 'Done'."\n";
-			if ($debug) echo 'Decompress '.$fileName.' ....';
+			if ($debug) {
+				echo 'Done'."\n";
+			}
+			if ($debug) {
+				echo 'Decompress '.$fileName.' ....';
+			}
 			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
-			if ($debug) echo 'Done'."\n";
+			if ($debug) {
+				echo 'Done'."\n";
+			}
 			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
 		}
 		return true;

require/class.GeoidHeight.php

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';
+			}
 		}
 
 		$f = @fopen($name,"r");
@@ -156,7 +159,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));

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();
+}
 
 ?>

tools-geoid.php

Braces +5 added lines, -2 removed lines

@@ -61,8 +61,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'] != "")
 				{

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">';

require/class.Translation.php

Braces +20 added lines, -7 removed lines

@@ -28,16 +28,25 @@ 
 			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
 				//$airline_icao = substr($ident, 0, 3);
 				return $ident;
-			} else return $ident;
-		} else return $ident;
+			} else {
+				return $ident;
+			}
+		} else {
+			return $ident;
+		}
 		if ($airline_icao == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+				$icao = $ident;
+			} else {
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
+			}
 		} else {
 			$identicao = $Spotter->getAllAirlineInfo($airline_icao);
 			if (isset($identicao[0])) {
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-			} else $icao = $ident;
+			} else {
+				$icao = $ident;
+			}
 		}
 		return $icao;
 	}
@@ -55,7 +64,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row['operator_correct'];
-		} else return $ident;
+		} else {
+			return $ident;
+		}
 	}
 
 	public function addOperator($ident,$correct_ident,$source) {
@@ -84,7 +95,9 @@ 
 		global $globalTranslationSources, $globalTranslationFetch;
 		//if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
 		$globalTranslationSources = array();
-		if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
+		if (!isset($globalTranslationFetch)) {
+			$globalTranslationFetch = TRUE;
+		}
 		//echo "Check Translation for ".$ident."...";
 		$correct = $this->getOperator($ident);
 		if ($correct != '' && $correct != $ident) {