Inspection of "Show total aircraft even if no aircraft visibles" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 491897...dd0fde )

by Yannick

created 2017-07-28 14:42 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@
 block discarded – undo
 <button type="button" class="close">&times;</button>
 <?php
 
-$notamref = filter_input(INPUT_GET,'notam',FILTER_SANITIZE_STRING);
+$notamref = filter_input(INPUT_GET, 'notam', FILTER_SANITIZE_STRING);
 $notamref = urldecode($notamref);
 $NOTAM = new NOTAM();
 $notam = $NOTAM->getNOTAMbyRef($notamref);

Please login to merge, or discard this patch.

notam-geojson.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -10,24 +10,24 @@  discard block
 block discarded – undo
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
-		$scope = filter_var($_COOOKIE['notamscope'],FILTER_SANITIZE_STRING);
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
+		$scope = filter_var($_COOOKIE['notamscope'], FILTER_SANITIZE_STRING);
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
 	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
-		$scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
+		$scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
 	} else {
 		$spotter_array = $NOTAM->getAllNOTAMbyCoord($coords);
 	}
 //	$spotter_array = $NOTAM->getAllNOTAM();
 } else {
 	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
-		$scope = filter_var($_COOKIE['notamscope'],FILTER_SANITIZE_STRING);
+		$scope = filter_var($_COOKIE['notamscope'], FILTER_SANITIZE_STRING);
 		$spotter_array = $NOTAM->getAllNOTAMbyScope($scope);
 	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
-		$scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
+		$scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
 	} else {
 		$spotter_array = $NOTAM->getAllNOTAM();
 	}
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
             
 if (!empty($spotter_array))
 {	  
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 			$output .= '"ref": "'.$spotter_item['ref'].'",';
 			$output .= '"title": "'.$spotter_item['title'].'",';
 			$output .= '"fir": "'.$spotter_item['fir'].'",';
-			$output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"),'<br />',str_replace(array('"',"\t"), '',$spotter_item['notam_text'])).'",';
+			$output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"), '<br />', str_replace(array('"', "\t"), '', $spotter_item['notam_text'])).'",';
 			$output .= '"latitude": '.$spotter_item['center_latitude'].',';
 			$output .= '"longitude": '.$spotter_item['center_longitude'].',';
 			$output .= '"lower_limit": '.$spotter_item['lower_limit'].',';
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
 		    $output .= '}';
 		$output .= '},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 

Please login to merge, or discard this patch.

waypoints-geojson.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	$spotter_array = $Spotter->getAllWaypointsInfobyCoord($coords);
 } else {
 	die;
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 if (!empty($spotter_array))
 {	  
 //	print_r($spotter_array);
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
 		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048); ;
 			$output .= ']';
 		    $output .= '}';
 

Please login to merge, or discard this patch.

airspace-data.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
 <button type="button" class="close">&times;</button>
 <?php
 
-$airspaceid = filter_input(INPUT_GET,'airspace',FILTER_SANITIZE_NUMBER_INT);
+$airspaceid = filter_input(INPUT_GET, 'airspace', FILTER_SANITIZE_NUMBER_INT);
 //$notamref = urldecode($notamref);
 if ($globalDBdriver == 'mysql') {
 	$query = "SELECT * FROM airspace WHERE ogr_fid = :id";
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
 try {
 	$sth = $Connection->db->prepare($query);
 	$sth->execute(array(':id' => $airspaceid));
-} catch(PDOException $e) {
+} catch (PDOException $e) {
 	echo "error";
 }
-$result=$sth->fetchAll(PDO::FETCH_ASSOC);
+$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';

Please login to merge, or discard this patch.

airspace-geojson.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -16,14 +16,14 @@  discard block
 block discarded – undo
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
         if ($globalDBdriver == 'mysql') {
 		$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))";
 		try {
 			$sth = $Connection->db->prepare($query);
-			$sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
+			$sth->execute(array(':minlon' => $coords[0], ':minlat' => $coords[1], ':maxlon' => $coords[2], ':maxlat' => $coords[3]));
 			//$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error";
 		}
 	} else {
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 			$sth = $Connection->db->prepare($query);
 			//$sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error";
 		}
 	}
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
 	try {
 		$sth = $Connection->db->prepare($query);
 		$sth->execute();
-	} catch(PDOException $e) {
+	} catch (PDOException $e) {
 		echo "error";
 	}
 }
@@ -73,20 +73,20 @@  discard block
 block discarded – undo
 		elseif (isset($properties['ogc_fid'])) $properties['id'] = $properties['ogc_fid'];
 		if (isset($properties['ceiling'])) $properties['tops'] = $properties['ceiling'];
 		if (isset($properties['floor'])) $properties['base'] = $properties['floor'];
-		if (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['tops']),$matches)) {
+		if (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['tops']), $matches)) {
 			$properties['upper_limit'] = round($matches['alt']*100*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['tops']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/', strtoupper($properties['tops']), $matches)) {
 			$properties['upper_limit'] = round($matches['alt']*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['tops']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['tops']), $matches)) {
 			$properties['upper_limit'] = $matches['alt'];
 		}
 		if ($properties['base'] == 'SFC' || $properties['base'] == 'MSL' || $properties['base'] == 'GROUND' || $properties['base'] == 'GND') {
 			$properties['lower_limit'] = 0;
-		} elseif (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['base']),$matches)) {
+		} elseif (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['base']), $matches)) {
 			$properties['lower_limit'] = round($matches['alt']*100*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['base']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/', strtoupper($properties['base']), $matches)) {
 			$properties['lower_limit'] = round($matches['alt']*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['base']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['base']), $matches)) {
 			$properties['lower_limit'] = $matches['alt'];
 		}
 		if ($properties['type'] == 'RESTRICTED' || $properties['type'] == 'R') {

Please login to merge, or discard this patch.

install/VAM/VAM-json.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -11,27 +11,27 @@
 block discarded – undo
 	die();
 }
 $query = 'select * from vam_live_flights rc, gvausers gu where gu.gvauser_id = rc.gvauser_id';  
-$json_data=array();  
+$json_data = array();  
 $result = $db->query($query);
 while ($rec = $result->fetch_assoc())
 {  
-	$json_array['gvauser_id']=$rec['gvauser_id']; // users "pilot unique ID" "40"
-	$json_array['flight_id']=$rec['flight_id']; // flight_id
-	$json_array['pilot_id']=$rec['callsign']; // users pilot_id "VAM500"
-	$json_array['callsign']=substr($rec['flight_id'],-7);  // substr icao Flight "AFR524"
-	$json_array['pilot_name']=$rec['name'] .' '.$rec['surname'] ;  // Users "name + surname"
-	$json_array['plane_type']=$rec['plane_type'];  // type Plane "B739"
-	$json_array['departure']=$rec['departure'];  // departure ICAO
-	$json_array['arrival']=$rec['arrival'];     // arrival Ident
-	$json_array['latitude']=$rec['latitude'];  // return 55.7328860921521
-	$json_array['longitude']=$rec['longitude'];  // return 8.87433614409404
-	$json_array['altitude']=$rec['altitude'];  // return "147"
-	$json_array['heading']=$rec['heading'];  // return "307"
-	$json_array['ias']=$rec['ias'];  // return speed "IAS"
-	$json_array['gs']=$rec['gs'];  // return speed "GS"
+	$json_array['gvauser_id'] = $rec['gvauser_id']; // users "pilot unique ID" "40"
+	$json_array['flight_id'] = $rec['flight_id']; // flight_id
+	$json_array['pilot_id'] = $rec['callsign']; // users pilot_id "VAM500"
+	$json_array['callsign'] = substr($rec['flight_id'], -7); // substr icao Flight "AFR524"
+	$json_array['pilot_name'] = $rec['name'].' '.$rec['surname']; // Users "name + surname"
+	$json_array['plane_type'] = $rec['plane_type']; // type Plane "B739"
+	$json_array['departure'] = $rec['departure']; // departure ICAO
+	$json_array['arrival'] = $rec['arrival']; // arrival Ident
+	$json_array['latitude'] = $rec['latitude']; // return 55.7328860921521
+	$json_array['longitude'] = $rec['longitude']; // return 8.87433614409404
+	$json_array['altitude'] = $rec['altitude']; // return "147"
+	$json_array['heading'] = $rec['heading']; // return "307"
+	$json_array['ias'] = $rec['ias']; // return speed "IAS"
+	$json_array['gs'] = $rec['gs']; // return speed "GS"
 	// $json_array['routes']=$rec['routes'];  // (unusable)
-	$json_array['flight_status']=$rec['flight_status'];  // "return Status"
-	$json_array['last_update']=$rec['last_update'];  // return "DateTime"
+	$json_array['flight_status'] = $rec['flight_status']; // "return Status"
+	$json_array['last_update'] = $rec['last_update']; // return "DateTime"
 	$json_data[] = $json_array;
  }  
 echo json_encode($json_data);

Please login to merge, or discard this patch.

airport-statistics-route.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -7,14 +7,14 @@  discard block
 block discarded – undo
         header('Location: '.$globalURL.'/airport');
         die();
 }
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirport($airport,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirport($airport, "0,1", "");
 $airport_array = $Spotter->getAllAirportInfo($airport);
 
 if (!empty($airport_array))
 {
-	$title = sprintf(_("Most Common Routes to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Routes to/from %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
 	$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 == $airport_name['airport_icao'])
+		if ($airport == $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 {
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 	include('airport-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByAirport($airport);
 	if (!empty($route_array))
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

aircraft-statistics-registration.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -7,14 +7,14 @@  discard block
 block discarded – undo
         header('Location: '.$globalURL.'/aircraft');
         die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft by Registration from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Aircraft by Registration from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights from aircraft type <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights from aircraft type <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByAircraft($aircraft_type);
 	if (!empty($aircraft_array))
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

aircraft-statistics-route.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -7,14 +7,14 @@  discard block
 block discarded – undo
         header('Location: '.$globalURL.'/aircraft');
         die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByAircraft($aircraft_type);
 	if (!empty($route_array))
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

		@@ -7,7 +7,7 @@
		block discarded – undo
7	7	<button type="button" class="close">×</button>
8	8	<?php
9	9
10		-$notamref = filter_input(INPUT_GET,'notam',FILTER_SANITIZE_STRING);
	10	+$notamref = filter_input(INPUT_GET, 'notam', FILTER_SANITIZE_STRING);
11	11	$notamref = urldecode($notamref);
12	12	$NOTAM = new NOTAM();
13	13	$notam = $NOTAM->getNOTAMbyRef($notamref);

		@@ -10,24 +10,24 @@ discard block
		block discarded – undo
10	10
11	11	if (isset($_GET['coord']))
12	12	{
13		- $coords = explode(',',$_GET['coord']);
	13	+ $coords = explode(',', $_GET['coord']);
14	14	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
15		- $scope = filter_var($_COOOKIE['notamscope'],FILTER_SANITIZE_STRING);
16		- $spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
	15	+ $scope = filter_var($_COOOKIE['notamscope'], FILTER_SANITIZE_STRING);
	16	+ $spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
17	17	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
18		- $scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
19		- $spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
	18	+ $scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
	19	+ $spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
20	20	} else {
21	21	$spotter_array = $NOTAM->getAllNOTAMbyCoord($coords);
22	22	}
23	23	// $spotter_array = $NOTAM->getAllNOTAM();
24	24	} else {
25	25	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
26		- $scope = filter_var($_COOKIE['notamscope'],FILTER_SANITIZE_STRING);
	26	+ $scope = filter_var($_COOKIE['notamscope'], FILTER_SANITIZE_STRING);
27	27	$spotter_array = $NOTAM->getAllNOTAMbyScope($scope);
28	28	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
29		- $scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
30		- $spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
	29	+ $scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
	30	+ $spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
31	31	} else {
32	32	$spotter_array = $NOTAM->getAllNOTAM();
33	33	}
		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37
38	38	if (!empty($spotter_array))
39	39	{
40		- foreach($spotter_array as $spotter_item)
	40	+ foreach ($spotter_array as $spotter_item)
41	41	{
42	42	date_default_timezone_set('UTC');
43	43	//waypoint plotting
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	$output .= '"ref": "'.$spotter_item['ref'].'",';
47	47	$output .= '"title": "'.$spotter_item['title'].'",';
48	48	$output .= '"fir": "'.$spotter_item['fir'].'",';
49		- $output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"),'<br />',str_replace(array('"',"\t"), '',$spotter_item['notam_text'])).'",';
	49	+ $output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"), '<br />', str_replace(array('"', "\t"), '', $spotter_item['notam_text'])).'",';
50	50	$output .= '"latitude": '.$spotter_item['center_latitude'].',';
51	51	$output .= '"longitude": '.$spotter_item['center_longitude'].',';
52	52	$output .= '"lower_limit": '.$spotter_item['lower_limit'].',';
		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	$output .= '}';
86	86	$output .= '},';
87	87	}
88		- $output = substr($output, 0, -1);
	88	+ $output = substr($output, 0, -1);
89	89	}
90	90	$output .= ']}';
91	91

		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10
11	11	if (isset($_GET['coord']))
12	12	{
13		- $coords = explode(',',$_GET['coord']);
	13	+ $coords = explode(',', $_GET['coord']);
14	14	$spotter_array = $Spotter->getAllWaypointsInfobyCoord($coords);
15	15	} else {
16	16	die;
		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	if (!empty($spotter_array))
22	22	{
23	23	// print_r($spotter_array);
24		- foreach($spotter_array as $spotter_item)
	24	+ foreach ($spotter_array as $spotter_item)
25	25	{
26	26	date_default_timezone_set('UTC');
27	27	//waypoint plotting
		@@ -102,7 +102,7 @@ discard block
		block discarded – undo
102	102	$output .= '"geometry": {';
103	103	$output .= '"type": "Point",';
104	104	$output .= '"coordinates": [';
105		- $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']1000.3048);;
	105	+ $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']1000.3048); ;
106	106	$output .= ']';
107	107	$output .= '}';
108	108

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7	<button type="button" class="close">×</button>
8	8	<?php
9	9
10		-$airspaceid = filter_input(INPUT_GET,'airspace',FILTER_SANITIZE_NUMBER_INT);
	10	+$airspaceid = filter_input(INPUT_GET, 'airspace', FILTER_SANITIZE_NUMBER_INT);
11	11	//$notamref = urldecode($notamref);
12	12	if ($globalDBdriver == 'mysql') {
13	13	$query = "SELECT * FROM airspace WHERE ogr_fid = :id";
		@@ -18,10 +18,10 @@ discard block
		block discarded – undo
18	18	try {
19	19	$sth = $Connection->db->prepare($query);
20	20	$sth->execute(array(':id' => $airspaceid));
21		-} catch(PDOException $e) {
	21	+} catch (PDOException $e) {
22	22	echo "error";
23	23	}
24		-$result=$sth->fetchAll(PDO::FETCH_ASSOC);
	24	+$result = $sth->fetchAll(PDO::FETCH_ASSOC);
25	25	$airspace = $result[0];
26	26	date_default_timezone_set('UTC');
27	27	print '<div class="top">';

		@@ -16,14 +16,14 @@ discard block
		block discarded – undo
16	16
17	17	if (isset($_GET['coord']))
18	18	{
19		- $coords = explode(',',$_GET['coord']);
	19	+ $coords = explode(',', $_GET['coord']);
20	20	if ($globalDBdriver == 'mysql') {
21	21	$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))";
22	22	try {
23	23	$sth = $Connection->db->prepare($query);
24		- $sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
	24	+ $sth->execute(array(':minlon' => $coords[0], ':minlat' => $coords[1], ':maxlon' => $coords[2], ':maxlat' => $coords[3]));
25	25	//$sth->execute();
26		- } catch(PDOException $e) {
	26	+ } catch (PDOException $e) {
27	27	echo "error";
28	28	}
29	29	} else {
		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32	$sth = $Connection->db->prepare($query);
33	33	//$sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
34	34	$sth->execute();
35		- } catch(PDOException $e) {
	35	+ } catch (PDOException $e) {
36	36	echo "error";
37	37	}
38	38	}
		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	try {
46	46	$sth = $Connection->db->prepare($query);
47	47	$sth->execute();
48		- } catch(PDOException $e) {
	48	+ } catch (PDOException $e) {
49	49	echo "error";
50	50	}
51	51	}
		@@ -73,20 +73,20 @@ discard block
		block discarded – undo
73	73	elseif (isset($properties['ogc_fid'])) $properties['id'] = $properties['ogc_fid'];
74	74	if (isset($properties['ceiling'])) $properties['tops'] = $properties['ceiling'];
75	75	if (isset($properties['floor'])) $properties['base'] = $properties['floor'];
76		- if (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['tops']),$matches)) {
	76	+ if (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['tops']), $matches)) {
77	77	$properties['upper_limit'] = round($matches['alt']1000.38048);
78		- } elseif (preg_match('/^(?<alt>\d+)(\s)*(FT\|AGL\|ALT\|MSL)/',strtoupper($properties['tops']),$matches)) {
	78	+ } elseif (preg_match('/^(?<alt>\d+)(\s)*(FT\|AGL\|ALT\|MSL)/', strtoupper($properties['tops']), $matches)) {
79	79	$properties['upper_limit'] = round($matches['alt']*0.38048);
80		- } elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['tops']),$matches)) {
	80	+ } elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['tops']), $matches)) {
81	81	$properties['upper_limit'] = $matches['alt'];
82	82	}
83	83	if ($properties['base'] == 'SFC' \|\| $properties['base'] == 'MSL' \|\| $properties['base'] == 'GROUND' \|\| $properties['base'] == 'GND') {
84	84	$properties['lower_limit'] = 0;
85		- } elseif (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['base']),$matches)) {
	85	+ } elseif (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['base']), $matches)) {
86	86	$properties['lower_limit'] = round($matches['alt']1000.38048);
87		- } elseif (preg_match('/^(?<alt>\d+)(\s)*(FT\|AGL\|ALT\|MSL)/',strtoupper($properties['base']),$matches)) {
	87	+ } elseif (preg_match('/^(?<alt>\d+)(\s)*(FT\|AGL\|ALT\|MSL)/', strtoupper($properties['base']), $matches)) {
88	88	$properties['lower_limit'] = round($matches['alt']*0.38048);
89		- } elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['base']),$matches)) {
	89	+ } elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['base']), $matches)) {
90	90	$properties['lower_limit'] = $matches['alt'];
91	91	}
92	92	if ($properties['type'] == 'RESTRICTED' \|\| $properties['type'] == 'R') {

		@@ -11,27 +11,27 @@
		block discarded – undo
11	11	die();
12	12	}
13	13	$query = 'select * from vam_live_flights rc, gvausers gu where gu.gvauser_id = rc.gvauser_id';
14		-$json_data=array();
	14	+$json_data = array();
15	15	$result = $db->query($query);
16	16	while ($rec = $result->fetch_assoc())
17	17	{
18		- $json_array['gvauser_id']=$rec['gvauser_id']; // users "pilot unique ID" "40"
19		- $json_array['flight_id']=$rec['flight_id']; // flight_id
20		- $json_array['pilot_id']=$rec['callsign']; // users pilot_id "VAM500"
21		- $json_array['callsign']=substr($rec['flight_id'],-7); // substr icao Flight "AFR524"
22		- $json_array['pilot_name']=$rec['name'] .' '.$rec['surname'] ; // Users "name + surname"
23		- $json_array['plane_type']=$rec['plane_type']; // type Plane "B739"
24		- $json_array['departure']=$rec['departure']; // departure ICAO
25		- $json_array['arrival']=$rec['arrival']; // arrival Ident
26		- $json_array['latitude']=$rec['latitude']; // return 55.7328860921521
27		- $json_array['longitude']=$rec['longitude']; // return 8.87433614409404
28		- $json_array['altitude']=$rec['altitude']; // return "147"
29		- $json_array['heading']=$rec['heading']; // return "307"
30		- $json_array['ias']=$rec['ias']; // return speed "IAS"
31		- $json_array['gs']=$rec['gs']; // return speed "GS"
	18	+ $json_array['gvauser_id'] = $rec['gvauser_id']; // users "pilot unique ID" "40"
	19	+ $json_array['flight_id'] = $rec['flight_id']; // flight_id
	20	+ $json_array['pilot_id'] = $rec['callsign']; // users pilot_id "VAM500"
	21	+ $json_array['callsign'] = substr($rec['flight_id'], -7); // substr icao Flight "AFR524"
	22	+ $json_array['pilot_name'] = $rec['name'].' '.$rec['surname']; // Users "name + surname"
	23	+ $json_array['plane_type'] = $rec['plane_type']; // type Plane "B739"
	24	+ $json_array['departure'] = $rec['departure']; // departure ICAO
	25	+ $json_array['arrival'] = $rec['arrival']; // arrival Ident
	26	+ $json_array['latitude'] = $rec['latitude']; // return 55.7328860921521
	27	+ $json_array['longitude'] = $rec['longitude']; // return 8.87433614409404
	28	+ $json_array['altitude'] = $rec['altitude']; // return "147"
	29	+ $json_array['heading'] = $rec['heading']; // return "307"
	30	+ $json_array['ias'] = $rec['ias']; // return speed "IAS"
	31	+ $json_array['gs'] = $rec['gs']; // return speed "GS"
32	32	// $json_array['routes']=$rec['routes']; // (unusable)
33		- $json_array['flight_status']=$rec['flight_status']; // "return Status"
34		- $json_array['last_update']=$rec['last_update']; // return "DateTime"
	33	+ $json_array['flight_status'] = $rec['flight_status']; // "return Status"
	34	+ $json_array['last_update'] = $rec['last_update']; // return "DateTime"
35	35	$json_data[] = $json_array;
36	36	}
37	37	echo json_encode($json_data);

		@@ -7,14 +7,14 @@ discard block
		block discarded – undo
7	7	header('Location: '.$globalURL.'/airport');
8	8	die();
9	9	}
10		-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
	10	+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
11	11	$Spotter = new Spotter();
12		-$spotter_array = $Spotter->getSpotterDataByAirport($airport,"0,1","");
	12	+$spotter_array = $Spotter->getSpotterDataByAirport($airport, "0,1", "");
13	13	$airport_array = $Spotter->getAllAirportInfo($airport);
14	14
15	15	if (!empty($airport_array))
16	16	{
17		- $title = sprintf(_("Most Common Routes to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
	17	+ $title = sprintf(_("Most Common Routes to/from %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
18	18
19	19	require_once('header.php');
20	20	print '<div class="select-item">';
		@@ -25,9 +25,9 @@ discard block
		block discarded – undo
25	25	$airport_names = $Stats->getAllAirportNames();
26	26	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
27	27	ksort($airport_names);
28		- foreach($airport_names as $airport_name)
	28	+ foreach ($airport_names as $airport_name)
29	29	{
30		- if($airport == $airport_name['airport_icao'])
	30	+ if ($airport == $airport_name['airport_icao'])
31	31	{
32	32	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>';
33	33	} else {
		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	include('airport-sub-menu.php');
59	59	print '<div class="column">';
60	60	print '<h2>'._("Most Common Routes").'</h2>';
61		- print '<p>'.sprintf(_("The statistic below shows the most common routes to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
	61	+ print '<p>'.sprintf(_("The statistic below shows the most common routes to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
62	62
63	63	$route_array = $Spotter->countAllRoutesByAirport($airport);
64	64	if (!empty($route_array))
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	print '</thead>';
75	75	print '<tbody>';
76	76	$i = 1;
77		- foreach($route_array as $route_item)
	77	+ foreach ($route_array as $route_item)
78	78	{
79	79	print '<tr>';
80	80	print '<td><strong>'.$i.'</strong></td>';

		@@ -7,14 +7,14 @@ discard block
		block discarded – undo
7	7	header('Location: '.$globalURL.'/aircraft');
8	8	die();
9	9	}
10		-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
	10	+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
11	11	$Spotter = new Spotter();
12		-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
	12	+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
13	13
14	14
15	15	if (!empty($spotter_array))
16	16	{
17		- $title = sprintf(_("Most Common Aircraft by Registration from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
	17	+ $title = sprintf(_("Most Common Aircraft by Registration from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
18	18	require_once('header.php');
19	19	print '<div class="select-item">';
20	20	print '<form action="'.$globalURL.'/aircraft" method="post">';
		@@ -23,9 +23,9 @@ discard block
		block discarded – undo
23	23	$Stats = new Stats();
24	24	$aircraft_types = $Stats->getAllAircraftTypes();
25	25	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
26		- foreach($aircraft_types as $aircrafttype)
	26	+ foreach ($aircraft_types as $aircrafttype)
27	27	{
28		- if($aircraft_type == $aircrafttype['aircraft_icao'])
	28	+ if ($aircraft_type == $aircrafttype['aircraft_icao'])
29	29	{
30	30	print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
31	31	} else {
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	include('aircraft-sub-menu.php');
52	52	print '<div class="column">';
53	53	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
54		- print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights from aircraft type <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
	54	+ print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights from aircraft type <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
55	55
56	56	$aircraft_array = $Spotter->countAllAircraftRegistrationByAircraft($aircraft_type);
57	57	if (!empty($aircraft_array))
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	print '</thead>';
69	69	print '<tbody>';
70	70	$i = 1;
71		- foreach($aircraft_array as $aircraft_item)
	71	+ foreach ($aircraft_array as $aircraft_item)
72	72	{
73	73	print '<tr>';
74	74	print '<td><strong>'.$i.'</strong></td>';

Ysurac / FlightAirMap

Push — master ( 491897...dd0fde )

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch