Inspection of "Add weather refresh again, working now" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 7b4140...27888e )

by Yannick

created 2017-05-30 07:54 UTC

Status

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("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", 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 Time of Day from %s"),$country);
+	$title = sprintf(_("Most Common Time of Day 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 Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 	$hour_array = $Spotter->countAllHoursByCountry($country);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
 	print '<div id="chartHour" class="chart" width="100%"></div>
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
             	$hour_data = '';
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
 	}

Please login to merge, or discard this patch.

country-statistics-departure-airport.php 1 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("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", 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 from %s"),$country);
+	$title = sprintf(_("Most Common Departure Airports 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 {
@@ -41,7 +41,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>';
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 
 	$airport_airport_array = $Spotter->countAllDepartureAirportsByCountry($country);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
         	["'._("Airport").'", "'._("# of times").'"],';
 
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

tv.php 1 patch

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

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 <?php
 if (isset($_GET['q']))
 {
-	$spotter_array = $Spotter->searchSpotterData($_GET['q'],"","","","","","","","","","","","","","","","","","0,10","","");
+	$spotter_array = $Spotter->searchSpotterData($_GET['q'], "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "0,10", "", "");
 } else {
 	$spotter_array = $Spotter->getLatestSpotterData("0,10", "");
 }
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 print '<div class="table-responsive">';
 print '<table id="table-tv">';
 print '<tbody>';
-foreach($spotter_array as $spotter_item)
+foreach ($spotter_array as $spotter_item)
 {
 	if (isset($globalTimezone)) {
 		date_default_timezone_set($globalTimezone);

Please login to merge, or discard this patch.

country-statistics-manufacturer.php 1 patch

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("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", 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);
 } else {
@@ -17,16 +17,16 @@  discard block
 block discarded – undo
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft Manufacturer from %s"),$country);
+	$title = sprintf(_("Most Common Aircraft Manufacturer 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 {
@@ -41,7 +41,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>';
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of airlines or departure/arrival airports from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of airlines or departure/arrival airports from <strong>%s</strong>."), $country).'</p>';
 	$manufacturers_array = $Spotter->countAllAircraftManufacturerByCountry($country);
 	if (!empty($manufacturers_array))
 	{
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($manufacturers_array as $manufacturer_item)
+		foreach ($manufacturers_array as $manufacturer_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

acars-latest.php 1 patch

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

@@ -8,7 +8,7 @@
 block discarded – undo
 
 $page_url = $globalURL.'/acars-latest';
 
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;

Please login to merge, or discard this patch.

search-csv.php 1 patch

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

@@ -6,14 +6,14 @@  discard block
 block discarded – undo
 
 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 = '';
@@ -21,21 +21,21 @@  discard block
 block discarded – undo
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",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']))
         {
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
                 $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 = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -70,30 +70,30 @@  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);
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$owner = filter_input(INPUT_GET,'owner',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);
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$owner = filter_input(INPUT_GET, 'owner', 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 = "id,ident,registration,aircraft_icao,aircraft_name,aircraft_manufacturer,airline,airline_icao,airline_iata,airline_country,airline_callsign,airline_type,departure_airport_city,departure_airport_country,departure_airport_iata,departure_airport_icao,departure_airport_latitude,departure_airport_longitude,departure_airport_altitude,arrival_airport_city,arrival_airport_country,arrival_airport_iata,arrival_airport_icao,arrival_airport_latitude,arrival_airport_longitude,arrival_airport_altitude,latitude,longitude,altitude,ground_speed,heading,heading_name,waypoints,date\n";
 
 if (!empty($spotter_array))
 {
-  foreach($spotter_array as $spotter_item)
+  foreach ($spotter_array as $spotter_item)
   {
        	
     $output .= $spotter_item['spotter_id'].',';

Please login to merge, or discard this patch.

search-kml.php 1 patch

Spacing +31 added lines, -31 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,21 +20,21 @@  discard block
 block discarded – undo
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",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']))
         {
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
                 $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 = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -69,23 +69,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"?>';
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
             
     if (!empty($spotter_array))
 	  {	  
-	    foreach($spotter_array as $spotter_item)
+	    foreach ($spotter_array as $spotter_item)
 	    {
 				
 				
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
 							    
 							foreach ($waypoint_pieces as $waypoint_coordinate)
 							{
-							        $output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+							        $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
 							
 							}
 						$output .= '</coordinates>';
@@ -178,7 +178,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>'; 
@@ -220,7 +220,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>'; 
@@ -267,7 +267,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.

search-rss.php 1 patch

Spacing +27 added lines, -27 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,21 +20,21 @@  discard block
 block discarded – undo
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",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']))
         {
@@ -42,14 +42,14 @@  discard block
 block discarded – undo
                 $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 = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -72,23 +72,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, '');
  
 print '<?xml version="1.0" encoding="UTF-8" ?>';
 print '<rss xmlns:flightairmap="http://'.$_SERVER['HTTP_HOST'].''.htmlentities($_SERVER['REQUEST_URI']).'" version="2.0">';
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
   
   if (!empty($spotter_array))
   {
-    foreach($spotter_array as $spotter_item)
+    foreach ($spotter_array as $spotter_item)
     {
 
           

Please login to merge, or discard this patch.

country-statistics-route.php 1 patch

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("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", 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.

		@@ -7,8 +7,8 @@ discard block
		block discarded – undo
7	7	die();
8	8	}
9	9	$Spotter = new Spotter();
10		-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
11		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	10	+$country = ucwords(str_replace("-", " ", 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 Time of Day from %s"),$country);
	21	+ $title = sprintf(_("Most Common Time of Day 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 Time of Day").'</h2>';
54		- print '<p>'.sprintf(_("The statistic below shows the most common time of day of airports & airlines from <strong>%s</strong>."),$country).'</p>';
	54	+ print '<p>'.sprintf(_("The statistic below shows the most common time of day of airports & airlines from <strong>%s</strong>."), $country).'</p>';
55	55	$hour_array = $Spotter->countAllHoursByCountry($country);
56	56	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
57	57	print '<div id="chartHour" class="chart" width="100%"></div>
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	var data = google.visualization.arrayToDataTable([
63	63	["'._("Hour").'", "'._("# of Flights").'"], ';
64	64	$hour_data = '';
65		- foreach($hour_array as $hour_item)
	65	+ foreach ($hour_array as $hour_item)
66	66	{
67	67	$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
68	68	}

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	<?php
30	30	if (isset($_GET['q']))
31	31	{
32		- $spotter_array = $Spotter->searchSpotterData($_GET['q'],"","","","","","","","","","","","","","","","","","0,10","","");
	32	+ $spotter_array = $Spotter->searchSpotterData($_GET['q'], "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "0,10", "", "");
33	33	} else {
34	34	$spotter_array = $Spotter->getLatestSpotterData("0,10", "");
35	35	}
		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	print '<div class="table-responsive">';
38	38	print '<table id="table-tv">';
39	39	print '<tbody>';
40		-foreach($spotter_array as $spotter_item)
	40	+foreach ($spotter_array as $spotter_item)
41	41	{
42	42	if (isset($globalTimezone)) {
43	43	date_default_timezone_set($globalTimezone);

		@@ -8,7 +8,7 @@
		block discarded – undo
8	8
9	9	$page_url = $globalURL.'/acars-latest';
10	10
11		-if(!isset($_GET['limit']))
	11	+if (!isset($_GET['limit']))
12	12	{
13	13	$limit_start = 0;
14	14	$limit_end = 25;

		@@ -6,14 +6,14 @@ discard block
		block discarded – undo
6	6
7	7	if (isset($_GET['start_date'])) {
8	8	//for the date manipulation into the query
9		- if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
	9	+ if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
10	10	$start_date = $_GET['start_date'].":00";
11	11	$end_date = $_GET['end_date'].":00";
12	12	$sql_date = $start_date.",".$end_date;
13		- } else if($_GET['start_date'] != ""){
	13	+ } else if ($_GET['start_date'] != "") {
14	14	$start_date = $_GET['start_date'].":00";
15	15	$sql_date = $start_date;
16		- } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
	16	+ } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
17	17	$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
18	18	$sql_date = $end_date;
19	19	} else $sql_date = '';
		@@ -21,21 +21,21 @@ discard block
		block discarded – undo
21	21
22	22	if (isset($_GET['highest_altitude'])) {
23	23	//for altitude manipulation
24		- if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
	24	+ if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
25	25	$end_altitude = $_GET['highest_altitude'];
26	26	$start_altitude = $_GET['lowest_altitude'];
27	27	$sql_altitude = $start_altitude.",".$end_altitude;
28		- } else if($_GET['highest_altitude'] != ""){
	28	+ } else if ($_GET['highest_altitude'] != "") {
29	29	$end_altitude = $_GET['highest_altitude'];
30	30	$sql_altitude = $end_altitude;
31		- } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
	31	+ } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
32	32	$start_altitude = $_GET['lowest_altitude'].",60000";
33	33	$sql_altitude = $start_altitude;
34	34	} else $sql_altitude = '';
35	35	} else $sql_altitude = '';
36	36
37	37	//calculuation for the pagination
38		-if(!isset($_GET['limit']))
	38	+if (!isset($_GET['limit']))
39	39	{
40	40	if (!isset($_GET['number_results']))
41	41	{
		@@ -43,14 +43,14 @@ discard block
		block discarded – undo
43	43	$limit_end = 25;
44	44	$absolute_difference = 25;
45	45	} else {
46		- if ($_GET['number_results'] > 1000){
	46	+ if ($_GET['number_results'] > 1000) {
47	47	$_GET['number_results'] = 1000;
48	48	}
49	49	$limit_start = 0;
50	50	$limit_end = $_GET['number_results'];
51	51	$absolute_difference = $_GET['number_results'];
52	52	}
53		-} else {
	53	+} else {
54	54	$limit_explode = explode(",", $_GET['limit']);
55	55	$limit_start = $limit_explode[0];
56	56	$limit_end = $limit_explode[1];
		@@ -70,30 +70,30 @@ discard block
		block discarded – undo
70	70	if (isset($_GET['sort'])) $sort = $_GET['sort'];
71	71	else $sort = '';
72	72
73		-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
74		-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
75		-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
76		-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
77		-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
78		-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
79		-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
80		-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
81		-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
82		-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
83		-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
84		-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
85		-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
86		-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
87		-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
88		-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
89		-$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,'');
	73	+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
	74	+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
	75	+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
	76	+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
	77	+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
	78	+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
	79	+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
	80	+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
	81	+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
	82	+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
	83	+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
	84	+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
	85	+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
	86	+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
	87	+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
	88	+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
	89	+$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, '');
90	90
91	91
92	92	$output = "id,ident,registration,aircraft_icao,aircraft_name,aircraft_manufacturer,airline,airline_icao,airline_iata,airline_country,airline_callsign,airline_type,departure_airport_city,departure_airport_country,departure_airport_iata,departure_airport_icao,departure_airport_latitude,departure_airport_longitude,departure_airport_altitude,arrival_airport_city,arrival_airport_country,arrival_airport_iata,arrival_airport_icao,arrival_airport_latitude,arrival_airport_longitude,arrival_airport_altitude,latitude,longitude,altitude,ground_speed,heading,heading_name,waypoints,date\n";
93	93
94	94	if (!empty($spotter_array))
95	95	{
96		- foreach($spotter_array as $spotter_item)
	96	+ foreach ($spotter_array as $spotter_item)
97	97	{
98	98
99	99	$output .= $spotter_item['spotter_id'].',';

		@@ -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,21 +20,21 @@ 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'] != ""){
	23	+ if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
24	24	$end_altitude = $_GET['highest_altitude'];
25	25	$start_altitude = $_GET['lowest_altitude'];
26	26	$sql_altitude = $start_altitude.",".$end_altitude;
27		- } else if($_GET['highest_altitude'] != ""){
	27	+ } else if ($_GET['highest_altitude'] != "") {
28	28	$end_altitude = $_GET['highest_altitude'];
29	29	$sql_altitude = $end_altitude;
30		- } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
	30	+ } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
31	31	$start_altitude = $_GET['lowest_altitude'].",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	{
		@@ -42,14 +42,14 @@ discard block
		block discarded – undo
42	42	$limit_end = 25;
43	43	$absolute_difference = 25;
44	44	} else {
45		- if ($_GET['number_results'] > 1000){
	45	+ if ($_GET['number_results'] > 1000) {
46	46	$_GET['number_results'] = 1000;
47	47	}
48	48	$limit_start = 0;
49	49	$limit_end = $_GET['number_results'];
50	50	$absolute_difference = $_GET['number_results'];
51	51	}
52		-} else {
	52	+} else {
53	53	$limit_explode = explode(",", $_GET['limit']);
54	54	$limit_start = $limit_explode[0];
55	55	$limit_end = $limit_explode[1];
		@@ -69,23 +69,23 @@ discard block
		block discarded – undo
69	69
70	70	if (isset($_GET['sort'])) $sort = $_GET['sort'];
71	71	else $sort = '';
72		-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
73		-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
74		-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
75		-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
76		-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
77		-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
78		-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
79		-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
80		-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
81		-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
82		-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
83		-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
84		-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
85		-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
86		-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
87		-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
88		-$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,'');
	72	+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
	73	+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
	74	+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
	75	+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
	76	+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
	77	+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
	78	+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
	79	+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
	80	+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
	81	+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
	82	+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
	83	+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
	84	+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
	85	+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
	86	+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
	87	+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
	88	+$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, '');
89	89
90	90
91	91	$output = '<?xml version="1.0" encoding="UTF-8"?>';
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115
116	116	if (!empty($spotter_array))
117	117	{
118		- foreach($spotter_array as $spotter_item)
	118	+ foreach ($spotter_array as $spotter_item)
119	119	{
120	120
121	121
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132
133	133	foreach ($waypoint_pieces as $waypoint_coordinate)
134	134	{
135		- $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
	135	+ $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
136	136
137	137	}
138	138	$output .= '</coordinates>';
		@@ -178,7 +178,7 @@ discard block
		block discarded – undo
178	178	$output .= ' ]]></description>';
179	179	$output .= '<styleUrl>#departureAirport</styleUrl>';
180	180	$output .= '<Point>';
181		- $output .= '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
	181	+ $output .= '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
182	182	$output .= '<altitudeMode>absolute</altitudeMode>';
183	183	$output .= '</Point>';
184	184	$output .= '</Placemark>';
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220	$output .= ' ]]></description>';
221	221	$output .= '<styleUrl>#arrivalAirport</styleUrl>';
222	222	$output .= '<Point>';
223		- $output .= '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
	223	+ $output .= '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
224	224	$output .= '<altitudeMode>absolute</altitudeMode>';
225	225	$output .= '</Point>';
226	226	$output .= '</Placemark>';
		@@ -267,7 +267,7 @@ discard block
		block discarded – undo
267	267	$output .= ' ]]></description>';
268	268	$output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>';
269	269	$output .= '<Point>';
270		- $output .= '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
	270	+ $output .= '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
271	271	$output .= '<altitudeMode>absolute</altitudeMode>';
272	272	$output .= '</Point>';
273	273	$output .= '</Placemark>';

Ysurac / FlightAirMap

Push — master ( 7b4140...27888e )

Status

Category

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

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

Spacing +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

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

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

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

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

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