Inspection of "Should really fix #287" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 86df70...5149c7 )

by Yannick

created 2017-04-17 18:00 UTC

Status

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

@@ -7,14 +7,14 @@  discard block
 block discarded – undo
 //require_once('require/class.SpotterLive.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();
 	$Translation = new Translation();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
@@ -35,29 +35,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)) {
-			$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)) {
-			$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'];
@@ -118,23 +118,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('owner-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

@@ -40,8 +40,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);
@@ -59,8 +63,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) {
@@ -113,12 +121,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>';
@@ -129,7 +143,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('owner-sub-menu.php');

Please login to merge, or discard this patch.

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

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

Ysurac / FlightAirMap

Push — master ( 86df70...5149c7 )

Status

Category

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