Inspection of "More data in aircrafts, airlines, airports pages a..." - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( a47ea2...eac4f3 )

by Yannick

created 2017-12-21 14:03 UTC

Status

Braces +13 added lines, -5 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];
@@ -47,7 +47,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);
 		}
 		
@@ -61,7 +63,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)
 		{
@@ -96,7 +100,9 @@  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]['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]['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();
@@ -104,7 +110,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>';

Please login to merge, or discard this patch.

airline-detailed.php 2 patches

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

@@ -4,20 +4,20 @@  discard block
 block discarded – undo
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 
-if (!isset($_GET['airline'])){
+if (!isset($_GET['airline'])) {
 	header('Location: '.$globalURL.'/airline');
-} else{
+} else {
 	$Spotter = new Spotter();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']) || $_GET['limit'] == "")
+	if (!isset($_GET['limit']) || $_GET['limit'] == "")
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
-		$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
-		$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
+		$limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
+		$limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
 		if (!ctype_digit(strval($limit_start)) || !ctype_digit(strval($limit_end))) {
 			$limit_start = 0;
 			$limit_end = 25;
@@ -28,20 +28,20 @@  discard block
 block discarded – undo
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
+	$airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
 	$page_url = $globalURL.'/airline/'.$airline;
 	$alliance = false;
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	$airline_info = array();
-	if (strpos($airline,'alliance_') !== FALSE) {
-		$spotter_array = $Spotter->getSpotterDataByAirline('',$limit_start.",".$absolute_difference, $sort,array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
+	if (strpos($airline, 'alliance_') !== FALSE) {
+		$spotter_array = $Spotter->getSpotterDataByAirline('', $limit_start.",".$absolute_difference, $sort, array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $airline))));
 		$alliance = true;
 	} else {
-		$spotter_array = $Spotter->getSpotterDataByAirline($airline,$limit_start.",".$absolute_difference, $sort);
+		$spotter_array = $Spotter->getSpotterDataByAirline($airline, $limit_start.",".$absolute_difference, $sort);
 		if (isset($globalIVAO)) {
-			$airline_info = $Spotter->getAllAirlineInfo($airline,'ivao');
+			$airline_info = $Spotter->getAllAirlineInfo($airline, 'ivao');
 		} elseif (isset($globalVATSIM)) {
-			$airline_info = $Spotter->getAllAirlineInfo($airline,'vatsim');
+			$airline_info = $Spotter->getAllAirlineInfo($airline, 'vatsim');
 		} else {
 			$airline_info = $Spotter->getAllAirlineInfo($airline);
 		}
@@ -49,12 +49,12 @@  discard block
 block discarded – undo
 	if (!empty($spotter_array) || !empty($airline_info))
 	{
 		if ($alliance) {
-			$title = sprintf(_("Detailed View for %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+			$title = sprintf(_("Detailed View for %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 		} else {
 			if (isset($airline_info[0]['name']) && isset($airline_info[0]['icao'])) {
-				$title = sprintf(_("Detailed View for %s (%s)"),$airline_info[0]['name'],$airline_info[0]['icao']);
+				$title = sprintf(_("Detailed View for %s (%s)"), $airline_info[0]['name'], $airline_info[0]['icao']);
 			} elseif (isset($spotter_array[0]['airline_name']) && isset($spotter_array[0]['airline_icao'])) {
-				$title = sprintf(_("Detailed View for %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+				$title = sprintf(_("Detailed View for %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 			} else $title = '';
 		}
 		require_once('header.php');
@@ -66,10 +66,10 @@  discard block
 block discarded – undo
 		$alliances = $Spotter->getAllAllianceNames();
 		if (!empty($alliances)) {
 			foreach ($alliances as $al) {
-				if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-					print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+				if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+					print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 				} else {
-					print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+					print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 				}
 			}
 			print '<option disabled>───────────────</option>';
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
 		$Stats = new Stats();
 		$airline_names = $Stats->getAllAirlineNames();
 		if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-		foreach($airline_names as $airline_name)
+		foreach ($airline_names as $airline_name)
 		{
-			if($airline == $airline_name['airline_icao'])
+			if ($airline == $airline_name['airline_icao'])
 			{
 				print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 			} else {
@@ -137,12 +137,12 @@  discard block
 block discarded – undo
 				}
 			} else {
 				print '<div class="info column">';
-				print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-				if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+				print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+				if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 				{
-					print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+					print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 				}
-				print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+				print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 				print '</div>';
 			}
 		} else {
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
 			include('airline-sub-menu.php');
 			print '<div class="table column">';
 			if (isset($spotter_array[0]['airline_name']) && $alliance === false) {
-				print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+				print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 			}
 			include('table-output.php');  
 			print '<div class="pagination">';

Please login to merge, or discard this patch.

Braces +31 added lines, -11 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 = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
 		$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
@@ -55,7 +55,9 @@  discard block
 block discarded – undo
 				$title = sprintf(_("Detailed View for %s (%s)"),$airline_info[0]['name'],$airline_info[0]['icao']);
 			} elseif (isset($spotter_array[0]['airline_name']) && isset($spotter_array[0]['airline_icao'])) {
 				$title = sprintf(_("Detailed View for %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
-			} else $title = '';
+			} else {
+				$title = '';
+			}
 		}
 		require_once('header.php');
 	  
@@ -76,7 +78,9 @@  discard block
 block discarded – undo
 		}
 		$Stats = new Stats();
 		$airline_names = $Stats->getAllAirlineNames();
-		if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+		if (empty($airline_names)) {
+			$airline_names = $Spotter->getAllAirlineNames();
+		}
 		foreach($airline_names as $airline_name)
 		{
 			if($airline == $airline_name['airline_icao'])
@@ -108,12 +112,22 @@  discard block
 block discarded – undo
 					print '<div><span class="label">'._("Name").'</span>'.$airline_info[0]['name'].'</div>';
 					print '<div><span class="label">'._("Country").'</span>'.$airline_info[0]['country'].'</div>';
 					print '<div><span class="label">'._("ICAO").'</span>'.$airline_info[0]['icao'].'</div>';
-					if ($airline_info[0]['iata'] != '') print '<div><span class="label">'._("IATA").'</span>'.$airline_info[0]['iata'].'</div>';
-					if ($airline_info[0]['callsign'] != '') print '<div><span class="label">'._("Callsign").'</span>'.$airline_info[0]['callsign'].'</div>'; 
+					if ($airline_info[0]['iata'] != '') {
+						print '<div><span class="label">'._("IATA").'</span>'.$airline_info[0]['iata'].'</div>';
+					}
+					if ($airline_info[0]['callsign'] != '') {
+						print '<div><span class="label">'._("Callsign").'</span>'.$airline_info[0]['callsign'].'</div>';
+					}
 					print '<div><span class="label">'._("Type").'</span>'.ucwords($airline_info[0]['type']).'</div>';
-					if (isset($airline_info[0]['home_link']) && $airline_info[0]['home_link'] != '') print '<div><a href="'.$airline_info[0]['home_link'].'"><i class="fa fa-home"></i></a></div>';
-					if (isset($airline_info[0]['wikipedia_link']) && $airline_info[0]['wikipedia_link'] != '') print '<div><a href="'.$airline_info[0]['wikipedia_link'].'"><i class="fa fa-wikipedia-w"></i></a></div>';
-					if ($airline_info[0]['ban_eu'] == 1) print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
+					if (isset($airline_info[0]['home_link']) && $airline_info[0]['home_link'] != '') {
+						print '<div><a href="'.$airline_info[0]['home_link'].'"><i class="fa fa-home"></i></a></div>';
+					}
+					if (isset($airline_info[0]['wikipedia_link']) && $airline_info[0]['wikipedia_link'] != '') {
+						print '<div><a href="'.$airline_info[0]['wikipedia_link'].'"><i class="fa fa-wikipedia-w"></i></a></div>';
+					}
+					if ($airline_info[0]['ban_eu'] == 1) {
+						print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
+					}
 					print '</div>';
 				
 				} else {
@@ -129,10 +143,16 @@  discard block
 block discarded – undo
 					print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['airline_name'].'</div>';
 					print '<div><span class="label">'._("Country").'</span>'.$spotter_array[0]['airline_country'].'</div>';
 					print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['airline_icao'].'</div>';
-					if (isset($spotter_array[0]['airline_iata']) && $spotter_array[0]['airline_iata'] != '') print '<div><span class="label">'._("IATA").'</span>'.$spotter_array[0]['airline_iata'].'</div>';
-					if (isset($spotter_array[0]['airline_callsign']) && $spotter_array[0]['airline_callsign'] != '') print '<div><span class="label">'._("Callsign").'</span>'.$spotter_array[0]['airline_callsign'].'</div>'; 
+					if (isset($spotter_array[0]['airline_iata']) && $spotter_array[0]['airline_iata'] != '') {
+						print '<div><span class="label">'._("IATA").'</span>'.$spotter_array[0]['airline_iata'].'</div>';
+					}
+					if (isset($spotter_array[0]['airline_callsign']) && $spotter_array[0]['airline_callsign'] != '') {
+						print '<div><span class="label">'._("Callsign").'</span>'.$spotter_array[0]['airline_callsign'].'</div>';
+					}
 					print '<div><span class="label">'._("Type").'</span>'.ucwords($spotter_array[0]['airline_type']).'</div>';
-					if (isset($spotter_array[0]['ban_eu']) && $spotter_array[0]['ban_eu'] == 1) print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
+					if (isset($spotter_array[0]['ban_eu']) && $spotter_array[0]['ban_eu'] == 1) {
+						print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
+					}
 					print '</div>';
 				}
 			} else {

Please login to merge, or discard this patch.

		@@ -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];
		@@ -47,7 +47,9 @@ discard block
		block discarded – undo
47	47	$METAR = new METAR();
48	48	$metar_info = $METAR->getMETAR($airport_icao);
49	49	//print_r($metar_info);
50		- if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
	50	+ if (isset($metar_info[0]['metar'])) {
	51	+ $metar_parse = $METAR->parse($metar_info[0]['metar']);
	52	+ }
51	53	//print_r($metar_parse);
52	54	}
53	55
		@@ -61,7 +63,9 @@ discard block
		block discarded – undo
61	63	print '<option></option>';
62	64	$Stats = new Stats();
63	65	$airport_names = $Stats->getAllAirportNames();
64		- if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
	66	+ if (empty($airport_names)) {
	67	+ $airport_names = $Spotter->getAllAirportNames();
	68	+ }
65	69	ksort($airport_names);
66	70	foreach($airport_names as $airport_name)
67	71	{
		@@ -96,7 +100,9 @@ discard block
		block discarded – undo
96	100	print '</div>';
97	101	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>';
98	102	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>';
99		- 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>';
	103	+ if (isset($airport_array[0]['diagram_pdf']) && $airport_array[0]['diagram_pdf'] != '') {
	104	+ 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>';
	105	+ }
100	106	print '</div>';
101	107
102	108	$Stats = new Stats();
		@@ -104,7 +110,9 @@ discard block
		block discarded – undo
104	110	// Use spotter also
105	111	if (isset($globalTimezone)) {
106	112	date_default_timezone_set($globalTimezone);
107		- } else date_default_timezone_set('UTC');
	113	+ } else {
	114	+ date_default_timezone_set('UTC');
	115	+ }
108	116	if (count($all_data) > 0) {
109	117	print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
110	118	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';

		@@ -4,20 +4,20 @@ discard block
		block discarded – undo
4	4	require_once('require/class.Stats.php');
5	5	require_once('require/class.Language.php');
6	6
7		-if (!isset($_GET['airline'])){
	7	+if (!isset($_GET['airline'])) {
8	8	header('Location: '.$globalURL.'/airline');
9		-} else{
	9	+} else {
10	10	$Spotter = new Spotter();
11	11	//calculuation for the pagination
12		- if(!isset($_GET['limit']) \|\| $_GET['limit'] == "")
	12	+ if (!isset($_GET['limit']) \|\| $_GET['limit'] == "")
13	13	{
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		- $limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
20		- $limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
	19	+ $limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
	20	+ $limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
21	21	if (!ctype_digit(strval($limit_start)) \|\| !ctype_digit(strval($limit_end))) {
22	22	$limit_start = 0;
23	23	$limit_end = 25;
		@@ -28,20 +28,20 @@ discard block
		block discarded – undo
28	28	$limit_previous_1 = $limit_start - $absolute_difference;
29	29	$limit_previous_2 = $limit_end - $absolute_difference;
30	30
31		- $airline = urldecode(filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING));
	31	+ $airline = urldecode(filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING));
32	32	$page_url = $globalURL.'/airline/'.$airline;
33	33	$alliance = false;
34		- $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	34	+ $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
35	35	$airline_info = array();
36		- if (strpos($airline,'alliance_') !== FALSE) {
37		- $spotter_array = $Spotter->getSpotterDataByAirline('',$limit_start.",".$absolute_difference, $sort,array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline))));
	36	+ if (strpos($airline, 'alliance_') !== FALSE) {
	37	+ $spotter_array = $Spotter->getSpotterDataByAirline('', $limit_start.",".$absolute_difference, $sort, array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $airline))));
38	38	$alliance = true;
39	39	} else {
40		- $spotter_array = $Spotter->getSpotterDataByAirline($airline,$limit_start.",".$absolute_difference, $sort);
	40	+ $spotter_array = $Spotter->getSpotterDataByAirline($airline, $limit_start.",".$absolute_difference, $sort);
41	41	if (isset($globalIVAO)) {
42		- $airline_info = $Spotter->getAllAirlineInfo($airline,'ivao');
	42	+ $airline_info = $Spotter->getAllAirlineInfo($airline, 'ivao');
43	43	} elseif (isset($globalVATSIM)) {
44		- $airline_info = $Spotter->getAllAirlineInfo($airline,'vatsim');
	44	+ $airline_info = $Spotter->getAllAirlineInfo($airline, 'vatsim');
45	45	} else {
46	46	$airline_info = $Spotter->getAllAirlineInfo($airline);
47	47	}
		@@ -49,12 +49,12 @@ discard block
		block discarded – undo
49	49	if (!empty($spotter_array) \|\| !empty($airline_info))
50	50	{
51	51	if ($alliance) {
52		- $title = sprintf(_("Detailed View for %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
	52	+ $title = sprintf(_("Detailed View for %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
53	53	} else {
54	54	if (isset($airline_info[0]['name']) && isset($airline_info[0]['icao'])) {
55		- $title = sprintf(_("Detailed View for %s (%s)"),$airline_info[0]['name'],$airline_info[0]['icao']);
	55	+ $title = sprintf(_("Detailed View for %s (%s)"), $airline_info[0]['name'], $airline_info[0]['icao']);
56	56	} elseif (isset($spotter_array[0]['airline_name']) && isset($spotter_array[0]['airline_icao'])) {
57		- $title = sprintf(_("Detailed View for %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
	57	+ $title = sprintf(_("Detailed View for %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
58	58	} else $title = '';
59	59	}
60	60	require_once('header.php');
		@@ -66,10 +66,10 @@ discard block
		block discarded – undo
66	66	$alliances = $Spotter->getAllAllianceNames();
67	67	if (!empty($alliances)) {
68	68	foreach ($alliances as $al) {
69		- if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
70		- print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
	69	+ if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
	70	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
71	71	} else {
72		- print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
	72	+ print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
73	73	}
74	74	}
75	75	print '<option disabled>───────────────</option>';
		@@ -77,9 +77,9 @@ discard block
		block discarded – undo
77	77	$Stats = new Stats();
78	78	$airline_names = $Stats->getAllAirlineNames();
79	79	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
80		- foreach($airline_names as $airline_name)
	80	+ foreach ($airline_names as $airline_name)
81	81	{
82		- if($airline == $airline_name['airline_icao'])
	82	+ if ($airline == $airline_name['airline_icao'])
83	83	{
84	84	print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
85	85	} else {
		@@ -137,12 +137,12 @@ discard block
		block discarded – undo
137	137	}
138	138	} else {
139	139	print '<div class="info column">';
140		- print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
141		- if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
	140	+ print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
	141	+ if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') \|\| @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
142	142	{
143		- print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
	143	+ print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
144	144	}
145		- print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
	145	+ print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
146	146	print '</div>';
147	147	}
148	148	} else {
		@@ -153,7 +153,7 @@ discard block
		block discarded – undo
153	153	include('airline-sub-menu.php');
154	154	print '<div class="table column">';
155	155	if (isset($spotter_array[0]['airline_name']) && $alliance === false) {
156		- print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
	156	+ print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
157	157	}
158	158	include('table-output.php');
159	159	print '<div class="pagination">';

		@@ -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 = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
20	20	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
		@@ -55,7 +55,9 @@ discard block
		block discarded – undo
55	55	$title = sprintf(_("Detailed View for %s (%s)"),$airline_info[0]['name'],$airline_info[0]['icao']);
56	56	} elseif (isset($spotter_array[0]['airline_name']) && isset($spotter_array[0]['airline_icao'])) {
57	57	$title = sprintf(_("Detailed View for %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
58		- } else $title = '';
	58	+ } else {
	59	+ $title = '';
	60	+ }
59	61	}
60	62	require_once('header.php');
61	63
		@@ -76,7 +78,9 @@ discard block
		block discarded – undo
76	78	}
77	79	$Stats = new Stats();
78	80	$airline_names = $Stats->getAllAirlineNames();
79		- if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
	81	+ if (empty($airline_names)) {
	82	+ $airline_names = $Spotter->getAllAirlineNames();
	83	+ }
80	84	foreach($airline_names as $airline_name)
81	85	{
82	86	if($airline == $airline_name['airline_icao'])
		@@ -108,12 +112,22 @@ discard block
		block discarded – undo
108	112	print '<div><span class="label">'._("Name").'</span>'.$airline_info[0]['name'].'</div>';
109	113	print '<div><span class="label">'._("Country").'</span>'.$airline_info[0]['country'].'</div>';
110	114	print '<div><span class="label">'._("ICAO").'</span>'.$airline_info[0]['icao'].'</div>';
111		- if ($airline_info[0]['iata'] != '') print '<div><span class="label">'._("IATA").'</span>'.$airline_info[0]['iata'].'</div>';
112		- if ($airline_info[0]['callsign'] != '') print '<div><span class="label">'._("Callsign").'</span>'.$airline_info[0]['callsign'].'</div>';
	115	+ if ($airline_info[0]['iata'] != '') {
	116	+ print '<div><span class="label">'._("IATA").'</span>'.$airline_info[0]['iata'].'</div>';
	117	+ }
	118	+ if ($airline_info[0]['callsign'] != '') {
	119	+ print '<div><span class="label">'._("Callsign").'</span>'.$airline_info[0]['callsign'].'</div>';
	120	+ }
113	121	print '<div><span class="label">'._("Type").'</span>'.ucwords($airline_info[0]['type']).'</div>';
114		- if (isset($airline_info[0]['home_link']) && $airline_info[0]['home_link'] != '') print '<div><a href="'.$airline_info[0]['home_link'].'"><i class="fa fa-home"></i></a></div>';
115		- if (isset($airline_info[0]['wikipedia_link']) && $airline_info[0]['wikipedia_link'] != '') print '<div><a href="'.$airline_info[0]['wikipedia_link'].'"><i class="fa fa-wikipedia-w"></i></a></div>';
116		- if ($airline_info[0]['ban_eu'] == 1) print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
	122	+ if (isset($airline_info[0]['home_link']) && $airline_info[0]['home_link'] != '') {
	123	+ print '<div><a href="'.$airline_info[0]['home_link'].'"><i class="fa fa-home"></i></a></div>';
	124	+ }
	125	+ if (isset($airline_info[0]['wikipedia_link']) && $airline_info[0]['wikipedia_link'] != '') {
	126	+ print '<div><a href="'.$airline_info[0]['wikipedia_link'].'"><i class="fa fa-wikipedia-w"></i></a></div>';
	127	+ }
	128	+ if ($airline_info[0]['ban_eu'] == 1) {
	129	+ print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
	130	+ }
117	131	print '</div>';
118	132
119	133	} else {
		@@ -129,10 +143,16 @@ discard block
		block discarded – undo
129	143	print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['airline_name'].'</div>';
130	144	print '<div><span class="label">'._("Country").'</span>'.$spotter_array[0]['airline_country'].'</div>';
131	145	print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['airline_icao'].'</div>';
132		- if (isset($spotter_array[0]['airline_iata']) && $spotter_array[0]['airline_iata'] != '') print '<div><span class="label">'._("IATA").'</span>'.$spotter_array[0]['airline_iata'].'</div>';
133		- if (isset($spotter_array[0]['airline_callsign']) && $spotter_array[0]['airline_callsign'] != '') print '<div><span class="label">'._("Callsign").'</span>'.$spotter_array[0]['airline_callsign'].'</div>';
	146	+ if (isset($spotter_array[0]['airline_iata']) && $spotter_array[0]['airline_iata'] != '') {
	147	+ print '<div><span class="label">'._("IATA").'</span>'.$spotter_array[0]['airline_iata'].'</div>';
	148	+ }
	149	+ if (isset($spotter_array[0]['airline_callsign']) && $spotter_array[0]['airline_callsign'] != '') {
	150	+ print '<div><span class="label">'._("Callsign").'</span>'.$spotter_array[0]['airline_callsign'].'</div>';
	151	+ }
134	152	print '<div><span class="label">'._("Type").'</span>'.ucwords($spotter_array[0]['airline_type']).'</div>';
135		- if (isset($spotter_array[0]['ban_eu']) && $spotter_array[0]['ban_eu'] == 1) print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
	153	+ if (isset($spotter_array[0]['ban_eu']) && $spotter_array[0]['ban_eu'] == 1) {
	154	+ print '<div><img src="'.$globalURL.'/images/baneu.png" alt="'._("This airline is banned in Europe").'" title="'._("This airline is banned in Europe").'" /></div>';
	155	+ }
136	156	print '</div>';
137	157	}
138	158	} else {

Ysurac / FlightAirMap

Push — master ( a47ea2...eac4f3 )

Status

Category

Braces +13 added lines, -5 removed lines patch added patch discarded remove patch

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

Braces +31 added lines, -11 removed lines patch added patch discarded remove patch