Inspection of "korean minimum translation" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#448)

unknown

created 2019-12-03 05:52 UTC

Status

Braces +16 added lines, -6 removed lines patch added patch discarded remove patch

@@ -14,7 +14,7 @@  discard block
 block discarded – undo
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -50,7 +50,9 @@  discard block
 block discarded – undo
 		print '<option></option>';
 		$Stats = new Stats();
 		$aircraft_types = $Stats->getAllAircraftTypes();
-		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+		if (empty($aircraft_types)) {
+			$aircraft_types = $Spotter->getAllAircraftTypes();
+		}
 		foreach($aircraft_types as $aircrafttype)
 		{
 			if($aircraft_type == $aircrafttype['aircraft_icao'])
@@ -73,14 +75,22 @@  discard block
 block discarded – undo
 				print '<div><span class="label">'._("Name").'</span>'.$aircraft_info[0]['type'].'</div>';
 				print '<div><span class="label">'._("ICAO").'</span>'.$aircraft_info[0]['icao'].'</div>'; 
 				print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $aircraft_info[0]['manufacturer'])).'">'.$aircraft_info[0]['manufacturer'].'</a></div>';
-				if ($aircraft_info[0]['aircraft_description'] != '' && $aircraft_info[0]['aircraft_description'] != 'None') print '<div><span class="label">'._("Description").'</span>'.$aircraft_info[0]['aircraft_description'].'</div>'; 
-				if ($aircraft_info[0]['engine_type'] != '' && $aircraft_info[0]['engine_type'] != 'None') print '<div><span class="label">'._("Engine").'</span>'.$aircraft_info[0]['engine_type'].'</div>'; 
-				if ($aircraft_info[0]['engine_count'] != '' && $aircraft_info[0]['engine_count'] != 0) print '<div><span class="label">'._("Engine count").'</span>'.$aircraft_info[0]['engine_count'].'</div>'; 
+				if ($aircraft_info[0]['aircraft_description'] != '' && $aircraft_info[0]['aircraft_description'] != 'None') {
+					print '<div><span class="label">'._("Description").'</span>'.$aircraft_info[0]['aircraft_description'].'</div>';
+				}
+				if ($aircraft_info[0]['engine_type'] != '' && $aircraft_info[0]['engine_type'] != 'None') {
+					print '<div><span class="label">'._("Engine").'</span>'.$aircraft_info[0]['engine_type'].'</div>';
+				}
+				if ($aircraft_info[0]['engine_count'] != '' && $aircraft_info[0]['engine_count'] != 0) {
+					print '<div><span class="label">'._("Engine count").'</span>'.$aircraft_info[0]['engine_count'].'</div>';
+				}
 			} else {
 				print '<h1>'.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')</h1>';
 				print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['aircraft_name'].'</div>';
 				print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['aircraft_type'].'</div>'; 
-				if (isset($spotter_array[0]['aircraft_manufacturer'])) print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
+				if (isset($spotter_array[0]['aircraft_manufacturer'])) {
+					print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
+				}
 			}
 			print '</div>';
 		} else {

Please login to merge, or discard this patch.

airport-detailed.php 1 patch

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

@@ -15,7 +15,7 @@  discard block
 block discarded – undo
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -46,7 +46,9 @@  discard block
 block discarded – undo
 			$METAR = new METAR();
 			$metar_info = $METAR->getMETAR($airport_icao);
 			//print_r($metar_info);
-			if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
+			if (isset($metar_info[0]['metar'])) {
+				$metar_parse = $METAR->parse($metar_info[0]['metar']);
+			}
             		//print_r($metar_parse);
 		}
 		
@@ -60,7 +62,9 @@  discard block
 block discarded – undo
 		print '<option></option>';
 		$Stats = new Stats();
 		$airport_names = $Stats->getAllAirportNames();
-		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+		if (empty($airport_names)) {
+			$airport_names = $Spotter->getAllAirportNames();
+		}
 		ksort($airport_names);
 		foreach($airport_names as $airport_name)
 		{
@@ -95,9 +99,15 @@  discard block
 block discarded – undo
 			print '</div>';
 			print '<div><span class="label">'._("Coordinates").'</span><a href="http://maps.google.com/maps?z=10&t=k&q='.$airport_array[0]['latitude'].','.$airport_array[0]['longitude'].'" target="_blank">Google Map<i class="fa fa-angle-double-right"></i></a></div>';
 			print '<div><span class="label">'._("Live Air Traffic").'</span><a href="http://www.liveatc.net/search/?icao='.$airport_array[0]['icao'].'" target="_blank">LiveATC.net<i class="fa fa-angle-double-right"></i></a></div>';
-			if (isset($airport_array[0]['home_link']) && $airport_array[0]['home_link'] != '') print '<div><a href="'.$airport_array[0]['home_link'].'"><i class="fa fa-home"></i></a></div>';
-			if (isset($airport_array[0]['wikipedia_link']) && $airport_array[0]['wikipedia_link'] != '') print '<div><a href="'.$airport_array[0]['wikipedia_link'].'"><i class="fa fa-wikipedia-w"></i></a></div>';
-			if (isset($airport_array[0]['diagram_pdf']) && $airport_array[0]['diagram_pdf'] != '') print '<div><span class="label">'._("Diagram").'</span><a href="'.$airport_array[0]['diagram_pdf'].'" target="_blank">'.$airport_array[0]['icao'].'<i class="fa fa-angle-double-right"></i></a></div>';
+			if (isset($airport_array[0]['home_link']) && $airport_array[0]['home_link'] != '') {
+				print '<div><a href="'.$airport_array[0]['home_link'].'"><i class="fa fa-home"></i></a></div>';
+			}
+			if (isset($airport_array[0]['wikipedia_link']) && $airport_array[0]['wikipedia_link'] != '') {
+				print '<div><a href="'.$airport_array[0]['wikipedia_link'].'"><i class="fa fa-wikipedia-w"></i></a></div>';
+			}
+			if (isset($airport_array[0]['diagram_pdf']) && $airport_array[0]['diagram_pdf'] != '') {
+				print '<div><span class="label">'._("Diagram").'</span><a href="'.$airport_array[0]['diagram_pdf'].'" target="_blank">'.$airport_array[0]['icao'].'<i class="fa fa-angle-double-right"></i></a></div>';
+			}
 			print '</div>';
 			
 			$Stats = new Stats();
@@ -105,7 +115,9 @@  discard block
 block discarded – undo
 			// Use spotter also
 			if (isset($globalTimezone)) {
 				date_default_timezone_set($globalTimezone);
-			} else date_default_timezone_set('UTC');
+			} else {
+				date_default_timezone_set('UTC');
+			}
 			if (count($all_data) > 0) {
 				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>';
@@ -211,7 +223,9 @@  discard block
 block discarded – undo
 			print '</div>';
 			print '</div>';
 		} else {
-			if (isset($airport_array[0]['image']) && $airport_array[0]['image'] != '') print '<center><img src="'.$airport_array[0]['image'].'" /></center>';
+			if (isset($airport_array[0]['image']) && $airport_array[0]['image'] != '') {
+				print '<center><img src="'.$airport_array[0]['image'].'" /></center>';
+			}
 			print '<p>'._("Sorry, no flights used the airport in this database.").'</p>'; 
 		}
 	} else {

Please login to merge, or discard this patch.

incident-detailed.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -58,8 +58,12 @@
 block discarded – undo
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');
 	print '<div class="pagination">';
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$date.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$date.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	if ($limit_previous_1 >= 0) {
+		print '<a href="'.$page_url.'/'.$date.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
+	}
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
+		print '<a href="'.$page_url.'/'.$date.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	}
 	print '</div>';
 }
 print '</div>';

Please login to merge, or discard this patch.

accident-detailed.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -58,8 +58,12 @@
 block discarded – undo
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');
 	print '<div class="pagination">';
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$date.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$date.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	if ($limit_previous_1 >= 0) {
+		print '<a href="'.$page_url.'/'.$date.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
+	}
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
+		print '<a href="'.$page_url.'/'.$date.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	}
 	print '</div>';
 }
 print '</div>';

Please login to merge, or discard this patch.

owner-statistics-time.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -14,8 +14,12 @@
 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));
+}
 $archive = false;
 $spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

Please login to merge, or discard this patch.

owner-statistics-arrival-airport-country.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -14,8 +14,12 @@
 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));
+}
 $archive = false;
 $spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort, $filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

Please login to merge, or discard this patch.

owner-detailed.php 1 patch

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

@@ -45,8 +45,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));
+	}
 	$spotter_array = $Spotter->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference, $sort,$filter);
 	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
 		$spotter_array = $SpotterArchive->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference, $sort,$filter);
@@ -56,16 +60,25 @@  discard block
 block discarded – undo
 	{
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['aircraft_owner']);
 		//$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');
 		print '<div class="info column">';
 		print '<h1>'.$spotter_array[0]['aircraft_owner'].'</h1>';
 		//print '<div><span class="label">'._("Owner").'</span>'.$spotter_array[0]['aircraft_owner'].'</div>';
 		$Stats = new Stats();
-		if ($year == '' && $month == '') $flights = $Stats->getStatsOwner($owner);
-		else $flights = 0;
-		if ($flights == 0) $flights = $Spotter->countFlightsByOwner($owner,$filter);
+		if ($year == '' && $month == '') {
+			$flights = $Stats->getStatsOwner($owner);
+		} else {
+			$flights = 0;
+		}
+		if ($flights == 0) {
+			$flights = $Spotter->countFlightsByOwner($owner,$filter);
+		}
 		print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>';
 		$aircraft_type = count($Spotter->countAllAircraftTypesByOwner($owner,$filter));
 		print '<div><span class="label">'._("Aircraft type").'</span>'.$aircraft_type.'</div>';
@@ -76,7 +89,9 @@  discard block
 block discarded – undo
 		$airlines = count($Spotter->countAllAirlinesByOwner($owner,$filter));
 		print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
 		$duration = $Spotter->getFlightDurationByOwner($owner,$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.

owner-statistics-airline.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -14,8 +14,12 @@
 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));
+}
 $archive = false;
 $spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

Please login to merge, or discard this patch.

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

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -14,8 +14,12 @@
 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));
+}
 $archive = false;
 $spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

Please login to merge, or discard this patch.

		@@ -58,8 +58,12 @@
		block discarded – undo
58	58	if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
59	59	include('table-output.php');
60	60	print '<div class="pagination">';
61		- if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$date.'/'.$limit_previous_1.','.$limit_previous_2.'">«'._("Previous Page").'</a>';
62		- if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$date.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'»</a>';
	61	+ if ($limit_previous_1 >= 0) {
	62	+ print '<a href="'.$page_url.'/'.$date.'/'.$limit_previous_1.','.$limit_previous_2.'">«'._("Previous Page").'</a>';
	63	+ }
	64	+ if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
	65	+ print '<a href="'.$page_url.'/'.$date.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'»</a>';
	66	+ }
63	67	print '</div>';
64	68	}
65	69	print '</div>';

		@@ -58,8 +58,12 @@
		block discarded – undo
58	58	if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
59	59	include('table-output.php');
60	60	print '<div class="pagination">';
61		- if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$date.'/'.$limit_previous_1.','.$limit_previous_2.'">«'._("Previous Page").'</a>';
62		- if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$date.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'»</a>';
	61	+ if ($limit_previous_1 >= 0) {
	62	+ print '<a href="'.$page_url.'/'.$date.'/'.$limit_previous_1.','.$limit_previous_2.'">«'._("Previous Page").'</a>';
	63	+ }
	64	+ if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
	65	+ print '<a href="'.$page_url.'/'.$date.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'»</a>';
	66	+ }
63	67	print '</div>';
64	68	}
65	69	print '</div>';

		@@ -14,7 +14,7 @@ discard block
		block discarded – undo
14	14	$limit_start = 0;
15	15	$limit_end = 25;
16	16	$absolute_difference = 25;
17		- } else {
	17	+ } else {
18	18	$limit_explode = explode(",", $_GET['limit']);
19	19	$limit_start = $limit_explode[0];
20	20	$limit_end = $limit_explode[1];
		@@ -50,7 +50,9 @@ discard block
		block discarded – undo
50	50	print '<option></option>';
51	51	$Stats = new Stats();
52	52	$aircraft_types = $Stats->getAllAircraftTypes();
53		- if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
	53	+ if (empty($aircraft_types)) {
	54	+ $aircraft_types = $Spotter->getAllAircraftTypes();
	55	+ }
54	56	foreach($aircraft_types as $aircrafttype)
55	57	{
56	58	if($aircraft_type == $aircrafttype['aircraft_icao'])
		@@ -73,14 +75,22 @@ discard block
		block discarded – undo
73	75	print '<div><span class="label">'._("Name").'</span>'.$aircraft_info[0]['type'].'</div>';
74	76	print '<div><span class="label">'._("ICAO").'</span>'.$aircraft_info[0]['icao'].'</div>';
75	77	print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $aircraft_info[0]['manufacturer'])).'">'.$aircraft_info[0]['manufacturer'].'</a></div>';
76		- if ($aircraft_info[0]['aircraft_description'] != '' && $aircraft_info[0]['aircraft_description'] != 'None') print '<div><span class="label">'._("Description").'</span>'.$aircraft_info[0]['aircraft_description'].'</div>';
77		- if ($aircraft_info[0]['engine_type'] != '' && $aircraft_info[0]['engine_type'] != 'None') print '<div><span class="label">'._("Engine").'</span>'.$aircraft_info[0]['engine_type'].'</div>';
78		- if ($aircraft_info[0]['engine_count'] != '' && $aircraft_info[0]['engine_count'] != 0) print '<div><span class="label">'._("Engine count").'</span>'.$aircraft_info[0]['engine_count'].'</div>';
	78	+ if ($aircraft_info[0]['aircraft_description'] != '' && $aircraft_info[0]['aircraft_description'] != 'None') {
	79	+ print '<div><span class="label">'._("Description").'</span>'.$aircraft_info[0]['aircraft_description'].'</div>';
	80	+ }
	81	+ if ($aircraft_info[0]['engine_type'] != '' && $aircraft_info[0]['engine_type'] != 'None') {
	82	+ print '<div><span class="label">'._("Engine").'</span>'.$aircraft_info[0]['engine_type'].'</div>';
	83	+ }
	84	+ if ($aircraft_info[0]['engine_count'] != '' && $aircraft_info[0]['engine_count'] != 0) {
	85	+ print '<div><span class="label">'._("Engine count").'</span>'.$aircraft_info[0]['engine_count'].'</div>';
	86	+ }
79	87	} else {
80	88	print '<h1>'.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')</h1>';
81	89	print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['aircraft_name'].'</div>';
82	90	print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['aircraft_type'].'</div>';
83		- if (isset($spotter_array[0]['aircraft_manufacturer'])) print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
	91	+ if (isset($spotter_array[0]['aircraft_manufacturer'])) {
	92	+ print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
	93	+ }
84	94	}
85	95	print '</div>';
86	96	} else {

		@@ -15,7 +15,7 @@ discard block
		block discarded – undo
15	15	$limit_start = 0;
16	16	$limit_end = 25;
17	17	$absolute_difference = 25;
18		- } else {
	18	+ } else {
19	19	$limit_explode = explode(",", $_GET['limit']);
20	20	$limit_start = $limit_explode[0];
21	21	$limit_end = $limit_explode[1];
		@@ -46,7 +46,9 @@ discard block
		block discarded – undo
46	46	$METAR = new METAR();
47	47	$metar_info = $METAR->getMETAR($airport_icao);
48	48	//print_r($metar_info);
49		- if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
	49	+ if (isset($metar_info[0]['metar'])) {
	50	+ $metar_parse = $METAR->parse($metar_info[0]['metar']);
	51	+ }
50	52	//print_r($metar_parse);
51	53	}
52	54
		@@ -60,7 +62,9 @@ discard block
		block discarded – undo
60	62	print '<option></option>';
61	63	$Stats = new Stats();
62	64	$airport_names = $Stats->getAllAirportNames();
63		- if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
	65	+ if (empty($airport_names)) {
	66	+ $airport_names = $Spotter->getAllAirportNames();
	67	+ }
64	68	ksort($airport_names);
65	69	foreach($airport_names as $airport_name)
66	70	{
		@@ -95,9 +99,15 @@ discard block
		block discarded – undo
95	99	print '</div>';
96	100	print '<div><span class="label">'._("Coordinates").'</span><a href="http://maps.google.com/maps?z=10&t=k&q='.$airport_array[0]['latitude'].','.$airport_array[0]['longitude'].'" target="_blank">Google Map<i class="fa fa-angle-double-right"></i></a></div>';
97	101	print '<div><span class="label">'._("Live Air Traffic").'</span><a href="http://www.liveatc.net/search/?icao='.$airport_array[0]['icao'].'" target="_blank">LiveATC.net<i class="fa fa-angle-double-right"></i></a></div>';
98		- if (isset($airport_array[0]['home_link']) && $airport_array[0]['home_link'] != '') print '<div><a href="'.$airport_array[0]['home_link'].'"><i class="fa fa-home"></i></a></div>';
99		- if (isset($airport_array[0]['wikipedia_link']) && $airport_array[0]['wikipedia_link'] != '') print '<div><a href="'.$airport_array[0]['wikipedia_link'].'"><i class="fa fa-wikipedia-w"></i></a></div>';
100		- if (isset($airport_array[0]['diagram_pdf']) && $airport_array[0]['diagram_pdf'] != '') print '<div><span class="label">'._("Diagram").'</span><a href="'.$airport_array[0]['diagram_pdf'].'" target="_blank">'.$airport_array[0]['icao'].'<i class="fa fa-angle-double-right"></i></a></div>';
	102	+ if (isset($airport_array[0]['home_link']) && $airport_array[0]['home_link'] != '') {
	103	+ print '<div><a href="'.$airport_array[0]['home_link'].'"><i class="fa fa-home"></i></a></div>';
	104	+ }
	105	+ if (isset($airport_array[0]['wikipedia_link']) && $airport_array[0]['wikipedia_link'] != '') {
	106	+ print '<div><a href="'.$airport_array[0]['wikipedia_link'].'"><i class="fa fa-wikipedia-w"></i></a></div>';
	107	+ }
	108	+ if (isset($airport_array[0]['diagram_pdf']) && $airport_array[0]['diagram_pdf'] != '') {
	109	+ print '<div><span class="label">'._("Diagram").'</span><a href="'.$airport_array[0]['diagram_pdf'].'" target="_blank">'.$airport_array[0]['icao'].'<i class="fa fa-angle-double-right"></i></a></div>';
	110	+ }
101	111	print '</div>';
102	112
103	113	$Stats = new Stats();
		@@ -105,7 +115,9 @@ discard block
		block discarded – undo
105	115	// Use spotter also
106	116	if (isset($globalTimezone)) {
107	117	date_default_timezone_set($globalTimezone);
108		- } else date_default_timezone_set('UTC');
	118	+ } else {
	119	+ date_default_timezone_set('UTC');
	120	+ }
109	121	if (count($all_data) > 0) {
110	122	print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
111	123	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
		@@ -211,7 +223,9 @@ discard block
		block discarded – undo
211	223	print '</div>';
212	224	print '</div>';
213	225	} else {
214		- if (isset($airport_array[0]['image']) && $airport_array[0]['image'] != '') print '<center><img src="'.$airport_array[0]['image'].'" /></center>';
	226	+ if (isset($airport_array[0]['image']) && $airport_array[0]['image'] != '') {
	227	+ print '<center><img src="'.$airport_array[0]['image'].'" /></center>';
	228	+ }
215	229	print '<p>'._("Sorry, no flights used the airport in this database.").'</p>';
216	230	}
217	231	} else {

		@@ -14,8 +14,12 @@
		block discarded – undo
14	14	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
15	15	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
16	16	$filter = array();
17		-if ($year != '') $filter = array_merge($filter,array('year' => $year));
18		-if ($month != '') $filter = array_merge($filter,array('month' => $month));
	17	+if ($year != '') {
	18	+ $filter = array_merge($filter,array('year' => $year));
	19	+}
	20	+if ($month != '') {
	21	+ $filter = array_merge($filter,array('month' => $month));
	22	+}
19	23	$archive = false;
20	24	$spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
21	25	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

		@@ -45,8 +45,12 @@ discard block
		block discarded – undo
45	45	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
46	46	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
47	47	$filter = array();
48		- if ($year != '') $filter = array_merge($filter,array('year' => $year));
49		- if ($month != '') $filter = array_merge($filter,array('month' => $month));
	48	+ if ($year != '') {
	49	+ $filter = array_merge($filter,array('year' => $year));
	50	+ }
	51	+ if ($month != '') {
	52	+ $filter = array_merge($filter,array('month' => $month));
	53	+ }
50	54	$spotter_array = $Spotter->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference, $sort,$filter);
51	55	if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
52	56	$spotter_array = $SpotterArchive->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference, $sort,$filter);
		@@ -56,16 +60,25 @@ discard block
		block discarded – undo
56	60	{
57	61	$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['aircraft_owner']);
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	print '<div class="info column">';
63	71	print '<h1>'.$spotter_array[0]['aircraft_owner'].'</h1>';
64	72	//print '<div><span class="label">'._("Owner").'</span>'.$spotter_array[0]['aircraft_owner'].'</div>';
65	73	$Stats = new Stats();
66		- if ($year == '' && $month == '') $flights = $Stats->getStatsOwner($owner);
67		- else $flights = 0;
68		- if ($flights == 0) $flights = $Spotter->countFlightsByOwner($owner,$filter);
	74	+ if ($year == '' && $month == '') {
	75	+ $flights = $Stats->getStatsOwner($owner);
	76	+ } else {
	77	+ $flights = 0;
	78	+ }
	79	+ if ($flights == 0) {
	80	+ $flights = $Spotter->countFlightsByOwner($owner,$filter);
	81	+ }
69	82	print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>';
70	83	$aircraft_type = count($Spotter->countAllAircraftTypesByOwner($owner,$filter));
71	84	print '<div><span class="label">'._("Aircraft type").'</span>'.$aircraft_type.'</div>';
		@@ -76,7 +89,9 @@ discard block
		block discarded – undo
76	89	$airlines = count($Spotter->countAllAirlinesByOwner($owner,$filter));
77	90	print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
78	91	$duration = $Spotter->getFlightDurationByOwner($owner,$filter);
79		- if ($duration != '0') print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
	92	+ if ($duration != '0') {
	93	+ print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>';
	94	+ }
80	95	print '</div>';
81	96
82	97	include('owner-sub-menu.php');

Ysurac / FlightAirMap

Pull Request — master (#448)

Status

Category

Braces +16 added lines, -6 removed lines patch added patch discarded remove patch

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

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch