Inspection of "Disable archive in demo mode" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 8d4415...1bf6ad )

by Yannick

created 2017-10-31 08:40 UTC

Status

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

@@ -7,8 +7,8 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING))));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
@@ -18,16 +18,16 @@  discard block
 block discarded – undo
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Country from %s"),$country);
+	$title = sprintf(_("Most Common Departure Airports by Country from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByCountry($country);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));

Please login to merge, or discard this patch.

country-statistics-route.php 2 patches

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

@@ -7,8 +7,8 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING))));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
@@ -18,16 +18,16 @@  discard block
 block discarded – undo
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes from %s"),$country);
+	$title = sprintf(_("Most Common Routes from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 	$route_array = $Spotter->countAllRoutesByCountry($country);
 	if (!empty($route_array))
 	{
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));

Please login to merge, or discard this patch.

country-statistics-arrival-airport-country.php 2 patches

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@  discard block
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
-        print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
 
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByCountry($country);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';

Please login to merge, or discard this patch.

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

@@ -7,8 +7,8 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING))));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
@@ -18,16 +18,16 @@  discard block
 block discarded – undo
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports by Country from %s"),$country);
+	$title = sprintf(_("Most Common Arrival Airports by Country from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
-        print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+        print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByCountry($country);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],';
 	}
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

registration.php 1 patch

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

@@ -5,7 +5,7 @@
 block discarded – undo
 
 if ($_POST['registration'] != "")
 {
-	$registration = filter_input(INPUT_POST,'registration',FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_POST, 'registration', FILTER_SANITIZE_STRING);
 	header('Location: '.$globalURL.'/registration/'.$registration);
 } else {
 	if ($globalURL == '') {

Please login to merge, or discard this patch.

redirect.php 1 patch

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

@@ -5,7 +5,7 @@
 block discarded – undo
 $Spotter = new Spotter();
 if ($_GET['flightaware_id'] != "")
 {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	$spotter_id = $Spotter->getSpotterIDBasedOnFlightAwareID($flightaware_id);
 	if ($spotter_id != "")
 	{

Please login to merge, or discard this patch.

country.php 1 patch

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

@@ -4,7 +4,7 @@
 block discarded – undo
 
 if (isset($_POST['country']) && $_POST['country'] != "")
 {
-	$country = filter_input(INPUT_POST,'country',FILTER_SANITIZE_STRING);
+	$country = filter_input(INPUT_POST, 'country', FILTER_SANITIZE_STRING);
 	header('Location: '.$globalURL.'/country/'.$country);
 } else {
 	if ($globalURL == '') {

Please login to merge, or discard this patch.

route.php 1 patch

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

@@ -5,8 +5,8 @@
 block discarded – undo
 
 if (isset($_POST['departure_airport']) && $_POST['departure_airport'] != '')
 {
-	$departure_airport = filter_input(INPUT_POST,'departure_airport',FILTER_SANITIZE_STRING);
-	$arrival_airport = filter_input(INPUT_POST,'arrival_airport',FILTER_SANITIZE_STRING);
+	$departure_airport = filter_input(INPUT_POST, 'departure_airport', FILTER_SANITIZE_STRING);
+	$arrival_airport = filter_input(INPUT_POST, 'arrival_airport', FILTER_SANITIZE_STRING);
 	header('Location: '.$globalURL.'/route/'.$departure_airport.'/'.$arrival_airport);
 } else {
 	if ($globalURL == '') {

Please login to merge, or discard this patch.

country-detailed.php 2 patches

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

@@ -3,17 +3,17 @@  discard block
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 
-if (!isset($_GET['country'])){
+if (!isset($_GET['country'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Spotter = new Spotter();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		if (isset($limit_explode[1])) {
 			$limit_start = $limit_explode[0];
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
+	$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING))));
 	
 	$page_url = $globalURL.'/country/'.$_GET['country'];
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($country == 'Na') {
 		$spotter_array = array();
 	} else {
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for Airports &amp; Airlines from %s"),$country);
+		$title = sprintf(_("Detailed View for Airports &amp; Airlines from %s"), $country);
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
 		print '<select name="country" class="selectpicker" data-live-search="true">';
 		print '<option></option>';
 		$all_countries = $Spotter->getAllCountries();
-		foreach($all_countries as $all_country)
+		foreach ($all_countries as $all_country)
 		{
-			if($country == $all_country['country'])
+			if ($country == $all_country['country'])
 			{
 				print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 			} else {
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
 		if ($_GET['country'] != "NA")
 		{
 			print '<div class="info column">';
-			print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+			print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 			print '</div>';
 		} else {
 			print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
 
 		include('country-sub-menu.php');
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure &amp; arrival) OR airlines from <strong>%s</strong>."),$country).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure &amp; arrival) OR airlines from <strong>%s</strong>."), $country).'</p>';
 
 		include('table-output.php');
 		print '<div class="pagination">';

Please login to merge, or discard this patch.

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -13,7 +13,7 @@
 block discarded – undo
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		if (isset($limit_explode[1])) {
 			$limit_start = $limit_explode[0];

Please login to merge, or discard this patch.

search-kml.php 2 patches

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

@@ -5,14 +5,14 @@  discard block
 block discarded – undo
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
 	//for the date manipulation into the query
-	if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+	if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
 		$start_date = $_GET['start_date'].":00";
 		$end_date = $_GET['end_date'].":00";
 		$sql_date = $start_date.",".$end_date;
-	} else if($_GET['start_date'] != ""){
+	} else if ($_GET['start_date'] != "") {
 		$start_date = $_GET['start_date'].":00";
 		$sql_date = $start_date;
-	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+	} else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
 	} else $sql_date = '';
@@ -20,38 +20,38 @@  discard block
 block discarded – undo
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
-	if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $start_altitude.",".$end_altitude;
-	} else if($_GET['highest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	} else if ($_GET['highest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $end_altitude;
-	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
+	} else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
 	} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	if (!isset($_GET['number_results'])) {
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
 	} else {
-		if ($_GET['number_results'] > 1000){
+		if ($_GET['number_results'] > 1000) {
 			$_GET['number_results'] = 1000;
 		}
 		$limit_start = 0;
-		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
-		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+		$limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
+		$absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	}
-}  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);
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -68,23 +68,23 @@  discard block
 block discarded – undo
 
 if (isset($_GET['sort'])) $sort = $_GET['sort'];
 else $sort = '';
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'');
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
 
 $output = '<?xml version="1.0" encoding="UTF-8"?>';
 $output .= '<kml xmlns="http://www.opengis.net/kml/2.2">';
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
 $output .= '</Style>';
 
 if (!empty($spotter_array)) {
-	foreach($spotter_array as $spotter_item) {
+	foreach ($spotter_array as $spotter_item) {
 		$altitude = $spotter_item['altitude'].'00';
 		if ($spotter_item['waypoints'] != '') {
 			//waypoint plotting
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
 			$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
 			$waypoint_pieces = array_chunk($waypoint_pieces, 2);
 			foreach ($waypoint_pieces as $waypoint_coordinate) {
-				if (isset($waypoint_coordinate[1])) $output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+				if (isset($waypoint_coordinate[1])) $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
 			}
 			$output .= '</coordinates>';
 			$output .= '<altitudeMode>absolute</altitudeMode>';
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
 		$output .= ' ]]></description>';
 		$output .= '<styleUrl>#departureAirport</styleUrl>';
 		$output .= '<Point>';
-		$output .=  '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
+		$output .= '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
 		$output .= '<altitudeMode>absolute</altitudeMode>';
 		$output .= '</Point>';
 		$output .= '</Placemark>'; 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
 		$output .= ' ]]></description>';
 		$output .= '<styleUrl>#arrivalAirport</styleUrl>';
 		$output .= '<Point>';
-		$output .=  '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
+		$output .= '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
 		$output .= '<altitudeMode>absolute</altitudeMode>';
 		$output .= '</Point>';
 		$output .= '</Placemark>'; 
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
 		$output .= ' ]]></description>';
 		$output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>';
 		$output .= '<Point>';
-		$output .=  '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
+		$output .= '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
 		$output .= '<altitudeMode>absolute</altitudeMode>';
 		$output .= '</Point>';
 		$output .= '</Placemark>'; 

Please login to merge, or discard this patch.

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

@@ -15,8 +15,12 @@  discard block
 block discarded – undo
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
 		$sql_date = $end_date;
-	} else $sql_date = '';
-} else $sql_date = '';
+	} else {
+		$sql_date = '';
+	}
+	} else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
@@ -30,8 +34,12 @@  discard block
 block discarded – undo
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
-	} else $sql_altitude = '';
-} else $sql_altitude = '';
+	} else {
+		$sql_altitude = '';
+	}
+	} else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -48,7 +56,7 @@  discard block
 block discarded – undo
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
 	}
-}  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);
@@ -66,8 +74,11 @@  discard block
 block discarded – undo
 
 header('Content-Type: text/xml');
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
@@ -123,7 +134,9 @@  discard block
 block discarded – undo
 			$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
 			$waypoint_pieces = array_chunk($waypoint_pieces, 2);
 			foreach ($waypoint_pieces as $waypoint_coordinate) {
-				if (isset($waypoint_coordinate[1])) $output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+				if (isset($waypoint_coordinate[1])) {
+					$output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+				}
 			}
 			$output .= '</coordinates>';
 			$output .= '<altitudeMode>absolute</altitudeMode>';

Please login to merge, or discard this patch.

		@@ -7,8 +7,8 @@ discard block
		block discarded – undo
7	7	die();
8	8	}
9	9	$Spotter = new Spotter();
10		-$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
11		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	10	+$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING))));
	11	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
12	12
13	13	if (isset($_GET['sort'])) {
14	14	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
		@@ -18,16 +18,16 @@ discard block
		block discarded – undo
18	18
19	19	if (!empty($spotter_array))
20	20	{
21		- $title = sprintf(_("Most Common Departure Airports by Country from %s"),$country);
	21	+ $title = sprintf(_("Most Common Departure Airports by Country from %s"), $country);
22	22	require_once('header.php');
23	23	print '<div class="select-item">';
24	24	print '<form action="'.$globalURL.'/country" method="post">';
25	25	print '<select name="country" class="selectpicker" data-live-search="true">';
26	26	print '<option></option>';
27	27	$all_countries = $Spotter->getAllCountries();
28		- foreach($all_countries as $all_country)
	28	+ foreach ($all_countries as $all_country)
29	29	{
30		- if($country == $all_country['country'])
	30	+ if ($country == $all_country['country'])
31	31	{
32	32	print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
33	33	} else {
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	if ($_GET['country'] != "NA")
43	43	{
44	44	print '<div class="info column">';
45		- print '<h1>'.sprintf(_("Airports & Airlines from %s"),$country).'</h1>';
	45	+ print '<h1>'.sprintf(_("Airports & Airlines from %s"), $country).'</h1>';
46	46	print '</div>';
47	47	} else {
48	48	print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	include('country-sub-menu.php');
52	52	print '<div class="column">';
53	53	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
54		- print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights of airports & airlines from <strong>%s</strong>."),$country).'</p>';
	54	+ print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights of airports & airlines from <strong>%s</strong>."), $country).'</p>';
55	55
56	56	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByCountry($country);
57	57	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
61	61	print 'var series = [';
62	62	$country_data = '';
63		- foreach($airport_country_array as $airport_item)
	63	+ foreach ($airport_country_array as $airport_item)
64	64	{
65	65	$country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
66	66	}
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	print '</thead>';
109	109	print '<tbody>';
110	110	$i = 1;
111		- foreach($airport_country_array as $airport_item)
	111	+ foreach ($airport_country_array as $airport_item)
112	112	{
113	113	print '<tr>';
114	114	print '<td><strong>'.$i.'</strong></td>';

		@@ -3,8 +3,8 @@
		block discarded – undo
3	3	require_once('require/class.Spotter.php');
4	4	require_once('require/class.Language.php');
5	5	if (!isset($_GET['country'])) {
6		- header('Location: '.$globalURL.'/country');
7		- die();
	6	+ header('Location: '.$globalURL.'/country');
	7	+ die();
8	8	}
9	9	$Spotter = new Spotter();
10	10	$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));

		@@ -3,8 +3,8 @@ discard block
		block discarded – undo
3	3	require_once('require/class.Spotter.php');
4	4	require_once('require/class.Language.php');
5	5	if (!isset($_GET['country'])) {
6		- header('Location: '.$globalURL.'/country');
7		- die();
	6	+ header('Location: '.$globalURL.'/country');
	7	+ die();
8	8	}
9	9	$Spotter = new Spotter();
10	10	$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	include('country-sub-menu.php');
52	52	print '<div class="column">';
53	53	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
54		- print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports & airlines from <strong>%s</strong>."),$country).'</p>';
	54	+ print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports & airlines from <strong>%s</strong>."),$country).'</p>';
55	55
56	56	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByCountry($country);
57	57	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';

		@@ -5,7 +5,7 @@
		block discarded – undo
5	5
6	6	if ($_POST['registration'] != "")
7	7	{
8		- $registration = filter_input(INPUT_POST,'registration',FILTER_SANITIZE_STRING);
	8	+ $registration = filter_input(INPUT_POST, 'registration', FILTER_SANITIZE_STRING);
9	9	header('Location: '.$globalURL.'/registration/'.$registration);
10	10	} else {
11	11	if ($globalURL == '') {

		@@ -4,7 +4,7 @@
		block discarded – undo
4	4
5	5	if (isset($_POST['country']) && $_POST['country'] != "")
6	6	{
7		- $country = filter_input(INPUT_POST,'country',FILTER_SANITIZE_STRING);
	7	+ $country = filter_input(INPUT_POST, 'country', FILTER_SANITIZE_STRING);
8	8	header('Location: '.$globalURL.'/country/'.$country);
9	9	} else {
10	10	if ($globalURL == '') {

		@@ -5,8 +5,8 @@
		block discarded – undo
5	5
6	6	if (isset($_POST['departure_airport']) && $_POST['departure_airport'] != '')
7	7	{
8		- $departure_airport = filter_input(INPUT_POST,'departure_airport',FILTER_SANITIZE_STRING);
9		- $arrival_airport = filter_input(INPUT_POST,'arrival_airport',FILTER_SANITIZE_STRING);
	8	+ $departure_airport = filter_input(INPUT_POST, 'departure_airport', FILTER_SANITIZE_STRING);
	9	+ $arrival_airport = filter_input(INPUT_POST, 'arrival_airport', FILTER_SANITIZE_STRING);
10	10	header('Location: '.$globalURL.'/route/'.$departure_airport.'/'.$arrival_airport);
11	11	} else {
12	12	if ($globalURL == '') {

		@@ -3,17 +3,17 @@ discard block
		block discarded – undo
3	3	require_once('require/class.Spotter.php');
4	4	require_once('require/class.Language.php');
5	5
6		-if (!isset($_GET['country'])){
	6	+if (!isset($_GET['country'])) {
7	7	header('Location: '.$globalURL.'');
8	8	} else {
9	9	$Spotter = new Spotter();
10	10	//calculuation for the pagination
11		- if(!isset($_GET['limit']))
	11	+ if (!isset($_GET['limit']))
12	12	{
13	13	$limit_start = 0;
14	14	$limit_end = 25;
15	15	$absolute_difference = 25;
16		- } else {
	16	+ } else {
17	17	$limit_explode = explode(",", $_GET['limit']);
18	18	if (isset($limit_explode[1])) {
19	19	$limit_start = $limit_explode[0];
		@@ -32,10 +32,10 @@ discard block
		block discarded – undo
32	32	$limit_previous_1 = $limit_start - $absolute_difference;
33	33	$limit_previous_2 = $limit_end - $absolute_difference;
34	34
35		- $country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))));
	35	+ $country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING))));
36	36
37	37	$page_url = $globalURL.'/country/'.$_GET['country'];
38		- $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	38	+ $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
39	39	if ($country == 'Na') {
40	40	$spotter_array = array();
41	41	} else {
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48
49	49	if (!empty($spotter_array))
50	50	{
51		- $title = sprintf(_("Detailed View for Airports & Airlines from %s"),$country);
	51	+ $title = sprintf(_("Detailed View for Airports & Airlines from %s"), $country);
52	52
53	53	require_once('header.php');
54	54	print '<div class="select-item">';
		@@ -56,9 +56,9 @@ discard block
		block discarded – undo
56	56	print '<select name="country" class="selectpicker" data-live-search="true">';
57	57	print '<option></option>';
58	58	$all_countries = $Spotter->getAllCountries();
59		- foreach($all_countries as $all_country)
	59	+ foreach ($all_countries as $all_country)
60	60	{
61		- if($country == $all_country['country'])
	61	+ if ($country == $all_country['country'])
62	62	{
63	63	print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
64	64	} else {
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	if ($_GET['country'] != "NA")
74	74	{
75	75	print '<div class="info column">';
76		- print '<h1>'.sprintf(_("Airports & Airlines from %s"),$country).'</h1>';
	76	+ print '<h1>'.sprintf(_("Airports & Airlines from %s"), $country).'</h1>';
77	77	print '</div>';
78	78	} else {
79	79	print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
		@@ -81,7 +81,7 @@ discard block
		block discarded – undo
81	81
82	82	include('country-sub-menu.php');
83	83	print '<div class="table column">';
84		- print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure & arrival) OR airlines from <strong>%s</strong>."),$country).'</p>';
	84	+ print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure & arrival) OR airlines from <strong>%s</strong>."), $country).'</p>';
85	85
86	86	include('table-output.php');
87	87	print '<div class="pagination">';

		@@ -13,7 +13,7 @@
		block discarded – undo
13	13	$limit_start = 0;
14	14	$limit_end = 25;
15	15	$absolute_difference = 25;
16		- } else {
	16	+ } else {
17	17	$limit_explode = explode(",", $_GET['limit']);
18	18	if (isset($limit_explode[1])) {
19	19	$limit_start = $limit_explode[0];

		@@ -5,14 +5,14 @@ discard block
		block discarded – undo
5	5	$Spotter = new Spotter();
6	6	if (isset($_GET['start_date'])) {
7	7	//for the date manipulation into the query
8		- if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
	8	+ if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
9	9	$start_date = $_GET['start_date'].":00";
10	10	$end_date = $_GET['end_date'].":00";
11	11	$sql_date = $start_date.",".$end_date;
12		- } else if($_GET['start_date'] != ""){
	12	+ } else if ($_GET['start_date'] != "") {
13	13	$start_date = $_GET['start_date'].":00";
14	14	$sql_date = $start_date;
15		- } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
	15	+ } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
16	16	$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17	17	$sql_date = $end_date;
18	18	} else $sql_date = '';
		@@ -20,38 +20,38 @@ discard block
		block discarded – undo
20	20
21	21	if (isset($_GET['highest_altitude'])) {
22	22	//for altitude manipulation
23		- if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
24		- $end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
25		- $start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT);
	23	+ if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
	24	+ $end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
	25	+ $start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT);
26	26	$sql_altitude = $start_altitude.",".$end_altitude;
27		- } else if($_GET['highest_altitude'] != ""){
28		- $end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
	27	+ } else if ($_GET['highest_altitude'] != "") {
	28	+ $end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
29	29	$sql_altitude = $end_altitude;
30		- } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31		- $start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
	30	+ } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
	31	+ $start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000";
32	32	$sql_altitude = $start_altitude;
33	33	} else $sql_altitude = '';
34	34	} else $sql_altitude = '';
35	35
36	36	//calculuation for the pagination
37		-if(!isset($_GET['limit']))
	37	+if (!isset($_GET['limit']))
38	38	{
39	39	if (!isset($_GET['number_results'])) {
40	40	$limit_start = 0;
41	41	$limit_end = 25;
42	42	$absolute_difference = 25;
43	43	} else {
44		- if ($_GET['number_results'] > 1000){
	44	+ if ($_GET['number_results'] > 1000) {
45	45	$_GET['number_results'] = 1000;
46	46	}
47	47	$limit_start = 0;
48		- $limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
49		- $absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
	48	+ $limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
	49	+ $absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
50	50	}
51		-} else {
	51	+} else {
52	52	$limit_explode = explode(",", $_GET['limit']);
53		- $limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
54		- $limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
	53	+ $limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
	54	+ $limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
55	55	}
56	56
57	57	$absolute_difference = abs($limit_start - $limit_end);
		@@ -68,23 +68,23 @@ discard block
		block discarded – undo
68	68
69	69	if (isset($_GET['sort'])) $sort = $_GET['sort'];
70	70	else $sort = '';
71		-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
72		-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
73		-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
74		-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
75		-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
76		-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
77		-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
78		-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
79		-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
80		-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
81		-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
82		-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
83		-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
84		-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
85		-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
86		-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
87		-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'');
	71	+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
	72	+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
	73	+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
	74	+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
	75	+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
	76	+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
	77	+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
	78	+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
	79	+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
	80	+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
	81	+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
	82	+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
	83	+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
	84	+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
	85	+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
	86	+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
	87	+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
88	88
89	89	$output = '<?xml version="1.0" encoding="UTF-8"?>';
90	90	$output .= '<kml xmlns="http://www.opengis.net/kml/2.2">';
		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	$output .= '</Style>';
113	113
114	114	if (!empty($spotter_array)) {
115		- foreach($spotter_array as $spotter_item) {
	115	+ foreach ($spotter_array as $spotter_item) {
116	116	$altitude = $spotter_item['altitude'].'00';
117	117	if ($spotter_item['waypoints'] != '') {
118	118	//waypoint plotting
		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123	$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
124	124	$waypoint_pieces = array_chunk($waypoint_pieces, 2);
125	125	foreach ($waypoint_pieces as $waypoint_coordinate) {
126		- if (isset($waypoint_coordinate[1])) $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
	126	+ if (isset($waypoint_coordinate[1])) $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
127	127	}
128	128	$output .= '</coordinates>';
129	129	$output .= '<altitudeMode>absolute</altitudeMode>';
		@@ -167,7 +167,7 @@ discard block
		block discarded – undo
167	167	$output .= ' ]]></description>';
168	168	$output .= '<styleUrl>#departureAirport</styleUrl>';
169	169	$output .= '<Point>';
170		- $output .= '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
	170	+ $output .= '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
171	171	$output .= '<altitudeMode>absolute</altitudeMode>';
172	172	$output .= '</Point>';
173	173	$output .= '</Placemark>';
		@@ -208,7 +208,7 @@ discard block
		block discarded – undo
208	208	$output .= ' ]]></description>';
209	209	$output .= '<styleUrl>#arrivalAirport</styleUrl>';
210	210	$output .= '<Point>';
211		- $output .= '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
	211	+ $output .= '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
212	212	$output .= '<altitudeMode>absolute</altitudeMode>';
213	213	$output .= '</Point>';
214	214	$output .= '</Placemark>';
		@@ -252,7 +252,7 @@ discard block
		block discarded – undo
252	252	$output .= ' ]]></description>';
253	253	$output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>';
254	254	$output .= '<Point>';
255		- $output .= '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
	255	+ $output .= '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
256	256	$output .= '<altitudeMode>absolute</altitudeMode>';
257	257	$output .= '</Point>';
258	258	$output .= '</Placemark>';

		@@ -15,8 +15,12 @@ discard block
		block discarded – undo
15	15	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16	16	$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17	17	$sql_date = $end_date;
18		- } else $sql_date = '';
19		-} else $sql_date = '';
	18	+ } else {
	19	+ $sql_date = '';
	20	+ }
	21	+ } else {
	22	+ $sql_date = '';
	23	+}
20	24
21	25	if (isset($_GET['highest_altitude'])) {
22	26	//for altitude manipulation
		@@ -30,8 +34,12 @@ discard block
		block discarded – undo
30	34	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31	35	$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
32	36	$sql_altitude = $start_altitude;
33		- } else $sql_altitude = '';
34		-} else $sql_altitude = '';
	37	+ } else {
	38	+ $sql_altitude = '';
	39	+ }
	40	+ } else {
	41	+ $sql_altitude = '';
	42	+}
35	43
36	44	//calculuation for the pagination
37	45	if(!isset($_GET['limit']))
		@@ -48,7 +56,7 @@ discard block
		block discarded – undo
48	56	$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
49	57	$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
50	58	}
51		-} else {
	59	+} else {
52	60	$limit_explode = explode(",", $_GET['limit']);
53	61	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
54	62	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
		@@ -66,8 +74,11 @@ discard block
		block discarded – undo
66	74
67	75	header('Content-Type: text/xml');
68	76
69		-if (isset($_GET['sort'])) $sort = $_GET['sort'];
70		-else $sort = '';
	77	+if (isset($_GET['sort'])) {
	78	+ $sort = $_GET['sort'];
	79	+} else {
	80	+ $sort = '';
	81	+}
71	82	$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
72	83	$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
73	84	$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
		@@ -123,7 +134,9 @@ discard block
		block discarded – undo
123	134	$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
124	135	$waypoint_pieces = array_chunk($waypoint_pieces, 2);
125	136	foreach ($waypoint_pieces as $waypoint_coordinate) {
126		- if (isset($waypoint_coordinate[1])) $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
	137	+ if (isset($waypoint_coordinate[1])) {
	138	+ $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
	139	+ }
127	140	}
128	141	$output .= '</coordinates>';
129	142	$output .= '<altitudeMode>absolute</altitudeMode>';

Ysurac / FlightAirMap

Push — master ( 8d4415...1bf6ad )

Status

Category

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

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

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

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

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

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

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

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

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

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

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