Inspection of "Fixes" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 8e88dd...50e4fb )

by Yannick

created 2017-08-09 17:55 UTC

Status

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

@@ -7,18 +7,18 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$pilot = filter_input(INPUT_GET,'pilot',FILTER_SANITIZE_STRING);
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$pilot = filter_input(INPUT_GET, 'pilot', FILTER_SANITIZE_STRING);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
-$spotter_array = $Spotter->getSpotterDataByPilot($pilot,"0,1", $sort,$filter);
+if ($year != '') $filter = array_merge($filter, array('year' => $year));
+if ($month != '') $filter = array_merge($filter, array('month' => $month));
+$spotter_array = $Spotter->getSpotterDataByPilot($pilot, "0,1", $sort, $filter);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes of %s"),$spotter_array[0]['pilot_name']);
+	$title = sprintf(_("Most Common Routes of %s"), $spotter_array[0]['pilot_name']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['pilot_name'].'</h1>';
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
 	include('pilot-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 flights piloted by <strong>%s</strong>."),$spotter_array[0]['pilot_name']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes from flights piloted by <strong>%s</strong>."), $spotter_array[0]['pilot_name']).'</p>';
 
-	$route_array = $Spotter->countAllRoutesByOwner($owner,$filter);
+	$route_array = $Spotter->countAllRoutesByOwner($owner, $filter);
 	if (!empty($route_array))
 	{
 		print '<div class="table-responsive">';
@@ -46,7 +46,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.

pilot-statistics-time.php 1 patch

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

@@ -7,18 +7,18 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$pilot = filter_input(INPUT_GET,'pilot',FILTER_SANITIZE_STRING);
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$pilot = filter_input(INPUT_GET, 'pilot', FILTER_SANITIZE_STRING);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
-$spotter_array = $Spotter->getSpotterDataByPilot($pilot,"0,1", $sort,$filter);
+if ($year != '') $filter = array_merge($filter, array('year' => $year));
+if ($month != '') $filter = array_merge($filter, array('month' => $month));
+$spotter_array = $Spotter->getSpotterDataByPilot($pilot, "0,1", $sort, $filter);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Time of Day of %s"),$spotter_array[0]['pilot_name']);
+	$title = sprintf(_("Most Common Time of Day of %s"), $spotter_array[0]['pilot_name']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['pilot_name'].'</h1>';
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
 	include('pilot-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 of flights piloted by <strong>%s</strong>."),$spotter_array[0]['pilot_name']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day of flights piloted by <strong>%s</strong>."), $spotter_array[0]['pilot_name']).'</p>';
 
-	$hour_array = $Spotter->countAllHoursByPilot($pilot,$filter);
+	$hour_array = $Spotter->countAllHoursByPilot($pilot, $filter);
 	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>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/c3.min.js"></script>';
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
 	$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++;
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 		$hour_cnt .= $hour_item['hour_count'].',';
 	}
 	$hour_data = "['x',".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: {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 		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>';

Please login to merge, or discard this patch.

pilot-detailed.php 2 patches

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

@@ -5,13 +5,13 @@  discard block
 block discarded – undo
 require_once('require/class.Language.php');
 require_once('require/class.SpotterArchive.php');
 
-if (!isset($_GET['pilot'])){
+if (!isset($_GET['pilot'])) {
 	header('Location: '.$globalURL.'/');
 } else {
 	$Spotter = new Spotter();
 	$SpotterArchive = new SpotterArchive();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
@@ -32,29 +32,29 @@  discard block
 block discarded – undo
 	
 	$page_url = $globalURL.'/pilot/'.$_GET['pilot'];
 	
-	$pilot = filter_input(INPUT_GET,'pilot',FILTER_SANITIZE_STRING);
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+	$pilot = filter_input(INPUT_GET, 'pilot', FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+	$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+	$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 	$filter = array();
-	if ($year != '') $filter = array_merge($filter,array('year' => $year));
-	if ($month != '') $filter = array_merge($filter,array('month' => $month));
+	if ($year != '') $filter = array_merge($filter, array('year' => $year));
+	if ($month != '') $filter = array_merge($filter, array('month' => $month));
 	if ($sort != '') 
 	{
-		$spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter);
+		$spotter_array = $Spotter->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, $sort, $filter);
 		if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-			$spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter);
+			$spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, $sort, $filter);
 		}
 	} else {
-		$spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference,'',$filter);
+		$spotter_array = $Spotter->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, '', $filter);
 		if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-			$spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference,'',$filter);
+			$spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, '', $filter);
 		}
 	}
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['pilot_name']);
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['pilot_name']);
 		$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'];
@@ -115,23 +115,23 @@  discard block
 block discarded – undo
 			$Stats = new Stats();
 			$flights = $Stats->getStatsPilot($pilot);
 		} else $flights = 0;
-		if ($flights == 0) $flights = $Spotter->countFlightsByPilot($pilot,$filter);
+		if ($flights == 0) $flights = $Spotter->countFlightsByPilot($pilot, $filter);
 		print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>';
-		$aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot,$filter));
+		$aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot, $filter));
 		print '<div><span class="label">'._("Aircrafts type").'</span>'.$aircraft_type.'</div>';
-		$aircraft_registration = count($Spotter->countAllAircraftRegistrationByPilot($pilot,$filter));
+		$aircraft_registration = count($Spotter->countAllAircraftRegistrationByPilot($pilot, $filter));
 		print '<div><span class="label">'._("Aircrafts").'</span>'.$aircraft_registration.'</div>';
-		$aircraft_manufacturer = count($Spotter->countAllAircraftManufacturerByPilot($pilot,$filter));
+		$aircraft_manufacturer = count($Spotter->countAllAircraftManufacturerByPilot($pilot, $filter));
 		print '<div><span class="label">'._("Manufacturers").'</span>'.$aircraft_manufacturer.'</div>';
-		$airlines = count($Spotter->countAllAirlinesByPilot($pilot,$filter));
+		$airlines = count($Spotter->countAllAirlinesByPilot($pilot, $filter));
 		print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
-		$duration = $Spotter->getFlightDurationByPilot($pilot,$filter);
+		$duration = $Spotter->getFlightDurationByPilot($pilot, $filter);
 		if ($duration != '0') print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
 		print '</div>';
 	
 		include('pilot-sub-menu.php');
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the pilot <strong>%s</strong>."),$spotter_array[0]['pilot_name']).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the pilot <strong>%s</strong>."), $spotter_array[0]['pilot_name']).'</p>';
 
 		include('table-output.php'); 
 		print '<div class="pagination">';

Please login to merge, or discard this patch.

Braces +24 added lines, -8 removed lines patch added patch discarded remove patch

@@ -37,8 +37,12 @@  discard block
 block discarded – undo
 	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 	$filter = array();
-	if ($year != '') $filter = array_merge($filter,array('year' => $year));
-	if ($month != '') $filter = array_merge($filter,array('month' => $month));
+	if ($year != '') {
+		$filter = array_merge($filter,array('year' => $year));
+	}
+	if ($month != '') {
+		$filter = array_merge($filter,array('month' => $month));
+	}
 	if ($sort != '') 
 	{
 		$spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter);
@@ -56,8 +60,12 @@  discard block
 block discarded – undo
 	{
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['pilot_name']);
 		$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) {
@@ -110,12 +118,18 @@  discard block
 block discarded – undo
 		*/
 		print '<div class="info column">';
 		print '<h1>'.$spotter_array[0]['pilot_name'].'</h1>';
-		if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>';
+		if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') {
+			print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>';
+		}
 		if ($year == '' && $month == '') {
 			$Stats = new Stats();
 			$flights = $Stats->getStatsPilot($pilot);
-		} else $flights = 0;
-		if ($flights == 0) $flights = $Spotter->countFlightsByPilot($pilot,$filter);
+		} else {
+			$flights = 0;
+		}
+		if ($flights == 0) {
+			$flights = $Spotter->countFlightsByPilot($pilot,$filter);
+		}
 		print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>';
 		$aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot,$filter));
 		print '<div><span class="label">'._("Aircrafts type").'</span>'.$aircraft_type.'</div>';
@@ -126,7 +140,9 @@  discard block
 block discarded – undo
 		$airlines = count($Spotter->countAllAirlinesByPilot($pilot,$filter));
 		print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
 		$duration = $Spotter->getFlightDurationByPilot($pilot,$filter);
-		if ($duration != '0') print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
+		if ($duration != '0') {
+			print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
+		}
 		print '</div>';
 	
 		include('pilot-sub-menu.php');

Please login to merge, or discard this patch.

pilot-statistics-departure-airport-country.php 1 patch

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

@@ -7,18 +7,18 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$pilot = filter_input(INPUT_GET,'pilot',FILTER_SANITIZE_STRING);
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$pilot = filter_input(INPUT_GET, 'pilot', FILTER_SANITIZE_STRING);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
-$spotter_array = $Spotter->getSpotterDataByPilot($pilot,"0,1", $sort,$filter);
+if ($year != '') $filter = array_merge($filter, array('year' => $year));
+if ($month != '') $filter = array_merge($filter, array('month' => $month));
+$spotter_array = $Spotter->getSpotterDataByPilot($pilot, "0,1", $sort, $filter);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Owner of %s"),$spotter_array[0]['pilot_name']);
+	$title = sprintf(_("Most Common Departure Airports by Owner of %s"), $spotter_array[0]['pilot_name']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['pilot_name'].'</h1>';
@@ -28,16 +28,16 @@  discard block
 block discarded – undo
 	include('pilot-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights piloted by <strong>%s</strong>."),$spotter_array[0]['pilot_name']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights piloted by <strong>%s</strong>."), $spotter_array[0]['pilot_name']).'</p>';
 
-	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByPilot($pilot,$filter);
+	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByPilot($pilot, $filter);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

		@@ -7,18 +7,18 @@ discard block
		block discarded – undo
7	7	die();
8	8	}
9	9	$Spotter = new Spotter();
10		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
11		-$pilot = filter_input(INPUT_GET,'pilot',FILTER_SANITIZE_STRING);
12		-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
13		-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
	10	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
	11	+$pilot = filter_input(INPUT_GET, 'pilot', FILTER_SANITIZE_STRING);
	12	+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
	13	+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
14	14	$filter = array();
15		-if ($year != '') $filter = array_merge($filter,array('year' => $year));
16		-if ($month != '') $filter = array_merge($filter,array('month' => $month));
17		-$spotter_array = $Spotter->getSpotterDataByPilot($pilot,"0,1", $sort,$filter);
	15	+if ($year != '') $filter = array_merge($filter, array('year' => $year));
	16	+if ($month != '') $filter = array_merge($filter, array('month' => $month));
	17	+$spotter_array = $Spotter->getSpotterDataByPilot($pilot, "0,1", $sort, $filter);
18	18
19	19	if (!empty($spotter_array))
20	20	{
21		- $title = sprintf(_("Most Common Routes of %s"),$spotter_array[0]['pilot_name']);
	21	+ $title = sprintf(_("Most Common Routes of %s"), $spotter_array[0]['pilot_name']);
22	22	require_once('header.php');
23	23	print '<div class="info column">';
24	24	print '<h1>'.$spotter_array[0]['pilot_name'].'</h1>';
		@@ -29,9 +29,9 @@ discard block
		block discarded – undo
29	29	include('pilot-sub-menu.php');
30	30	print '<div class="column">';
31	31	print '<h2>'._("Most Common Routes").'</h2>';
32		- print '<p>'.sprintf(_("The statistic below shows the most common routes from flights piloted by <strong>%s</strong>."),$spotter_array[0]['pilot_name']).'</p>';
	32	+ print '<p>'.sprintf(_("The statistic below shows the most common routes from flights piloted by <strong>%s</strong>."), $spotter_array[0]['pilot_name']).'</p>';
33	33
34		- $route_array = $Spotter->countAllRoutesByOwner($owner,$filter);
	34	+ $route_array = $Spotter->countAllRoutesByOwner($owner, $filter);
35	35	if (!empty($route_array))
36	36	{
37	37	print '<div class="table-responsive">';
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	print '</thead>';
47	47	print '<tbody>';
48	48	$i = 1;
49		- foreach($route_array as $route_item)
	49	+ foreach ($route_array as $route_item)
50	50	{
51	51	print '<tr>';
52	52	print '<td><strong>'.$i.'</strong></td>';

		@@ -5,13 +5,13 @@ discard block
		block discarded – undo
5	5	require_once('require/class.Language.php');
6	6	require_once('require/class.SpotterArchive.php');
7	7
8		-if (!isset($_GET['pilot'])){
	8	+if (!isset($_GET['pilot'])) {
9	9	header('Location: '.$globalURL.'/');
10	10	} else {
11	11	$Spotter = new Spotter();
12	12	$SpotterArchive = new SpotterArchive();
13	13	//calculuation for the pagination
14		- if(!isset($_GET['limit']))
	14	+ if (!isset($_GET['limit']))
15	15	{
16	16	$limit_start = 0;
17	17	$limit_end = 25;
		@@ -32,29 +32,29 @@ discard block
		block discarded – undo
32	32
33	33	$page_url = $globalURL.'/pilot/'.$_GET['pilot'];
34	34
35		- $pilot = filter_input(INPUT_GET,'pilot',FILTER_SANITIZE_STRING);
36		- $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
37		- $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
38		- $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
	35	+ $pilot = filter_input(INPUT_GET, 'pilot', FILTER_SANITIZE_STRING);
	36	+ $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
	37	+ $year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
	38	+ $month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
39	39	$filter = array();
40		- if ($year != '') $filter = array_merge($filter,array('year' => $year));
41		- if ($month != '') $filter = array_merge($filter,array('month' => $month));
	40	+ if ($year != '') $filter = array_merge($filter, array('year' => $year));
	41	+ if ($month != '') $filter = array_merge($filter, array('month' => $month));
42	42	if ($sort != '')
43	43	{
44		- $spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter);
	44	+ $spotter_array = $Spotter->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, $sort, $filter);
45	45	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
46		- $spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter);
	46	+ $spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, $sort, $filter);
47	47	}
48	48	} else {
49		- $spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference,'',$filter);
	49	+ $spotter_array = $Spotter->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, '', $filter);
50	50	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
51		- $spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference,'',$filter);
	51	+ $spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, '', $filter);
52	52	}
53	53	}
54	54
55	55	if (!empty($spotter_array))
56	56	{
57		- $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['pilot_name']);
	57	+ $title = sprintf(_("Detailed View for %s"), $spotter_array[0]['pilot_name']);
58	58	$ident = $spotter_array[0]['ident'];
59	59	if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
60	60	if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
		@@ -115,23 +115,23 @@ discard block
		block discarded – undo
115	115	$Stats = new Stats();
116	116	$flights = $Stats->getStatsPilot($pilot);
117	117	} else $flights = 0;
118		- if ($flights == 0) $flights = $Spotter->countFlightsByPilot($pilot,$filter);
	118	+ if ($flights == 0) $flights = $Spotter->countFlightsByPilot($pilot, $filter);
119	119	print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>';
120		- $aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot,$filter));
	120	+ $aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot, $filter));
121	121	print '<div><span class="label">'._("Aircrafts type").'</span>'.$aircraft_type.'</div>';
122		- $aircraft_registration = count($Spotter->countAllAircraftRegistrationByPilot($pilot,$filter));
	122	+ $aircraft_registration = count($Spotter->countAllAircraftRegistrationByPilot($pilot, $filter));
123	123	print '<div><span class="label">'._("Aircrafts").'</span>'.$aircraft_registration.'</div>';
124		- $aircraft_manufacturer = count($Spotter->countAllAircraftManufacturerByPilot($pilot,$filter));
	124	+ $aircraft_manufacturer = count($Spotter->countAllAircraftManufacturerByPilot($pilot, $filter));
125	125	print '<div><span class="label">'._("Manufacturers").'</span>'.$aircraft_manufacturer.'</div>';
126		- $airlines = count($Spotter->countAllAirlinesByPilot($pilot,$filter));
	126	+ $airlines = count($Spotter->countAllAirlinesByPilot($pilot, $filter));
127	127	print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
128		- $duration = $Spotter->getFlightDurationByPilot($pilot,$filter);
	128	+ $duration = $Spotter->getFlightDurationByPilot($pilot, $filter);
129	129	if ($duration != '0') print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
130	130	print '</div>';
131	131
132	132	include('pilot-sub-menu.php');
133	133	print '<div class="table column">';
134		- print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the pilot <strong>%s</strong>."),$spotter_array[0]['pilot_name']).'</p>';
	134	+ print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the pilot <strong>%s</strong>."), $spotter_array[0]['pilot_name']).'</p>';
135	135
136	136	include('table-output.php');
137	137	print '<div class="pagination">';

		@@ -37,8 +37,12 @@ discard block
		block discarded – undo
37	37	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
38	38	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
39	39	$filter = array();
40		- if ($year != '') $filter = array_merge($filter,array('year' => $year));
41		- if ($month != '') $filter = array_merge($filter,array('month' => $month));
	40	+ if ($year != '') {
	41	+ $filter = array_merge($filter,array('year' => $year));
	42	+ }
	43	+ if ($month != '') {
	44	+ $filter = array_merge($filter,array('month' => $month));
	45	+ }
42	46	if ($sort != '')
43	47	{
44	48	$spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter);
		@@ -56,8 +60,12 @@ discard block
		block discarded – undo
56	60	{
57	61	$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['pilot_name']);
58	62	$ident = $spotter_array[0]['ident'];
59		- if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
60		- if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
	63	+ if (isset($spotter_array[0]['latitude'])) {
	64	+ $latitude = $spotter_array[0]['latitude'];
	65	+ }
	66	+ if (isset($spotter_array[0]['longitude'])) {
	67	+ $longitude = $spotter_array[0]['longitude'];
	68	+ }
61	69	require_once('header.php');
62	70	/*
63	71	if (isset($globalArchive) && $globalArchive) {
		@@ -110,12 +118,18 @@ discard block
		block discarded – undo
110	118	*/
111	119	print '<div class="info column">';
112	120	print '<h1>'.$spotter_array[0]['pilot_name'].'</h1>';
113		- if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>';
	121	+ if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') {
	122	+ print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>';
	123	+ }
114	124	if ($year == '' && $month == '') {
115	125	$Stats = new Stats();
116	126	$flights = $Stats->getStatsPilot($pilot);
117		- } else $flights = 0;
118		- if ($flights == 0) $flights = $Spotter->countFlightsByPilot($pilot,$filter);
	127	+ } else {
	128	+ $flights = 0;
	129	+ }
	130	+ if ($flights == 0) {
	131	+ $flights = $Spotter->countFlightsByPilot($pilot,$filter);
	132	+ }
119	133	print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>';
120	134	$aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot,$filter));
121	135	print '<div><span class="label">'._("Aircrafts type").'</span>'.$aircraft_type.'</div>';
		@@ -126,7 +140,9 @@ discard block
		block discarded – undo
126	140	$airlines = count($Spotter->countAllAirlinesByPilot($pilot,$filter));
127	141	print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
128	142	$duration = $Spotter->getFlightDurationByPilot($pilot,$filter);
129		- if ($duration != '0') print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
	143	+ if ($duration != '0') {
	144	+ print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
	145	+ }
130	146	print '</div>';
131	147
132	148	include('pilot-sub-menu.php');

Ysurac / FlightAirMap

Push — master ( 8e88dd...50e4fb )

Status

Category

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

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

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

Braces +24 added lines, -8 removed lines patch added patch discarded remove patch

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