Inspection of "Add an option to get results from archive or not" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 81e721...2f3c42 )

by Yannick

created 2017-07-19 10:55 UTC

Status

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

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 require_once('require/class.Language.php');
 require_once('require/class.Translation.php');
 $type = '';
-$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
+$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
 if (isset($_GET['marine'])) {
 	require_once('require/class.Marine.php');
 	require_once('require/class.MarineLive.php');
@@ -30,12 +30,12 @@  discard block
 block discarded – undo
 	$page_url = $globalURL.'/ident/'.$_GET['ident'];
 }
 
-if (!isset($_GET['ident'])){
+if (!isset($_GET['ident'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Translation = new Translation();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
@@ -54,18 +54,18 @@  discard block
 block discarded – undo
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($type == 'aircraft') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 		if (empty($spotter_array)) {
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
 				$ident = $new_ident;
 				if ($sort != '') 
 				{
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					}
 				} else {
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					}
 				}
 			}
@@ -89,34 +89,34 @@  discard block
 block discarded – undo
 	} elseif ($type == 'marine') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	} elseif ($type == 'tracker') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	}
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['ident']);
 		$ident = $spotter_array[0]['ident'];
 		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
 		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
 				$altitude_data = '';
 				$hour_data = '';
 				$speed_data = '';
-				foreach($all_data as $data)
+				foreach ($all_data as $data)
 				{
 					$hour_data .= '"'.$data['date'].'",';
 					if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
@@ -163,8 +163,8 @@  discard block
 block discarded – undo
 					$speed_data .= $speed.',';
 				}
 				$hour_data = "['x',".substr($hour_data, 0, -1)."]";
-				$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
-				$speed_data = "['speed',".substr($speed_data,0,-1)."]";
+				$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
+				$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
 				print 'c3.generate({
 				    bindto: "#chart",
 				    data: {
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
 	
 		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">';

Please login to merge, or discard this patch.

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	require_once('require/class.Language.php');
4	4	require_once('require/class.Translation.php');
5	5	$type = '';
6		-$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
	6	+$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
7	7	if (isset($_GET['marine'])) {
8	8	require_once('require/class.Marine.php');
9	9	require_once('require/class.MarineLive.php');
		@@ -30,12 +30,12 @@ discard block
		block discarded – undo
30	30	$page_url = $globalURL.'/ident/'.$_GET['ident'];
31	31	}
32	32
33		-if (!isset($_GET['ident'])){
	33	+if (!isset($_GET['ident'])) {
34	34	header('Location: '.$globalURL.'');
35	35	} else {
36	36	$Translation = new Translation();
37	37	//calculuation for the pagination
38		- if(!isset($_GET['limit']))
	38	+ if (!isset($_GET['limit']))
39	39	{
40	40	$limit_start = 0;
41	41	$limit_end = 25;
		@@ -54,18 +54,18 @@ discard block
		block discarded – undo
54	54	$limit_previous_1 = $limit_start - $absolute_difference;
55	55	$limit_previous_2 = $limit_end - $absolute_difference;
56	56
57		- $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	57	+ $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
58	58	if ($type == 'aircraft') {
59	59	if ($sort != '')
60	60	{
61		- $spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
	61	+ $spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
62	62	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
63		- $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
	63	+ $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
64	64	}
65	65	} else {
66		- $spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
	66	+ $spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
67	67	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
68		- $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
	68	+ $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
69	69	}
70	70	}
71	71	if (empty($spotter_array)) {
		@@ -74,14 +74,14 @@ discard block
		block discarded – undo
74	74	$ident = $new_ident;
75	75	if ($sort != '')
76	76	{
77		- $spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
	77	+ $spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
78	78	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
79		- $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
	79	+ $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
80	80	}
81	81	} else {
82		- $spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
	82	+ $spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
83	83	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
84		- $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
	84	+ $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
85	85	}
86	86	}
87	87	}
		@@ -89,34 +89,34 @@ discard block
		block discarded – undo
89	89	} elseif ($type == 'marine') {
90	90	if ($sort != '')
91	91	{
92		- $spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
	92	+ $spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
93	93	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
94		- $spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
	94	+ $spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
95	95	}
96	96	} else {
97		- $spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
	97	+ $spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
98	98	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
99		- $spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
	99	+ $spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
100	100	}
101	101	}
102	102	} elseif ($type == 'tracker') {
103	103	if ($sort != '')
104	104	{
105		- $spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
	105	+ $spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
106	106	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
107		- $spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
	107	+ $spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
108	108	}
109	109	} else {
110		- $spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
	110	+ $spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
111	111	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
112		- $spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
	112	+ $spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
113	113	}
114	114	}
115	115	}
116	116
117	117	if (!empty($spotter_array))
118	118	{
119		- $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
	119	+ $title = sprintf(_("Detailed View for %s"), $spotter_array[0]['ident']);
120	120	$ident = $spotter_array[0]['ident'];
121	121	if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
122	122	if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
		@@ -135,7 +135,7 @@ discard block
		block discarded – undo
135	135	$altitude_data = '';
136	136	$hour_data = '';
137	137	$speed_data = '';
138		- foreach($all_data as $data)
	138	+ foreach ($all_data as $data)
139	139	{
140	140	$hour_data .= '"'.$data['date'].'",';
141	141	if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
		@@ -163,8 +163,8 @@ discard block
		block discarded – undo
163	163	$speed_data .= $speed.',';
164	164	}
165	165	$hour_data = "['x',".substr($hour_data, 0, -1)."]";
166		- $altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
167		- $speed_data = "['speed',".substr($speed_data,0,-1)."]";
	166	+ $altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
	167	+ $speed_data = "['speed',".substr($speed_data, 0, -1)."]";
168	168	print 'c3.generate({
169	169	bindto: "#chart",
170	170	data: {
		@@ -208,9 +208,9 @@ discard block
		block discarded – undo
208	208
209	209	if ($type == 'aircraft') include('ident-sub-menu.php');
210	210	print '<div class="table column">';
211		- 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>';
212		- 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>';
213		- 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>';
	211	+ 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>';
	212	+ 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>';
	213	+ 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>';
214	214
215	215	include('table-output.php');
216	216	print '<div class="pagination">';

Ysurac / FlightAirMap

Push — master ( 81e721...2f3c42 )

Status

Category

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