Inspection of "Fix menu for acars" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 73f088...7f17b6 )

by Yannick

created 2016-08-04 14:18 UTC

Status

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

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
             	["'._("Date").'", "'._("# of Flights").'"], ';
 
 $date_data = '';
-foreach($date_array as $date_item)
+foreach ($date_array as $date_item)
 {
 	$date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
 }
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
       </script>';
 }
 if (isset($globalDBArchiveMonths) && $globalDBArchiveMonths > 0) {
-	print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."),$globalDBArchiveMonths).'</p>';
+	print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."), $globalDBArchiveMonths).'</p>';
 } else {
 	print '<p>'._("Below are the <strong>Top 10</strong> most busiest dates.").'</p>';
 }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

date-statistics-registration.php 1 patch

Spacing +6 added lines, -6 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');
 $Spotter = new Spotter();
-$sort = filter_input(FILTER_GET,'sort',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
+$sort = filter_input(FILTER_GET, 'sort', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'], "0,1", $sort);
 
 if (!empty($spotter_array))
 {
@@ -20,13 +20,13 @@  discard block
 block discarded – undo
 	print '</div>';
 
 	print '<div class="info column">';
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 	print '</div>';
 
 	include('date-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByDate($_GET['date']);
 	if (!empty($aircraft_array))
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
 				if (isset($aircraft_item['aircraft_type'])) {
 					print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_type'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:").' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
 				} else {
-					print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:");' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
+					print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:"); ' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
 				}
 				print '</td>';
 			} else {

Please login to merge, or discard this patch.

ident-statistics-departure-airport-country.php 2 patches

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

@@ -7,13 +7,13 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByIdent($ident,"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByIdent($ident, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Country of %s"),$spotter_array[0]['ident']);
+	$title = sprintf(_("Most Common Departure Airports by Country of %s"), $spotter_array[0]['ident']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['ident'].'</h1>';
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
 	include('ident-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 with the ident/callsign <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights with the ident/callsign <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
 
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByIdent($ident);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['departure_airport_country'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -69,7 +69,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['ident'])) {
-        header('Location: '.$globalURL.'/ident');
-        die();
+		header('Location: '.$globalURL.'/ident');
+		die();
 }
 $Spotter = new Spotter();
 $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);

Please login to merge, or discard this patch.

index.php 3 patches

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

@@ -22,11 +22,11 @@  discard block
 block discarded – undo
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
 <?php
-    if (isset($globalArchive) && $globalArchive == TRUE && (isset($globalBeta) && $globalBeta == TRUE)) {
+	if (isset($globalArchive) && $globalArchive == TRUE && (isset($globalBeta) && $globalBeta == TRUE)) {
 ?>
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
 <?php
-    }
+	}
 ?>
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
@@ -46,15 +46,15 @@  discard block
 block discarded – undo
 		<ul><li><a class="button waypoints" onclick="showWaypoints(); return false;"><?php echo _("Waypoints"); ?></a></li></ul>
 		<ul><li><a class="button airspace" onclick="showAirspace(); return false;"><?php echo _("Airspace"); ?></a></li></ul>
 <?php
-    if (isset($globalNOTAM) && $globalNOTAM) {
+	if (isset($globalNOTAM) && $globalNOTAM) {
 ?>
 		<ul><li><a class="button notam" onclick="showNotam(); return false;"><?php echo _("NOTAM"); ?></a></li></ul>
 <?php
-    }
+	}
 ?>
         </div>
 <?php
-    if (isset($globalArchive) && $globalArchive == TRUE) {
+	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
         <div class="sidebar-pane" id="archive">
 	    <h1><?php echo _("Playback"); ?> <i>Bêta</i></h1>
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
         <div class="sidebar-pane" id="settings">
 	    <h1><?php echo _("Settings"); ?></h1>
@@ -121,40 +121,40 @@  discard block
 block discarded – undo
 			    <?php
 				if (!isset($_COOKIE['MapType'])) $MapType = $globalMapProvider;
 				else $MapType = $_COOKIE['MapType'];
-			    ?>
+				?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
-			    ?>
+				?>
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
 				if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
-			    ?>
+				?>
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
 				if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
-			    ?>
+				?>
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
 				if (isset($globalMapboxToken) && $globalMapboxToken != '') {
-				    if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
-				    else $MapBoxId = $_COOKIE['MapTypeId'];
-			    ?>
+					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
+					else $MapBoxId = $_COOKIE['MapTypeId'];
+				?>
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -169,16 +169,16 @@  discard block
 block discarded – undo
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
 				if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
-			    ?>
+				?>
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
 			</select>
@@ -189,26 +189,26 @@  discard block
 block discarded – undo
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 		    <?php
 			if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
-		    ?>
+			?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			}
-		    ?>
+			?>
 
 		    <?php
-		        if (extension_loaded('gd') && function_exists('gd_info')) {
-		    ?>
+				if (extension_loaded('gd') && function_exists('gd_info')) {
+			?>
 		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 			if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
-		    ?>
+			?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
 			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
 			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
@@ -217,16 +217,16 @@  discard block
 block discarded – undo
 		    </li>
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
 			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
 			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
 			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
 			<?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines:"); ?>
 			<select class="selectpicker" multiple onchange="airlines(this);">
 			    <?php
@@ -249,12 +249,12 @@  discard block
 block discarded – undo
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			if (isset($globalAPRS) && $globalAPRS) {
-		    ?>
+			?>
 		    <li><?php echo _("Display APRS sources name:"); ?>
 			<select class="selectpicker" multiple onchange="sources(this);">
 			    <?php
@@ -266,15 +266,15 @@  discard block
 block discarded – undo
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines of type:"); ?>
 			<select class="selectpicker" onchange="airlinestype(this);">
 			    <option value="all"<?php if (!isset($_COOKIE['airlinestype']) || $_COOKIE['airlinestype'] == 'all' || $_COOKIE['airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
 			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>

Please login to merge, or discard this patch.

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

@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 		        <div class="form-group">
 			    <label>From (UTC):</label>
 		            <div class='input-group date' id='datetimepicker1'>
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_COOKIE['archive_begin'])) print date("d/m/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_COOKIE['archive_begin'])) print date("d/m/Y h:i a", $_COOKIE['archive_begin']); ?>" required />
 		                <span class="input-group-addon">
             			    <span class="glyphicon glyphicon-calendar"></span>
 		                </span>
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 		        <div class="form-group">
 			    <label>To (UTC):</label>
 		            <div class='input-group date' id='datetimepicker2'>
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_COOKIE['archive_end'])) print date("d/m/Y h:i a",$_COOKIE['archive_end']); ?>" />
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_COOKIE['archive_end'])) print date("d/m/Y h:i a", $_COOKIE['archive_end']); ?>" />
             			<span class="input-group-addon">
 		                    <span class="glyphicon glyphicon-calendar"></span>
             			</span>
@@ -240,10 +240,10 @@  discard block
 block discarded – undo
 			<select class="selectpicker" multiple onchange="airlines(this);">
 			    <?php
 				$Spotter = new Spotter();
-				foreach($Spotter->getAllAirlineNames() as $airline) {
+				foreach ($Spotter->getAllAirlineNames() as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
-					if (isset($_COOKIE['Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['Airlines']))) {
+					if (strlen($airline_name) > 30) $airline_name = substr($airline_name, 0, 30).'...';
+					if (isset($_COOKIE['Airlines']) && in_array($airline['airline_icao'], explode(',', $_COOKIE['Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
@@ -259,8 +259,8 @@  discard block
 block discarded – undo
 			<select class="selectpicker" multiple onchange="sources(this);">
 			    <?php
 				$Spotter = new Spotter();
-				foreach($Spotter->getAllSourceName('aprs') as $source) {
-					if (isset($_COOKIE['Sources']) && in_array($source['source_name'],explode(',',$_COOKIE['Sources']))) {
+				foreach ($Spotter->getAllSourceName('aprs') as $source) {
+					if (isset($_COOKIE['Sources']) && in_array($source['source_name'], explode(',', $_COOKIE['Sources']))) {
 						echo '<option value="'.$source['source_name'].'" selected>'.$source['source_name'].'</option>';
 					} else {
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';

Please login to merge, or discard this patch.

Braces +257 added lines, -62 removed lines patch added patch discarded remove patch

@@ -65,7 +65,10 @@  discard block
 block discarded – undo
 		        <div class="form-group">
 			    <label>From (UTC):</label>
 		            <div class='input-group date' id='datetimepicker1'>
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_COOKIE['archive_begin'])) print date("d/m/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_COOKIE['archive_begin'])) {
+	print date("d/m/Y h:i a",$_COOKIE['archive_begin']);
+}
+?>" required />
 		                <span class="input-group-addon">
             			    <span class="glyphicon glyphicon-calendar"></span>
 		                </span>
@@ -74,7 +77,10 @@  discard block
 block discarded – undo
 		        <div class="form-group">
 			    <label>To (UTC):</label>
 		            <div class='input-group date' id='datetimepicker2'>
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_COOKIE['archive_end'])) print date("d/m/Y h:i a",$_COOKIE['archive_end']); ?>" />
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_COOKIE['archive_end'])) {
+	print date("d/m/Y h:i a",$_COOKIE['archive_end']);
+}
+?>" />
             			<span class="input-group-addon">
 		                    <span class="glyphicon glyphicon-calendar"></span>
             			</span>
@@ -97,8 +103,18 @@  discard block
 block discarded – undo
 
 		    <li><?php echo _("Playback speed:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>">
-			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output>
+			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?>">
+			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?></output>
 			</div>
 		    </li>
 
@@ -119,78 +135,180 @@  discard block
 block discarded – undo
 		    <li><?php echo _("Type of Map:"); ?>
 			<select  class="selectpicker" onchange="mapType(this);">
 			    <?php
-				if (!isset($_COOKIE['MapType'])) $MapType = $globalMapProvider;
-				else $MapType = $_COOKIE['MapType'];
+				if (!isset($_COOKIE['MapType'])) {
+					$MapType = $globalMapProvider;
+				} else {
+					$MapType = $_COOKIE['MapType'];
+				}
 			    ?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
 			    ?>
-			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
-			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
-			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
+			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') {
+	print ' selected';
+}
+?>>Bing-Aerial</option>
+			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') {
+	print ' selected';
+}
+?>>Bing-Hybrid</option>
+			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') {
+	print ' selected';
+}
+?>>Bing-Road</option>
 			    <?php
 				}
 			    ?>
 			    <?php
 				if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
 			    ?>
-			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
-			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
-			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
+			    <option value="Here-Aerial"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Aerial</option>
+			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Hybrid</option>
+			    <option value="Here-Road"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Road</option>
 			    <?php
 				}
 			    ?>
 			    <?php
 				if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
 			    ?>
-			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
-			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
-			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
-			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
+			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') {
+	print ' selected';
+}
+?>>Google Roadmap</option>
+			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') {
+	print ' selected';
+}
+?>>Google Satellite</option>
+			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') {
+	print ' selected';
+}
+?>>Google Hybrid</option>
+			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') {
+	print ' selected';
+}
+?>>Google Terrain</option>
 			    <?php
 				}
 			    ?>
 			    <?php
 				if (isset($globalMapboxToken) && $globalMapboxToken != '') {
-				    if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
-				    else $MapBoxId = $_COOKIE['MapTypeId'];
+				    if (!isset($_COOKIE['MapTypeId'])) {
+				    	$MapBoxId = 'default';
+				    } else {
+				    	$MapBoxId = $_COOKIE['MapTypeId'];
+				    }
 			    ?>
-			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
-			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
-			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
-			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option>
-			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option>
-			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option>
-			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option>
-			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option>
-			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option>
-			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option>
-			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
-			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
+			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') {
+	print ' selected';
+}
+?>>Mapbox default</option>
+			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') {
+	print ' selected';
+}
+?>>Mapbox streets</option>
+			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') {
+	print ' selected';
+}
+?>>Mapbox light</option>
+			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') {
+	print ' selected';
+}
+?>>Mapbox dark</option>
+			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') {
+	print ' selected';
+}
+?>>Mapbox satellite</option>
+			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') {
+	print ' selected';
+}
+?>>Mapbox streets-satellite</option>
+			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') {
+	print ' selected';
+}
+?>>Mapbox streets-basic</option>
+			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') {
+	print ' selected';
+}
+?>>Mapbox comic</option>
+			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') {
+	print ' selected';
+}
+?>>Mapbox outdoors</option>
+			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') {
+	print ' selected';
+}
+?>>Mapbox pencil</option>
+			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') {
+	print ' selected';
+}
+?>>Mapbox pirates</option>
+			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') {
+	print ' selected';
+}
+?>>Mapbox emerald</option>
 			    <?php
 				}
 			    ?>
 			    <?php
 				if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
 			    ?>
-			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
-			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
-			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
+			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') {
+	print ' selected';
+}
+?>>MapQuest-OSM</option>
+			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') {
+	print ' selected';
+}
+?>>MapQuest-Aerial</option>
+			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') {
+	print ' selected';
+}
+?>>MapQuest-Hybrid</option>
 			    <?php
 				}
 			    ?>
-			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
-			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
+			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') {
+	print ' selected';
+}
+?>>OpenStreetMap</option>
+			    <option value="Yandex"<?php if ($MapType == 'Yandex') {
+	print ' selected';
+}
+?>>Yandex</option>
 			</select>
 		    </li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') || !isset($_COOKIE['flightpopup'])) print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || !isset($_COOKIE['flightpath'])) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') || !isset($_COOKIE['flightpopup'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || !isset($_COOKIE['flightpath'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight path"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight route on click"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
+	print 'checked';
+}
+?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 		    <?php
 			if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			}
 		    ?>
@@ -198,12 +316,22 @@  discard block
 block discarded – undo
 		    <?php
 		        if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
-		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
+		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 			if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
 		    ?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 			    }
@@ -211,16 +339,39 @@  discard block
 block discarded – undo
 		    ?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
-			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output>
+			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?>">
+			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?></output>
 			</div>
 		    </li>
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
 		    ?>
-			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
-			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
-			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
+			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
+			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
+			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
 		    ?>
@@ -228,10 +379,16 @@  discard block
 block discarded – undo
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
 		    ?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
 			<?php if (isset($globalAPRS) && $globalAPRS) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display APRS data"); ?></label></div></li>
 			<?php } ?>
 		    <?php
 			}
@@ -242,7 +399,9 @@  discard block
 block discarded – undo
 				$Spotter = new Spotter();
 				foreach($Spotter->getAllAirlineNames() as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
+					if (strlen($airline_name) > 30) {
+						$airline_name = substr($airline_name,0,30).'...';
+					}
 					if (isset($_COOKIE['Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
@@ -277,10 +436,22 @@  discard block
 block discarded – undo
 		    ?>
 		    <li><?php echo _("Display airlines of type:"); ?>
 			<select class="selectpicker" onchange="airlinestype(this);">
-			    <option value="all"<?php if (!isset($_COOKIE['airlinestype']) || $_COOKIE['airlinestype'] == 'all' || $_COOKIE['airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
-			    <option value="passenger"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option>
-			    <option value="cargo"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option>
-			    <option value="military"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['airlinestype']) || $_COOKIE['airlinestype'] == 'all' || $_COOKIE['airlinestype'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
+			    <option value="passenger"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'passenger') {
+	echo ' selected';
+}
+?>><?php echo _("Passenger"); ?></option>
+			    <option value="cargo"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'cargo') {
+	echo ' selected';
+}
+?>><?php echo _("Cargo"); ?></option>
+			    <option value="military"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'military') {
+	echo ' selected';
+}
+?>><?php echo _("Military"); ?></option>
 			</select>
 		    </li>
 		    <?php
@@ -288,22 +459,46 @@  discard block
 block discarded – undo
 		    ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
-			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>
-			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option>
-			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option>
+			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+	echo ' selected';
+}
+?>>km</option>
+			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+	echo ' selected';
+}
+?>>nm</option>
+			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+	echo ' selected';
+}
+?>>mi</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Altitude unit:"); ?>
 			<select class="selectpicker" onchange="unitaltitude(this);">
-			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option>
-			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option>
+			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) {
+	echo ' selected';
+}
+?>>m</option>
+			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
+	echo ' selected';
+}
+?>>feet</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Speed unit:"); ?>
 			<select class="selectpicker" onchange="unitspeed(this);">
-			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option>
-			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option>
-			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option>
+			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) {
+	echo ' selected';
+}
+?>>km/h</option>
+			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
+	echo ' selected';
+}
+?>>mph</option>
+			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) {
+	echo ' selected';
+}
+?>>knots</option>
 		        </select>
 		    </li>
 		</ul>

Please login to merge, or discard this patch.

country-statistics-arrival-airport.php 2 patches

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

@@ -7,14 +7,14 @@  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);
 $spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports from %s"),$country);
+	$title = sprintf(_("Most Common Arrival Airports from %s"), $country);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -22,9 +22,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 {
@@ -39,7 +39,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>';
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 	$airport_airport_array = $Spotter->countAllArrivalAirportsByCountry($country);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
@@ -63,7 +63,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_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -101,7 +101,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.

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("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));

Please login to merge, or discard this patch.

archive-country.php 2 patches

Spacing +9 added lines, -9 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');
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$country = filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING);
-$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$country = filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
 
 $Spotter = new Spotter();
-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
+if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort);
 else $spotter_array = array();
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines by Country on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Airlines by Country on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/date" method="post">';
@@ -24,13 +24,13 @@  discard block
 block discarded – undo
 	print '</div>';
 
 	print '<div class="info column">';
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 	print '</div>';
 
 	include('date-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Airlines by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$airline_array = $Spotter->countAllAirlineCountriesByDate($date);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
 	$country_data = '';
-	foreach($airline_array as $airline_item)
+	foreach ($airline_array as $airline_item)
 	{
 		$country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],';
 	}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airline_array as $airline_item)
+		foreach ($airline_array as $airline_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

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

@@ -8,8 +8,11 @@
 block discarded – undo
 $date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
 
 $Spotter = new Spotter();
-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
-else $spotter_array = array();
+if (isset($_GET['date'])) {
+	$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
+} else {
+	$spotter_array = array();
+}
 
 if (!empty($spotter_array))
 {

Please login to merge, or discard this patch.

registration-statistics-departure-airport.php 2 patches

Spacing +6 added lines, -6 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');
 $Spotter = new Spotter();
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['sort'])) $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 else $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1");
 $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports of aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Departure Airports of aircraft with registration %s"), $registration);
 	require_once('header.php');
 
 	print '<div class="info column">';
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
 
-	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights with aircraft registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights with aircraft registration <strong>%s</strong>."), $registration).'</p>';
 	$airport_airport_array = $Spotter->countAllDepartureAirportsByRegistration($registration);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
         var data = google.visualization.arrayToDataTable([ 
         	["'._("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);
@@ -78,7 +78,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.

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

@@ -5,8 +5,11 @@
 block discarded – undo
 $Spotter = new Spotter();
 $registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-if (isset($_GET['sort'])) $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
-else $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1");
+if (isset($_GET['sort'])) {
+	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
+} else {
+	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1");
+}
 $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
 
 

Please login to merge, or discard this patch.

statistics-route-waypoint.php 1 patch

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

@@ -27,7 +27,7 @@
 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.

search-geojson.php 3 patches

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

@@ -4,55 +4,55 @@  discard block
 block discarded – undo
 require_once('require/class.Language.php');
 $Spotter=new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        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'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_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 = '';
+		//for the date manipulation into the query
+		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'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_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 = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        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'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		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'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_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['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -90,69 +90,69 @@  discard block
 block discarded – undo
       
 $output = '{';
 	$output .= '"type": "FeatureCollection",';
-    $output .= '"features": [';
+	$output .= '"features": [';
             
     
-    if (!empty($spotter_array))
+	if (!empty($spotter_array))
 	  {	  
-	    foreach($spotter_array as $spotter_item)
-	    {
+		foreach($spotter_array as $spotter_item)
+		{
 				
 				
 				//waypoint plotting
 				$output .= '{';  
 					$output .= '"type": "Feature",';
-	      		$output .= '"properties": {';
-	          	    $output .= '"id": "'.$spotter_item['spotter_id'].'",';
-                    $output .= '"ident": "'.$spotter_item['ident'].'",';
-                    $output .= '"registration": "'.$spotter_item['registration'].'",';
-                    $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
-                    $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
-                    $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
-                    $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
-                    $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
-                    $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
-                    $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
-                    $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
-                    $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
-                    $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
-                    $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
-                    $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
-                    $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
-                    $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
-                    $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
-                    $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
-                    $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
-                    $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
-                    $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
-                    $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
-                    $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
-                    $output .= '"latitude": "'.$spotter_item['latitude'].'",';
-                    $output .= '"longitude": "'.$spotter_item['longitude'].'",';
-                    $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-                    $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
-                    $output .= '"heading": "'.$spotter_item['heading'].'",';
-                    $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
-                    $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
-	          $output .= '}';
-	          if ($spotter_item['waypoints'] != '') {
-	          $output .= ',"geometry": {';
-	          	$output .= '"type": "LineString",';
-	            	$output .= '"coordinates": [';
-		            	$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
+		  		$output .= '"properties": {';
+			  		$output .= '"id": "'.$spotter_item['spotter_id'].'",';
+					$output .= '"ident": "'.$spotter_item['ident'].'",';
+					$output .= '"registration": "'.$spotter_item['registration'].'",';
+					$output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
+					$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
+					$output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
+					$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
+					$output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
+					$output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
+					$output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
+					$output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
+					$output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
+					$output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
+					$output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
+					$output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
+					$output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
+					$output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
+					$output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
+					$output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
+					$output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
+					$output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
+					$output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
+					$output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
+					$output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
+					$output .= '"latitude": "'.$spotter_item['latitude'].'",';
+					$output .= '"longitude": "'.$spotter_item['longitude'].'",';
+					$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+					$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
+					$output .= '"heading": "'.$spotter_item['heading'].'",';
+					$output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
+					$output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
+			  $output .= '}';
+			  if ($spotter_item['waypoints'] != '') {
+			  $output .= ',"geometry": {';
+			  	$output .= '"type": "LineString",';
+					$output .= '"coordinates": [';
+						$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
 									$waypoint_pieces = array_chunk($waypoint_pieces, 2);
 									    
 									foreach ($waypoint_pieces as $waypoint_coordinate)
 									{
 										$output .= '[';
-									        $output .=  $waypoint_coordinate[1].', ';	
-									        $output .=  $waypoint_coordinate[0];
+											$output .=  $waypoint_coordinate[1].', ';	
+											$output .=  $waypoint_coordinate[0];
 									  $output .= '],';
 									
 									}
-		            	$output = substr($output, 0, -1);
+						$output = substr($output, 0, -1);
 								$output .= ']';
 							$output .= '}';
 		}
@@ -161,50 +161,50 @@  discard block
 block discarded – undo
 				//location of aircraft
 				$output .= '{';  
 					$output .= '"type": "Feature",';
-	      		$output .= '"properties": {';
-	          	    $output .= '"id": "'.$spotter_item['spotter_id'].'",';
-                    $output .= '"ident": "'.$spotter_item['ident'].'",';
-                    $output .= '"registration": "'.$spotter_item['registration'].'",';
-                    $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
-                    $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
-                    $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
-                    $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
-                    $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
-                    $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
-                    $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
-                    $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
-                    $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
-                    $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
-                    $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
-                    $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
-                    $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
-                    $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
-                    $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
-                    $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
-                    $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
-                    $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
-                    $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
-                    $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
-                    $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
-                    $output .= '"latitude": "'.$spotter_item['latitude'].'",';
-                    $output .= '"longitude": "'.$spotter_item['longitude'].'",';
-                    $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-                    $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
-                    $output .= '"heading": "'.$spotter_item['heading'].'",';
-                    $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
-                    $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
-	          $output .= '},';
-	          $output .= '"geometry": {';
-	          	$output .= '"type": "Point",';
-	            	$output .= '"coordinates": [';
+		  		$output .= '"properties": {';
+			  		$output .= '"id": "'.$spotter_item['spotter_id'].'",';
+					$output .= '"ident": "'.$spotter_item['ident'].'",';
+					$output .= '"registration": "'.$spotter_item['registration'].'",';
+					$output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
+					$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
+					$output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
+					$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
+					$output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
+					$output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
+					$output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
+					$output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
+					$output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
+					$output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
+					$output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
+					$output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
+					$output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
+					$output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
+					$output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
+					$output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
+					$output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
+					$output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
+					$output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
+					$output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
+					$output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
+					$output .= '"latitude": "'.$spotter_item['latitude'].'",';
+					$output .= '"longitude": "'.$spotter_item['longitude'].'",';
+					$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+					$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
+					$output .= '"heading": "'.$spotter_item['heading'].'",';
+					$output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
+					$output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
+			  $output .= '},';
+			  $output .= '"geometry": {';
+			  	$output .= '"type": "Point",';
+					$output .= '"coordinates": [';
 										$output .=  $spotter_item['longitude'].', ';	
 									  $output .=  $spotter_item['latitude'];
 								$output .= ']';
 							$output .= '}';
 				$output .= '},';
-	    }
+		}
 	   }
 	   $output  = substr($output, 0, -1);
 	   

Please login to merge, or discard this patch.

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

@@ -2,17 +2,17 @@  discard block
 block discarded – undo
 require_once('require/class.Connection.php');
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
-$Spotter=new Spotter();
+$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 = '{';
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
     
     if (!empty($spotter_array))
 	  {	  
-	    foreach($spotter_array as $spotter_item)
+	    foreach ($spotter_array as $spotter_item)
 	    {
 				
 				
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
 									foreach ($waypoint_pieces as $waypoint_coordinate)
 									{
 										$output .= '[';
-									        $output .=  $waypoint_coordinate[1].', ';	
-									        $output .=  $waypoint_coordinate[0];
+									        $output .= $waypoint_coordinate[1].', ';	
+									        $output .= $waypoint_coordinate[0];
 									  $output .= '],';
 									
 									}
@@ -199,8 +199,8 @@  discard block
 block discarded – undo
 	          $output .= '"geometry": {';
 	          	$output .= '"type": "Point",';
 	            	$output .= '"coordinates": [';
-										$output .=  $spotter_item['longitude'].', ';	
-									  $output .=  $spotter_item['latitude'];
+										$output .= $spotter_item['longitude'].', ';	
+									  $output .= $spotter_item['latitude'];
 								$output .= ']';
 							$output .= '}';
 				$output .= '},';

Please login to merge, or discard this patch.

Braces +18 added lines, -7 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 = $_GET['lowest_altitude'].",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']))
@@ -49,7 +57,7 @@  discard block
 block discarded – undo
                 $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];
@@ -67,8 +75,11 @@  discard block
 block discarded – undo
 
 header("Content-type: text/yaml");
 
-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);

Please login to merge, or discard this patch.

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	["'._("Date").'", "'._("# of Flights").'"], ';
27	27
28	28	$date_data = '';
29		-foreach($date_array as $date_item)
	29	+foreach ($date_array as $date_item)
30	30	{
31	31	$date_data .= '[ "'.date("F j, Y", strtotime($date_item['date_name'])).'",'.$date_item['date_count'].'],';
32	32	}
		@@ -52,7 +52,7 @@ discard block
		block discarded – undo
52	52	</script>';
53	53	}
54	54	if (isset($globalDBArchiveMonths) && $globalDBArchiveMonths > 0) {
55		- print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."),$globalDBArchiveMonths).'</p>';
	55	+ print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."), $globalDBArchiveMonths).'</p>';
56	56	} else {
57	57	print '<p>'._("Below are the <strong>Top 10</strong> most busiest dates.").'</p>';
58	58	}
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	print '</thead>';
69	69	print '<tbody>';
70	70	$i = 1;
71		- foreach($date_array as $date_item)
	71	+ foreach ($date_array as $date_item)
72	72	{
73	73	print '<tr>';
74	74	print '<td><strong>'.$i.'</strong></td>';

		@@ -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	$Spotter = new Spotter();
6		-$sort = filter_input(FILTER_GET,'sort',FILTER_SANITIZE_STRING);
7		-$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
	6	+$sort = filter_input(FILTER_GET, 'sort', FILTER_SANITIZE_STRING);
	7	+$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'], "0,1", $sort);
8	8
9	9	if (!empty($spotter_array))
10	10	{
		@@ -20,13 +20,13 @@ discard block
		block discarded – undo
20	20	print '</div>';
21	21
22	22	print '<div class="info column">';
23		- print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
	23	+ print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
24	24	print '</div>';
25	25
26	26	include('date-sub-menu.php');
27	27	print '<div class="column">';
28	28	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
29		- print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
	29	+ print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
30	30
31	31	$aircraft_array = $Spotter->countAllAircraftRegistrationByDate($_GET['date']);
32	32	if (!empty($aircraft_array))
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	print '</thead>';
44	44	print '<tbody>';
45	45	$i = 1;
46		- foreach($aircraft_array as $aircraft_item)
	46	+ foreach ($aircraft_array as $aircraft_item)
47	47	{
48	48	print '<tr>';
49	49	print '<td><strong>'.$i.'</strong></td>';
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	if (isset($aircraft_item['aircraft_type'])) {
54	54	print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_type'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:").' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
55	55	} else {
56		- print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:");' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
	56	+ print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:"); ' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
57	57	}
58	58	print '</td>';
59	59	} else {

		@@ -7,13 +7,13 @@ discard block
		block discarded – undo
7	7	die();
8	8	}
9	9	$Spotter = new Spotter();
10		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
11		-$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
12		-$spotter_array = $Spotter->getSpotterDataByIdent($ident,"0,1", $sort);
	10	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
	11	+$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
	12	+$spotter_array = $Spotter->getSpotterDataByIdent($ident, "0,1", $sort);
13	13
14	14	if (!empty($spotter_array))
15	15	{
16		- $title = sprintf(_("Most Common Departure Airports by Country of %s"),$spotter_array[0]['ident']);
	16	+ $title = sprintf(_("Most Common Departure Airports by Country of %s"), $spotter_array[0]['ident']);
17	17	require_once('header.php');
18	18	print '<div class="info column">';
19	19	print '<h1>'.$spotter_array[0]['ident'].'</h1>';
		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23	include('ident-sub-menu.php');
24	24	print '<div class="column">';
25	25	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
26		- print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights with the ident/callsign <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
	26	+ print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights with the ident/callsign <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
27	27
28	28	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByIdent($ident);
29	29	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	var data = google.visualization.arrayToDataTable([
36	36	["'._("Country").'", "'._("# of times").'"], ';
37	37	$country_data = '';
38		- foreach($airport_country_array as $airport_item)
	38	+ foreach ($airport_country_array as $airport_item)
39	39	{
40	40	$country_data .= '[ "'.$airport_item['departure_airport_country'].'",'.$airport_item['airport_departure_country_count'].'],';
41	41	}
		@@ -69,7 +69,7 @@ discard block
		block discarded – undo
69	69	print '</thead>';
70	70	print '<tbody>';
71	71	$i = 1;
72		- foreach($airport_country_array as $airport_item)
	72	+ foreach ($airport_country_array as $airport_item)
73	73	{
74	74	print '<tr>';
75	75	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['ident'])) {
6		- header('Location: '.$globalURL.'/ident');
7		- die();
	6	+ header('Location: '.$globalURL.'/ident');
	7	+ die();
8	8	}
9	9	$Spotter = new Spotter();
10	10	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);

		@@ -22,11 +22,11 @@ discard block
		block discarded – undo
22	22	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
23	23	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
24	24	<?php
25		- if (isset($globalArchive) && $globalArchive == TRUE && (isset($globalBeta) && $globalBeta == TRUE)) {
	25	+ if (isset($globalArchive) && $globalArchive == TRUE && (isset($globalBeta) && $globalBeta == TRUE)) {
26	26	?>
27	27	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
28	28	<?php
29		- }
	29	+ }
30	30	?>
31	31	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
32	32	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
		@@ -46,15 +46,15 @@ discard block
		block discarded – undo
46	46	<ul><li><a class="button waypoints" onclick="showWaypoints(); return false;"><?php echo _("Waypoints"); ?></a></li></ul>
47	47	<ul><li><a class="button airspace" onclick="showAirspace(); return false;"><?php echo _("Airspace"); ?></a></li></ul>
48	48	<?php
49		- if (isset($globalNOTAM) && $globalNOTAM) {
	49	+ if (isset($globalNOTAM) && $globalNOTAM) {
50	50	?>
51	51	<ul><li><a class="button notam" onclick="showNotam(); return false;"><?php echo _("NOTAM"); ?></a></li></ul>
52	52	<?php
53		- }
	53	+ }
54	54	?>
55	55	</div>
56	56	<?php
57		- if (isset($globalArchive) && $globalArchive == TRUE) {
	57	+ if (isset($globalArchive) && $globalArchive == TRUE) {
58	58	?>
59	59	<div class="sidebar-pane" id="archive">
60	60	<h1><?php echo _("Playback"); ?> <i>Bêta</i></h1>
		@@ -110,7 +110,7 @@ discard block
		block discarded – undo
110	110	</form>
111	111	</div>
112	112	<?php
113		- }
	113	+ }
114	114	?>
115	115	<div class="sidebar-pane" id="settings">
116	116	<h1><?php echo _("Settings"); ?></h1>
		@@ -121,40 +121,40 @@ discard block
		block discarded – undo
121	121	<?php
122	122	if (!isset($_COOKIE['MapType'])) $MapType = $globalMapProvider;
123	123	else $MapType = $_COOKIE['MapType'];
124		- ?>
	124	+ ?>
125	125	<?php
126	126	if (isset($globalBingMapKey) && $globalBingMapKey != '') {
127		- ?>
	127	+ ?>
128	128	<option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
129	129	<option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
130	130	<option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
131	131	<?php
132	132	}
133		- ?>
	133	+ ?>
134	134	<?php
135	135	if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
136		- ?>
	136	+ ?>
137	137	<option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
138	138	<option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
139	139	<option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
140	140	<?php
141	141	}
142		- ?>
	142	+ ?>
143	143	<?php
144	144	if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
145		- ?>
	145	+ ?>
146	146	<option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
147	147	<option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
148	148	<option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
149	149	<option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
150	150	<?php
151	151	}
152		- ?>
	152	+ ?>
153	153	<?php
154	154	if (isset($globalMapboxToken) && $globalMapboxToken != '') {
155		- if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
156		- else $MapBoxId = $_COOKIE['MapTypeId'];
157		- ?>
	155	+ if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
	156	+ else $MapBoxId = $_COOKIE['MapTypeId'];
	157	+ ?>
158	158	<option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
159	159	<option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
160	160	<option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
		@@ -169,16 +169,16 @@ discard block
		block discarded – undo
169	169	<option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
170	170	<?php
171	171	}
172		- ?>
	172	+ ?>
173	173	<?php
174	174	if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
175		- ?>
	175	+ ?>
176	176	<option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
177	177	<option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
178	178	<option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
179	179	<?php
180	180	}
181		- ?>
	181	+ ?>
182	182	<option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
183	183	<option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
184	184	</select>
		@@ -189,26 +189,26 @@ discard block
		block discarded – undo
189	189	<li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') \|\| (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) \|\| (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
190	190	<?php
191	191	if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
192		- ?>
	192	+ ?>
193	193	<li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
194	194	<?php
195	195	}
196		- ?>
	196	+ ?>
197	197
198	198	<?php
199		- if (extension_loaded('gd') && function_exists('gd_info')) {
200		- ?>
	199	+ if (extension_loaded('gd') && function_exists('gd_info')) {
	200	+ ?>
201	201	<li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
202	202	<?php
203	203	if (!isset($_COOKIE['IconColorAltitude']) \|\| $_COOKIE['IconColorAltitude'] == 'false') {
204		- ?>
	204	+ ?>
205	205	<li><?php echo _("Aircraft icon color:"); ?>
206	206	<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
207	207	</li>
208	208	<?php
209		- }
210		- }
211		- ?>
	209	+ }
	210	+ }
	211	+ ?>
212	212	<li><?php echo _("Show airport icon at zoom level:"); ?>
213	213	<div class="range">
214	214	<input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
		@@ -217,16 +217,16 @@ discard block
		block discarded – undo
217	217	</li>
218	218	<?php
219	219	if (((isset($globalVATSIM) && $globalVATSIM) \|\| isset($globalIVAO) && $globalIVAO \|\| isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) \|\| $globalMapVAchoose)) {
220		- ?>
	220	+ ?>
221	221	<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') \|\| !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
222	222	<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') \|\| !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
223	223	<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') \|\| !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
224	224	<?php
225	225	}
226		- ?>
	226	+ ?>
227	227	<?php
228	228	if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) \|\| $globalMapchoose)) {
229		- ?>
	229	+ ?>
230	230	<?php if (isset($globalSBS1) && $globalSBS1) { ?>
231	231	<li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') \|\| !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
232	232	<?php } ?>
		@@ -235,7 +235,7 @@ discard block
		block discarded – undo
235	235	<?php } ?>
236	236	<?php
237	237	}
238		- ?>
	238	+ ?>
239	239	<li><?php echo _("Display airlines:"); ?>
240	240	<select class="selectpicker" multiple onchange="airlines(this);">
241	241	<?php
		@@ -249,12 +249,12 @@ discard block
		block discarded – undo
249	249	echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
250	250	}
251	251	}
252		- ?>
	252	+ ?>
253	253	</select>
254	254	</li>
255	255	<?php
256	256	if (isset($globalAPRS) && $globalAPRS) {
257		- ?>
	257	+ ?>
258	258	<li><?php echo _("Display APRS sources name:"); ?>
259	259	<select class="selectpicker" multiple onchange="sources(this);">
260	260	<?php
		@@ -266,15 +266,15 @@ discard block
		block discarded – undo
266	266	echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
267	267	}
268	268	}
269		- ?>
	269	+ ?>
270	270	</select>
271	271	</li>
272	272	<?php
273	273	}
274		- ?>
	274	+ ?>
275	275	<?php
276	276	if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
277		- ?>
	277	+ ?>
278	278	<li><?php echo _("Display airlines of type:"); ?>
279	279	<select class="selectpicker" onchange="airlinestype(this);">
280	280	<option value="all"<?php if (!isset($_COOKIE['airlinestype']) \|\| $_COOKIE['airlinestype'] == 'all' \|\| $_COOKIE['airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
		@@ -285,7 +285,7 @@ discard block
		block discarded – undo
285	285	</li>
286	286	<?php
287	287	}
288		- ?>
	288	+ ?>
289	289	<li><?php echo _("Distance unit:"); ?>
290	290	<select class="selectpicker" onchange="unitdistance(this);">
291	291	<option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) \|\| (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) \|\| (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>

		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	<div class="form-group">
66	66	<label>From (UTC):</label>
67	67	<div class='input-group date' id='datetimepicker1'>
68		- <input type='text' name="start_date" class="form-control" value="<?php if (isset($_COOKIE['archive_begin'])) print date("d/m/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
	68	+ <input type='text' name="start_date" class="form-control" value="<?php if (isset($_COOKIE['archive_begin'])) print date("d/m/Y h:i a", $_COOKIE['archive_begin']); ?>" required />
69	69	<span class="input-group-addon">
70	70	<span class="glyphicon glyphicon-calendar"></span>
71	71	</span>
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	<div class="form-group">
75	75	<label>To (UTC):</label>
76	76	<div class='input-group date' id='datetimepicker2'>
77		- <input type='text' name="end_date" class="form-control" value="<?php if (isset($_COOKIE['archive_end'])) print date("d/m/Y h:i a",$_COOKIE['archive_end']); ?>" />
	77	+ <input type='text' name="end_date" class="form-control" value="<?php if (isset($_COOKIE['archive_end'])) print date("d/m/Y h:i a", $_COOKIE['archive_end']); ?>" />
78	78	<span class="input-group-addon">
79	79	<span class="glyphicon glyphicon-calendar"></span>
80	80	</span>
		@@ -240,10 +240,10 @@ discard block
		block discarded – undo
240	240	<select class="selectpicker" multiple onchange="airlines(this);">
241	241	<?php
242	242	$Spotter = new Spotter();
243		- foreach($Spotter->getAllAirlineNames() as $airline) {
	243	+ foreach ($Spotter->getAllAirlineNames() as $airline) {
244	244	$airline_name = $airline['airline_name'];
245		- if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
246		- if (isset($_COOKIE['Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['Airlines']))) {
	245	+ if (strlen($airline_name) > 30) $airline_name = substr($airline_name, 0, 30).'...';
	246	+ if (isset($_COOKIE['Airlines']) && in_array($airline['airline_icao'], explode(',', $_COOKIE['Airlines']))) {
247	247	echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
248	248	} else {
249	249	echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
		@@ -259,8 +259,8 @@ discard block
		block discarded – undo
259	259	<select class="selectpicker" multiple onchange="sources(this);">
260	260	<?php
261	261	$Spotter = new Spotter();
262		- foreach($Spotter->getAllSourceName('aprs') as $source) {
263		- if (isset($_COOKIE['Sources']) && in_array($source['source_name'],explode(',',$_COOKIE['Sources']))) {
	262	+ foreach ($Spotter->getAllSourceName('aprs') as $source) {
	263	+ if (isset($_COOKIE['Sources']) && in_array($source['source_name'], explode(',', $_COOKIE['Sources']))) {
264	264	echo '<option value="'.$source['source_name'].'" selected>'.$source['source_name'].'</option>';
265	265	} else {
266	266	echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';

		@@ -7,14 +7,14 @@ 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	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
13	13
14	14
15	15	if (!empty($spotter_array))
16	16	{
17		- $title = sprintf(_("Most Common Arrival Airports from %s"),$country);
	17	+ $title = sprintf(_("Most Common Arrival Airports from %s"), $country);
18	18
19	19	require_once('header.php');
20	20	print '<div class="select-item">';
		@@ -22,9 +22,9 @@ discard block
		block discarded – undo
22	22	print '<select name="country" class="selectpicker" data-live-search="true">';
23	23	print '<option></option>';
24	24	$all_countries = $Spotter->getAllCountries();
25		- foreach($all_countries as $all_country)
	25	+ foreach ($all_countries as $all_country)
26	26	{
27		- if($country == $all_country['country'])
	27	+ if ($country == $all_country['country'])
28	28	{
29	29	print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
30	30	} else {
		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	if ($_GET['country'] != "NA")
40	40	{
41	41	print '<div class="info column">';
42		- print '<h1>'.sprintf(_("Airports & Airlines from %s"),$country).'</h1>';
	42	+ print '<h1>'.sprintf(_("Airports & Airlines from %s"), $country).'</h1>';
43	43	print '</div>';
44	44	} else {
45	45	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>';
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	include('country-sub-menu.php');
49	49	print '<div class="column">';
50	50	print '<h2>'._("Most Common Arrival Airports").'</h2>';
51		- print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights of airports & airlines from <strong>%s</strong>."),$country).'</p>';
	51	+ print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights of airports & airlines from <strong>%s</strong>."), $country).'</p>';
52	52	$airport_airport_array = $Spotter->countAllArrivalAirportsByCountry($country);
53	53	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
54	54	<script>
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	["'._("Airport").'", "'._("# of times").'"],';
64	64
65	65	$airport_data = '';
66		- foreach($airport_airport_array as $airport_item)
	66	+ foreach ($airport_airport_array as $airport_item)
67	67	{
68	68	$name = $airport_item['airport_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')';
69	69	$name = str_replace("'", "", $name);
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	print '</thead>';
102	102	print '<tbody>';
103	103	$i = 1;
104		- foreach($airport_airport_array as $airport_item)
	104	+ foreach ($airport_airport_array as $airport_item)
105	105	{
106	106	print '<tr>';
107	107	print '<td><strong>'.$i.'</strong></td>';

		@@ -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		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
7		-$country = filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING);
8		-$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
	6	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
	7	+$country = filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING);
	8	+$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
9	9
10	10	$Spotter = new Spotter();
11		-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
	11	+if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort);
12	12	else $spotter_array = array();
13	13
14	14	if (!empty($spotter_array))
15	15	{
16		- $title = sprintf(_("Most Common Airlines by Country on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
	16	+ $title = sprintf(_("Most Common Airlines by Country on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
17	17	require_once('header.php');
18	18	print '<div class="select-item">';
19	19	print '<form action="'.$globalURL.'/date" method="post">';
		@@ -24,13 +24,13 @@ discard block
		block discarded – undo
24	24	print '</div>';
25	25
26	26	print '<div class="info column">';
27		- print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
	27	+ print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
28	28	print '</div>';
29	29
30	30	include('date-sub-menu.php');
31	31	print '<div class="column">';
32	32	print '<h2>'._("Most Common Airlines by Country").'</h2>';
33		- print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
	33	+ print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
34	34
35	35	$airline_array = $Spotter->countAllAirlineCountriesByDate($date);
36	36	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	var data = google.visualization.arrayToDataTable([
43	43	["'._("Country").'", "'._("# of times").'"], ';
44	44	$country_data = '';
45		- foreach($airline_array as $airline_item)
	45	+ foreach ($airline_array as $airline_item)
46	46	{
47	47	$country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],';
48	48	}
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	print '</thead>';
77	77	print '<tbody>';
78	78	$i = 1;
79		- foreach($airline_array as $airline_item)
	79	+ foreach ($airline_array as $airline_item)
80	80	{
81	81	print '<tr>';
82	82	print '<td><strong>'.$i.'</strong></td>';

		@@ -8,8 +8,11 @@
		block discarded – undo
8	8	$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
9	9
10	10	$Spotter = new Spotter();
11		-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
12		-else $spotter_array = array();
	11	+if (isset($_GET['date'])) {
	12	+ $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
	13	+} else {
	14	+ $spotter_array = array();
	15	+}
13	16
14	17	if (!empty($spotter_array))
15	18	{

		@@ -5,8 +5,11 @@
		block discarded – undo
5	5	$Spotter = new Spotter();
6	6	$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
7	7	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
8		-if (isset($_GET['sort'])) $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
9		-else $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1");
	8	+if (isset($_GET['sort'])) {
	9	+ $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
	10	+} else {
	11	+ $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1");
	12	+}
10	13	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
11	14
12	15

		@@ -27,7 +27,7 @@
		block discarded – undo
27	27	print '</thead>';
28	28	print '<tbody>';
29	29	$i = 1;
30		- foreach($route_array as $route_item)
	30	+ foreach ($route_array as $route_item)
31	31	{
32	32	print '<tr>';
33	33	print '<td><strong>'.$i.'</strong></td>';

		@@ -4,55 +4,55 @@ discard block
		block discarded – undo
4	4	require_once('require/class.Language.php');
5	5	$Spotter=new Spotter();
6	6	if (isset($_GET['start_date'])) {
7		- //for the date manipulation into the query
8		- if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
9		- $start_date = $_GET['start_date'].":00";
10		- $end_date = $_GET['end_date'].":00";
11		- $sql_date = $start_date.",".$end_date;
12		- } else if($_GET['start_date'] != ""){
13		- $start_date = $_GET['start_date'].":00";
14		- $sql_date = $start_date;
15		- } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16		- $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17		- $sql_date = $end_date;
18		- } else $sql_date = '';
	7	+ //for the date manipulation into the query
	8	+ if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
	9	+ $start_date = $_GET['start_date'].":00";
	10	+ $end_date = $_GET['end_date'].":00";
	11	+ $sql_date = $start_date.",".$end_date;
	12	+ } else if($_GET['start_date'] != ""){
	13	+ $start_date = $_GET['start_date'].":00";
	14	+ $sql_date = $start_date;
	15	+ } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
	16	+ $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
	17	+ $sql_date = $end_date;
	18	+ } else $sql_date = '';
19	19	} else $sql_date = '';
20	20
21	21	if (isset($_GET['highest_altitude'])) {
22		- //for altitude manipulation
23		- if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
24		- $end_altitude = $_GET['highest_altitude'];
25		- $start_altitude = $_GET['lowest_altitude'];
26		- $sql_altitude = $start_altitude.",".$end_altitude;
27		- } else if($_GET['highest_altitude'] != ""){
28		- $end_altitude = $_GET['highest_altitude'];
29		- $sql_altitude = $end_altitude;
30		- } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31		- $start_altitude = $_GET['lowest_altitude'].",60000";
32		- $sql_altitude = $start_altitude;
33		- } else $sql_altitude = '';
	22	+ //for altitude manipulation
	23	+ if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
	24	+ $end_altitude = $_GET['highest_altitude'];
	25	+ $start_altitude = $_GET['lowest_altitude'];
	26	+ $sql_altitude = $start_altitude.",".$end_altitude;
	27	+ } else if($_GET['highest_altitude'] != ""){
	28	+ $end_altitude = $_GET['highest_altitude'];
	29	+ $sql_altitude = $end_altitude;
	30	+ } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
	31	+ $start_altitude = $_GET['lowest_altitude'].",60000";
	32	+ $sql_altitude = $start_altitude;
	33	+ } else $sql_altitude = '';
34	34	} else $sql_altitude = '';
35	35
36	36	//calculuation for the pagination
37	37	if(!isset($_GET['limit']))
38	38	{
39		- if (!isset($_GET['number_results']))
40		- {
41		- $limit_start = 0;
42		- $limit_end = 25;
43		- $absolute_difference = 25;
44		- } else {
45		- if ($_GET['number_results'] > 1000){
46		- $_GET['number_results'] = 1000;
47		- }
48		- $limit_start = 0;
49		- $limit_end = $_GET['number_results'];
50		- $absolute_difference = $_GET['number_results'];
51		- }
	39	+ if (!isset($_GET['number_results']))
	40	+ {
	41	+ $limit_start = 0;
	42	+ $limit_end = 25;
	43	+ $absolute_difference = 25;
	44	+ } else {
	45	+ if ($_GET['number_results'] > 1000){
	46	+ $_GET['number_results'] = 1000;
	47	+ }
	48	+ $limit_start = 0;
	49	+ $limit_end = $_GET['number_results'];
	50	+ $absolute_difference = $_GET['number_results'];
	51	+ }
52	52	} else {
53		- $limit_explode = explode(",", $_GET['limit']);
54		- $limit_start = $limit_explode[0];
55		- $limit_end = $limit_explode[1];
	53	+ $limit_explode = explode(",", $_GET['limit']);
	54	+ $limit_start = $limit_explode[0];
	55	+ $limit_end = $limit_explode[1];
56	56	}
57	57
58	58	$absolute_difference = abs($limit_start - $limit_end);
		@@ -90,69 +90,69 @@ discard block
		block discarded – undo
90	90
91	91	$output = '{';
92	92	$output .= '"type": "FeatureCollection",';
93		- $output .= '"features": [';
	93	+ $output .= '"features": [';
94	94
95	95
96		- if (!empty($spotter_array))
	96	+ if (!empty($spotter_array))
97	97	{
98		- foreach($spotter_array as $spotter_item)
99		- {
	98	+ foreach($spotter_array as $spotter_item)
	99	+ {
100	100
101	101
102	102	//waypoint plotting
103	103	$output .= '{';
104	104	$output .= '"type": "Feature",';
105		- $output .= '"properties": {';
106		- $output .= '"id": "'.$spotter_item['spotter_id'].'",';
107		- $output .= '"ident": "'.$spotter_item['ident'].'",';
108		- $output .= '"registration": "'.$spotter_item['registration'].'",';
109		- $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
110		- $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
111		- $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
112		- $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
113		- $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
114		- $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
115		- $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
116		- $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
117		- $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
118		- $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
119		- $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
120		- $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
121		- $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
122		- $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
123		- $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
124		- $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",';
125		- $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
126		- $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
127		- $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
128		- $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
129		- $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
130		- $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
131		- $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
132		- $output .= '"latitude": "'.$spotter_item['latitude'].'",';
133		- $output .= '"longitude": "'.$spotter_item['longitude'].'",';
134		- $output .= '"altitude": "'.$spotter_item['altitude'].'",';
135		- $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
136		- $output .= '"heading": "'.$spotter_item['heading'].'",';
137		- $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
138		- $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
139		- $output .= '}';
140		- if ($spotter_item['waypoints'] != '') {
141		- $output .= ',"geometry": {';
142		- $output .= '"type": "LineString",';
143		- $output .= '"coordinates": [';
144		- $waypoint_pieces = explode(' ', $spotter_item['waypoints']);
	105	+ $output .= '"properties": {';
	106	+ $output .= '"id": "'.$spotter_item['spotter_id'].'",';
	107	+ $output .= '"ident": "'.$spotter_item['ident'].'",';
	108	+ $output .= '"registration": "'.$spotter_item['registration'].'",';
	109	+ $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
	110	+ $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
	111	+ $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
	112	+ $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
	113	+ $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
	114	+ $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
	115	+ $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
	116	+ $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
	117	+ $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
	118	+ $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
	119	+ $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
	120	+ $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
	121	+ $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
	122	+ $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
	123	+ $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
	124	+ $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",';
	125	+ $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
	126	+ $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
	127	+ $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
	128	+ $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
	129	+ $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
	130	+ $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
	131	+ $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
	132	+ $output .= '"latitude": "'.$spotter_item['latitude'].'",';
	133	+ $output .= '"longitude": "'.$spotter_item['longitude'].'",';
	134	+ $output .= '"altitude": "'.$spotter_item['altitude'].'",';
	135	+ $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
	136	+ $output .= '"heading": "'.$spotter_item['heading'].'",';
	137	+ $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
	138	+ $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
	139	+ $output .= '}';
	140	+ if ($spotter_item['waypoints'] != '') {
	141	+ $output .= ',"geometry": {';
	142	+ $output .= '"type": "LineString",';
	143	+ $output .= '"coordinates": [';
	144	+ $waypoint_pieces = explode(' ', $spotter_item['waypoints']);
145	145	$waypoint_pieces = array_chunk($waypoint_pieces, 2);
146	146
147	147	foreach ($waypoint_pieces as $waypoint_coordinate)
148	148	{
149	149	$output .= '[';
150		- $output .= $waypoint_coordinate[1].', ';
151		- $output .= $waypoint_coordinate[0];
	150	+ $output .= $waypoint_coordinate[1].', ';
	151	+ $output .= $waypoint_coordinate[0];
152	152	$output .= '],';
153	153
154	154	}
155		- $output = substr($output, 0, -1);
	155	+ $output = substr($output, 0, -1);
156	156	$output .= ']';
157	157	$output .= '}';
158	158	}
		@@ -161,50 +161,50 @@ discard block
		block discarded – undo
161	161	//location of aircraft
162	162	$output .= '{';
163	163	$output .= '"type": "Feature",';
164		- $output .= '"properties": {';
165		- $output .= '"id": "'.$spotter_item['spotter_id'].'",';
166		- $output .= '"ident": "'.$spotter_item['ident'].'",';
167		- $output .= '"registration": "'.$spotter_item['registration'].'",';
168		- $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
169		- $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
170		- $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
171		- $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
172		- $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
173		- $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
174		- $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
175		- $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
176		- $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
177		- $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
178		- $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
179		- $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
180		- $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
181		- $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
182		- $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
183		- $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",';
184		- $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
185		- $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
186		- $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
187		- $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
188		- $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
189		- $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
190		- $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
191		- $output .= '"latitude": "'.$spotter_item['latitude'].'",';
192		- $output .= '"longitude": "'.$spotter_item['longitude'].'",';
193		- $output .= '"altitude": "'.$spotter_item['altitude'].'",';
194		- $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
195		- $output .= '"heading": "'.$spotter_item['heading'].'",';
196		- $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
197		- $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
198		- $output .= '},';
199		- $output .= '"geometry": {';
200		- $output .= '"type": "Point",';
201		- $output .= '"coordinates": [';
	164	+ $output .= '"properties": {';
	165	+ $output .= '"id": "'.$spotter_item['spotter_id'].'",';
	166	+ $output .= '"ident": "'.$spotter_item['ident'].'",';
	167	+ $output .= '"registration": "'.$spotter_item['registration'].'",';
	168	+ $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
	169	+ $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
	170	+ $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
	171	+ $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
	172	+ $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
	173	+ $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
	174	+ $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
	175	+ $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
	176	+ $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
	177	+ $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
	178	+ $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
	179	+ $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
	180	+ $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
	181	+ $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
	182	+ $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
	183	+ $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",';
	184	+ $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
	185	+ $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
	186	+ $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
	187	+ $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
	188	+ $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
	189	+ $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
	190	+ $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
	191	+ $output .= '"latitude": "'.$spotter_item['latitude'].'",';
	192	+ $output .= '"longitude": "'.$spotter_item['longitude'].'",';
	193	+ $output .= '"altitude": "'.$spotter_item['altitude'].'",';
	194	+ $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
	195	+ $output .= '"heading": "'.$spotter_item['heading'].'",';
	196	+ $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
	197	+ $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
	198	+ $output .= '},';
	199	+ $output .= '"geometry": {';
	200	+ $output .= '"type": "Point",';
	201	+ $output .= '"coordinates": [';
202	202	$output .= $spotter_item['longitude'].', ';
203	203	$output .= $spotter_item['latitude'];
204	204	$output .= ']';
205	205	$output .= '}';
206	206	$output .= '},';
207		- }
	207	+ }
208	208	}
209	209	$output = substr($output, 0, -1);
210	210

		@@ -2,17 +2,17 @@ discard block
		block discarded – undo
2	2	require_once('require/class.Connection.php');
3	3	require_once('require/class.Spotter.php');
4	4	require_once('require/class.Language.php');
5		-$Spotter=new Spotter();
	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 = '{';
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95
96	96	if (!empty($spotter_array))
97	97	{
98		- foreach($spotter_array as $spotter_item)
	98	+ foreach ($spotter_array as $spotter_item)
99	99	{
100	100
101	101
		@@ -147,8 +147,8 @@ discard block
		block discarded – undo
147	147	foreach ($waypoint_pieces as $waypoint_coordinate)
148	148	{
149	149	$output .= '[';
150		- $output .= $waypoint_coordinate[1].', ';
151		- $output .= $waypoint_coordinate[0];
	150	+ $output .= $waypoint_coordinate[1].', ';
	151	+ $output .= $waypoint_coordinate[0];
152	152	$output .= '],';
153	153
154	154	}
		@@ -199,8 +199,8 @@ discard block
		block discarded – undo
199	199	$output .= '"geometry": {';
200	200	$output .= '"type": "Point",';
201	201	$output .= '"coordinates": [';
202		- $output .= $spotter_item['longitude'].', ';
203		- $output .= $spotter_item['latitude'];
	202	+ $output .= $spotter_item['longitude'].', ';
	203	+ $output .= $spotter_item['latitude'];
204	204	$output .= ']';
205	205	$output .= '}';
206	206	$output .= '},';

		@@ -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 = $_GET['lowest_altitude'].",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']))
		@@ -49,7 +57,7 @@ discard block
		block discarded – undo
49	57	$limit_end = $_GET['number_results'];
50	58	$absolute_difference = $_GET['number_results'];
51	59	}
52		-} else {
	60	+} else {
53	61	$limit_explode = explode(",", $_GET['limit']);
54	62	$limit_start = $limit_explode[0];
55	63	$limit_end = $limit_explode[1];
		@@ -67,8 +75,11 @@ discard block
		block discarded – undo
67	75
68	76	header("Content-type: text/yaml");
69	77
70		-if (isset($_GET['sort'])) $sort = $_GET['sort'];
71		-else $sort = '';
	78	+if (isset($_GET['sort'])) {
	79	+ $sort = $_GET['sort'];
	80	+} else {
	81	+ $sort = '';
	82	+}
72	83	$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
73	84	$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
74	85	$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);

Ysurac / FlightAirMap

Push — master ( 73f088...7f17b6 )

Status

Category

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

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

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

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

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

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

Braces +257 added lines, -62 removed lines patch added patch discarded remove patch

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 +9 added lines, -9 removed lines patch added patch discarded remove patch

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

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

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

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

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

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

Braces +18 added lines, -7 removed lines patch added patch discarded remove patch