Ysurac / FlightAirMap

notam-geojson.php

Indentation +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ref": "'.$spotter_item['ref'].'",';
 			$output .= '"title": "'.$spotter_item['title'].'",';
 			$output .= '"fir": "'.$spotter_item['fir'].'",';
@@ -61,28 +61,28 @@ 
 //			$output .= '"photo": "'.$spotter_item['image_thumbnail'].'",';
 //			if ($spotter_item['radius'] > 30) $spotter_item['radius'] = 30;
 			if ($spotter_item['scope'] == 'Airport warning') {
-			    $output .= '"color": "#EACC04",';
+				$output .= '"color": "#EACC04",';
 			} elseif ($spotter_item['scope'] == 'Airport/Enroute warning') {
-			    $output .= '"color": "#EA7D00",';
+				$output .= '"color": "#EA7D00",';
 			} elseif ($spotter_item['scope'] == 'Airport/Navigation warning') {
-			    $output .= '"color": "#DBEA00",';
+				$output .= '"color": "#DBEA00",';
 			} elseif ($spotter_item['scope'] == 'Navigation warning') {
-			    $output .= '"color": "#BBEA00",';
+				$output .= '"color": "#BBEA00",';
 			} else {
-			    $output .= '"color": "#FF0000",';
+				$output .= '"color": "#FF0000",';
 			}
 			$radius = $spotter_item['radius']*1852;
 			$output .= '"radiusm": "'.$radius.'",';
 			$output .= '"radiusnm": "'.$spotter_item['radius'].'",';
 			if ($radius > 25000) $radius = 25000;
 			$output .= '"radius": '.$radius.'';
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['center_longitude'].', '.$spotter_item['center_latitude'];
+				$output .= $spotter_item['center_longitude'].', '.$spotter_item['center_latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 	}
 	$output  = substr($output, 0, -1);

Spacing +11 added lines, -11 removed lines

@@ -10,24 +10,24 @@ 
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
-		$scope = filter_var($_COOOKIE['notamscope'],FILTER_SANITIZE_STRING);
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
+		$scope = filter_var($_COOOKIE['notamscope'], FILTER_SANITIZE_STRING);
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
 	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
-		$scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
+		$scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
 	} else {
 		$spotter_array = $NOTAM->getAllNOTAMbyCoord($coords);
 	}
 //	$spotter_array = $NOTAM->getAllNOTAM();
 } else {
 	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
-		$scope = filter_var($_COOKIE['notamscope'],FILTER_SANITIZE_STRING);
+		$scope = filter_var($_COOKIE['notamscope'], FILTER_SANITIZE_STRING);
 		$spotter_array = $NOTAM->getAllNOTAMbyScope($scope);
 	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
-		$scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
+		$scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
 	} else {
 		$spotter_array = $NOTAM->getAllNOTAM();
 	}
@@ -37,7 +37,7 @@ 
             
 if (!empty($spotter_array))
 {	  
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -46,7 +46,7 @@ 
 			$output .= '"ref": "'.$spotter_item['ref'].'",';
 			$output .= '"title": "'.$spotter_item['title'].'",';
 			$output .= '"fir": "'.$spotter_item['fir'].'",';
-			$output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"),'<br />',str_replace(array('"',"\t"), '',$spotter_item['notam_text'])).'",';
+			$output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"), '<br />', str_replace(array('"', "\t"), '', $spotter_item['notam_text'])).'",';
 			$output .= '"latitude": '.$spotter_item['center_latitude'].',';
 			$output .= '"longitude": '.$spotter_item['center_longitude'].',';
 			$output .= '"lower_limit": '.$spotter_item['lower_limit'].',';
@@ -85,7 +85,7 @@ 
 		    $output .= '}';
 		$output .= '},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 

Braces +3 added lines, -1 removed lines

@@ -74,7 +74,9 @@
 			$radius = $spotter_item['radius']*1852;
 			$output .= '"radiusm": "'.$radius.'",';
 			$output .= '"radiusnm": "'.$spotter_item['radius'].'",';
-			if ($radius > 25000) $radius = 25000;
+			if ($radius > 25000) {
+				$radius = 25000;
+			}
 			$output .= '"radius": '.$radius.'';
 		    $output .= '},';
 		    $output .= '"geometry": {';

waypoints-geojson.php

Indentation +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"segment_name": "'.$spotter_item['segment_name'].'",';
 			$output .= '"base": "'.$spotter_item['base'].'",';
 			$output .= '"top": "'.$spotter_item['top'].'",';
@@ -49,15 +49,15 @@ 
 				$output .= '"stroke": "#f0f0f0",';
 				$output .= '"stroke-width": 2';
 //			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "LineString",';
 			$output .= '"coordinates": [';
-			    //$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].'], ['.$spotter_item['longitude_end_seg2'].', '.$spotter_item['latitude_end_seg2'].']';
-			    $output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].','.round($spotter_item['base']*100*0.3048).'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].','.round($spotter_item['base']*100*0.3048).']';
+				//$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].'], ['.$spotter_item['longitude_end_seg2'].', '.$spotter_item['latitude_end_seg2'].']';
+				$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].','.round($spotter_item['base']*100*0.3048).'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].','.round($spotter_item['base']*100*0.3048).']';
 			//    $output .= '['.$spotter_item['latitude_begin'].', '.$spotter_item['longitude_begin'].'], ['.$spotter_item['latitude_end'].', '.$spotter_item['longitude_end'].']';
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 /*		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
@@ -68,7 +68,7 @@ 
 		$output .= '},';
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ident": "'.$spotter_item['name_begin'].'",';
 			$output .= '"high": "'.$spotter_item['high'].'",';
 			$output .= '"alt": "'.$spotter_item['base'].'",';
@@ -98,17 +98,17 @@ 
 				$output .= '"marker-size": "small",';
 				$output .= '"marker-color": "#0000ff"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+				$output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 
 		$output .= '},';
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ident": "'.$spotter_item['name_end'].'",';
 			$output .= '"high": "'.$spotter_item['high'].'",';
 			$output .= '"alt": "'.$spotter_item['top'].'",';
@@ -145,13 +145,13 @@ 
 				$output .= '"marker-size": "small",';
 				$output .= '"marker-color": "#0000ff"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].', '.round($spotter_item['base']*100*0.3048);
+				$output .= $spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].', '.round($spotter_item['base']*100*0.3048);
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 
 		$output .= '},';
 	}

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	$spotter_array = $Spotter->getAllWaypointsInfobyCoord($coords);
 } else {
 	die;
@@ -21,7 +21,7 @@ 
 if (!empty($spotter_array))
 {	  
 //	print_r($spotter_array);
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -102,7 +102,7 @@ 
 		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048); ;
 			$output .= ']';
 		    $output .= '}';
 

airspace-data.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 <button type="button" class="close">&times;</button>
 <?php
 
-$airspaceid = filter_input(INPUT_GET,'airspace',FILTER_SANITIZE_NUMBER_INT);
+$airspaceid = filter_input(INPUT_GET, 'airspace', FILTER_SANITIZE_NUMBER_INT);
 //$notamref = urldecode($notamref);
 if ($globalDBdriver == 'mysql') {
 	$query = "SELECT * FROM airspace WHERE ogr_fid = :id";
@@ -18,10 +18,10 @@ 
 try {
 	$sth = $Connection->db->prepare($query);
 	$sth->execute(array(':id' => $airspaceid));
-} catch(PDOException $e) {
+} catch (PDOException $e) {
 	echo "error";
 }
-$result=$sth->fetchAll(PDO::FETCH_ASSOC);
+$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';

Braces +9 added lines, -3 removed lines

@@ -25,7 +25,9 @@ 
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';
-if (isset($airspace['name'])) $airspace['title'] = $airspace['name']; 
+if (isset($airspace['name'])) {
+	$airspace['title'] = $airspace['name'];
+}
 print '<div class="right"><div class="callsign-details"><div class="callsign">'.$airspace['title'].'</a></div>';
 print '</div>';
 print '<div class="details">';
@@ -44,13 +46,17 @@ 
 	print '</div>';
 }
 
-if (isset($airspace['ceiling'])) $airspace['tops'] = $airspace['ceiling'];
+if (isset($airspace['ceiling'])) {
+	$airspace['tops'] = $airspace['ceiling'];
+}
 print '<div>';
 print '<span>'._("Tops").'</span>';
 print $airspace['tops'];
 print '</div>';
 
-if (isset($airspace['floor'])) $airspace['base'] = $airspace['floor'];
+if (isset($airspace['floor'])) {
+	$airspace['base'] = $airspace['floor'];
+}
 print '<div>';
 print '<span>'._("Base").'</span>';
 print $airspace['base'];

airspace-geojson.php

Spacing +11 added lines, -11 removed lines

@@ -16,14 +16,14 @@ 
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
         if ($globalDBdriver == 'mysql') {
 		$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))";
 		try {
 			$sth = $Connection->db->prepare($query);
-			$sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
+			$sth->execute(array(':minlon' => $coords[0], ':minlat' => $coords[1], ':maxlon' => $coords[2], ':maxlat' => $coords[3]));
 			//$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error";
 		}
 	} else {
@@ -32,7 +32,7 @@ 
 			$sth = $Connection->db->prepare($query);
 			//$sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error";
 		}
 	}
@@ -45,7 +45,7 @@ 
 	try {
 		$sth = $Connection->db->prepare($query);
 		$sth->execute();
-	} catch(PDOException $e) {
+	} catch (PDOException $e) {
 		echo "error";
 	}
 }
@@ -73,20 +73,20 @@ 
 		elseif (isset($properties['ogc_fid'])) $properties['id'] = $properties['ogc_fid'];
 		if (isset($properties['ceiling'])) $properties['tops'] = $properties['ceiling'];
 		if (isset($properties['floor'])) $properties['base'] = $properties['floor'];
-		if (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['tops']),$matches)) {
+		if (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['tops']), $matches)) {
 			$properties['upper_limit'] = round($matches['alt']*100*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['tops']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/', strtoupper($properties['tops']), $matches)) {
 			$properties['upper_limit'] = round($matches['alt']*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['tops']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['tops']), $matches)) {
 			$properties['upper_limit'] = $matches['alt'];
 		}
 		if ($properties['base'] == 'SFC' || $properties['base'] == 'MSL' || $properties['base'] == 'GROUND' || $properties['base'] == 'GND') {
 			$properties['lower_limit'] = 0;
-		} elseif (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['base']),$matches)) {
+		} elseif (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['base']), $matches)) {
 			$properties['lower_limit'] = round($matches['alt']*100*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['base']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/', strtoupper($properties['base']), $matches)) {
 			$properties['lower_limit'] = round($matches['alt']*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['base']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['base']), $matches)) {
 			$properties['lower_limit'] = $matches['alt'];
 		}
 		if ($properties['type'] == 'RESTRICTED' || $properties['type'] == 'R') {

Braces +16 added lines, -6 removed lines

@@ -67,12 +67,22 @@
 		} else {
 			$geom = geoPHP::load(stream_get_contents($row['wkb']));
 		}
-		if (isset($properties['type'])) $properties['type'] = trim($properties['type']);
-		elseif (isset($properties['class'])) $properties['type'] = trim($properties['class']);
-		if (isset($properties['ogr_fid'])) $properties['id'] = $properties['ogr_fid'];
-		elseif (isset($properties['ogc_fid'])) $properties['id'] = $properties['ogc_fid'];
-		if (isset($properties['ceiling'])) $properties['tops'] = $properties['ceiling'];
-		if (isset($properties['floor'])) $properties['base'] = $properties['floor'];
+		if (isset($properties['type'])) {
+			$properties['type'] = trim($properties['type']);
+		} elseif (isset($properties['class'])) {
+			$properties['type'] = trim($properties['class']);
+		}
+		if (isset($properties['ogr_fid'])) {
+			$properties['id'] = $properties['ogr_fid'];
+		} elseif (isset($properties['ogc_fid'])) {
+			$properties['id'] = $properties['ogc_fid'];
+		}
+		if (isset($properties['ceiling'])) {
+			$properties['tops'] = $properties['ceiling'];
+		}
+		if (isset($properties['floor'])) {
+			$properties['base'] = $properties['floor'];
+		}
 		if (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['tops']),$matches)) {
 			$properties['upper_limit'] = round($matches['alt']*100*0.38048);
 		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['tops']),$matches)) {

Indentation +8 added lines, -8 removed lines

@@ -11,13 +11,13 @@ 
 $Connection = new Connection();
 
 if (!$Connection->tableExists('airspace')) {
-    die;
+	die;
 }
 
 if (isset($_GET['coord'])) 
 {
 	$coords = explode(',',$_GET['coord']);
-        if ($globalDBdriver == 'mysql') {
+		if ($globalDBdriver == 'mysql') {
 		$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))";
 		try {
 			$sth = $Connection->db->prepare($query);
@@ -37,7 +37,7 @@ 
 		}
 	}
 } else {
-        if ($globalDBdriver == 'mysql') {
+		if ($globalDBdriver == 'mysql') {
 		$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace";
 	} else {
 		$query = "SELECT *, ST_AsBinary(wkb_geometry,'NDR') AS wkb FROM airspace";
@@ -51,8 +51,8 @@ 
 }
 
 $geojson = array(
-    'type' => 'FeatureCollection',
-    'features' => array()
+	'type' => 'FeatureCollection',
+	'features' => array()
 );
 
 while ($row = $sth->fetch(PDO::FETCH_ASSOC))
@@ -109,9 +109,9 @@ 
 			$properties['color'] = '#d9ffcb';
 		}
 		$feature = array(
-		    'type' => 'Feature',
-		    'geometry' => json_decode($geom->out('json')),
-		    'properties' => $properties
+			'type' => 'Feature',
+			'geometry' => json_decode($geom->out('json')),
+			'properties' => $properties
 		);
 		array_push($geojson['features'], $feature);
 }

install/VAM/VAM-json.php

Spacing +17 added lines, -17 removed lines

@@ -11,27 +11,27 @@
 	die();
 }
 $query = 'select * from vam_live_flights rc, gvausers gu where gu.gvauser_id = rc.gvauser_id';  
-$json_data=array();  
+$json_data = array();  
 $result = $db->query($query);
 while ($rec = $result->fetch_assoc())
 {  
-	$json_array['gvauser_id']=$rec['gvauser_id']; // users "pilot unique ID" "40"
-	$json_array['flight_id']=$rec['flight_id']; // flight_id
-	$json_array['pilot_id']=$rec['callsign']; // users pilot_id "VAM500"
-	$json_array['callsign']=substr($rec['flight_id'],-7);  // substr icao Flight "AFR524"
-	$json_array['pilot_name']=$rec['name'] .' '.$rec['surname'] ;  // Users "name + surname"
-	$json_array['plane_type']=$rec['plane_type'];  // type Plane "B739"
-	$json_array['departure']=$rec['departure'];  // departure ICAO
-	$json_array['arrival']=$rec['arrival'];     // arrival Ident
-	$json_array['latitude']=$rec['latitude'];  // return 55.7328860921521
-	$json_array['longitude']=$rec['longitude'];  // return 8.87433614409404
-	$json_array['altitude']=$rec['altitude'];  // return "147"
-	$json_array['heading']=$rec['heading'];  // return "307"
-	$json_array['ias']=$rec['ias'];  // return speed "IAS"
-	$json_array['gs']=$rec['gs'];  // return speed "GS"
+	$json_array['gvauser_id'] = $rec['gvauser_id']; // users "pilot unique ID" "40"
+	$json_array['flight_id'] = $rec['flight_id']; // flight_id
+	$json_array['pilot_id'] = $rec['callsign']; // users pilot_id "VAM500"
+	$json_array['callsign'] = substr($rec['flight_id'], -7); // substr icao Flight "AFR524"
+	$json_array['pilot_name'] = $rec['name'].' '.$rec['surname']; // Users "name + surname"
+	$json_array['plane_type'] = $rec['plane_type']; // type Plane "B739"
+	$json_array['departure'] = $rec['departure']; // departure ICAO
+	$json_array['arrival'] = $rec['arrival']; // arrival Ident
+	$json_array['latitude'] = $rec['latitude']; // return 55.7328860921521
+	$json_array['longitude'] = $rec['longitude']; // return 8.87433614409404
+	$json_array['altitude'] = $rec['altitude']; // return "147"
+	$json_array['heading'] = $rec['heading']; // return "307"
+	$json_array['ias'] = $rec['ias']; // return speed "IAS"
+	$json_array['gs'] = $rec['gs']; // return speed "GS"
 	// $json_array['routes']=$rec['routes'];  // (unusable)
-	$json_array['flight_status']=$rec['flight_status'];  // "return Status"
-	$json_array['last_update']=$rec['last_update'];  // return "DateTime"
+	$json_array['flight_status'] = $rec['flight_status']; // "return Status"
+	$json_array['last_update'] = $rec['last_update']; // return "DateTime"
 	$json_data[] = $json_array;
  }  
 echo json_encode($json_data);

aircraft-statistics-airline-country.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
     	print '<option></option>';
     	$Stats = new Stats();
     	$aircraft_types = $Stats->getAllAircraftTypes();
-    	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+    	if (empty($aircraft_types)) {
+    		$aircraft_types = $Spotter->getAllAircraftTypes();
+    	}
     	foreach($aircraft_types as $aircrafttype)
     	{
     		if($aircraft_type == $aircrafttype['aircraft_icao'])

Spacing +8 added lines, -8 removed lines

@@ -9,13 +9,13 @@ 
 	header('Location: '.$globalURL.'/aircraft');
 	die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines by Country from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Airlines by Country from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
     
 	print '<div class="select-item">';
@@ -25,9 +25,9 @@ 
     	$Stats = new Stats();
     	$aircraft_types = $Stats->getAllAircraftTypes();
     	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-    	foreach($aircraft_types as $aircrafttype)
+    	foreach ($aircraft_types as $aircrafttype)
     	{
-    		if($aircraft_type == $aircrafttype['aircraft_icao'])
+    		if ($aircraft_type == $aircrafttype['aircraft_icao'])
     		{
     			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
     		} else {
@@ -53,7 +53,7 @@ 
 	include('aircraft-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 from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$airline_array = $Spotter->countAllAirlineCountriesByAircraft($aircraft_type);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -62,7 +62,7 @@ 
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
         $country_data = '';
-	foreach($airline_array as $airline_item)
+	foreach ($airline_array as $airline_item)
 	{
 		$country_data .= '[ "'.$airline_item['airline_country_iso3'].'",'.$airline_item['airline_country_count'].'],';
 	}
@@ -109,7 +109,7 @@ 
 		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>';

Indentation +20 added lines, -20 removed lines

@@ -21,18 +21,18 @@ 
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
 	print '<select name="aircraft_type" class="selectpicker" data-live-search="true">';
-    	print '<option></option>';
-    	$Stats = new Stats();
-    	$aircraft_types = $Stats->getAllAircraftTypes();
-    	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-    	foreach($aircraft_types as $aircrafttype)
-    	{
-    		if($aircraft_type == $aircrafttype['aircraft_icao'])
-    		{
-    			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
-    		} else {
-    			print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
-    		}
+		print '<option></option>';
+		$Stats = new Stats();
+		$aircraft_types = $Stats->getAllAircraftTypes();
+		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+		foreach($aircraft_types as $aircrafttype)
+		{
+			if($aircraft_type == $aircrafttype['aircraft_icao'])
+			{
+				print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
+			} else {
+				print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
+			}
 	}
 	print '</select>';
 	print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>';
@@ -61,18 +61,18 @@ 
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
-        $country_data = '';
+		$country_data = '';
 	foreach($airline_array as $airline_item)
 	{
 		$country_data .= '[ "'.$airline_item['airline_country_iso3'].'",'.$airline_item['airline_country_count'].'],';
 	}
-        $country_data = substr($country_data, 0, -1);
-        print $country_data;
-        print '];';
-        print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-        print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-        print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
-        print 'new Datamap({
+		$country_data = substr($country_data, 0, -1);
+		print $country_data;
+		print '];';
+		print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
+		print 'new Datamap({
 	    element: document.getElementById("chartCountry"),
 	    projection: "mercator", // big world map
 	    fills: { defaultFill: "#F5F5F5" },

aircraft-detailed.php

Indentation +11 added lines, -11 removed lines

@@ -42,8 +42,8 @@ 
 		print '<div class="select-item">';
 		print '<form action="'.$globalURL.'/aircraft" method="post">';
 		print '<select name="aircraft_type" class="selectpicker" data-live-search="true">';
-    		print '<option></option>';
-    		$Stats = new Stats();
+			print '<option></option>';
+			$Stats = new Stats();
 		$aircraft_types = $Stats->getAllAircraftTypes();
 		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
 		foreach($aircraft_types as $aircrafttype)
@@ -54,20 +54,20 @@ 
 			} else {
 				print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_manufacturer'].' '.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 			}
-    		}
-    		print '</select>';
-	    	print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>';
+			}
+			print '</select>';
+			print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>';
 	  	print '</form>';
 	  	print '</div>';
 	    
 		if ($aircraft_type != "NA")
 		{
-	    		print '<div class="info column">';
-	      		print '<h1>'.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')</h1>';
-	      		print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['aircraft_name'].'</div>';
-	      		print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['aircraft_type'].'</div>'; 
-	      		if (isset($spotter_array[0]['aircraft_manufacturer'])) print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
-	    		print '</div>';
+				print '<div class="info column">';
+		  		print '<h1>'.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')</h1>';
+		  		print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['aircraft_name'].'</div>';
+		  		print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['aircraft_type'].'</div>'; 
+		  		if (isset($spotter_array[0]['aircraft_manufacturer'])) print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
+				print '</div>';
 		} else {
 			print '<div class="alert alert-warning">'._("This special aircraft profile shows all flights in where the aircraft type is unknown.").'</div>';
 		}

Braces +7 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -45,7 +45,9 @@ 
     		print '<option></option>';
     		$Stats = new Stats();
 		$aircraft_types = $Stats->getAllAircraftTypes();
-		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+		if (empty($aircraft_types)) {
+			$aircraft_types = $Spotter->getAllAircraftTypes();
+		}
 		foreach($aircraft_types as $aircrafttype)
 		{
 			if($aircraft_type == $aircrafttype['aircraft_icao'])
@@ -66,7 +68,9 @@ 
 	      		print '<h1>'.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')</h1>';
 	      		print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['aircraft_name'].'</div>';
 	      		print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['aircraft_type'].'</div>'; 
-	      		if (isset($spotter_array[0]['aircraft_manufacturer'])) print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
+	      		if (isset($spotter_array[0]['aircraft_manufacturer'])) {
+	      			print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>';
+	      		}
 	    		print '</div>';
 		} else {
 			print '<div class="alert alert-warning">'._("This special aircraft profile shows all flights in where the aircraft type is unknown.").'</div>';

Spacing +10 added lines, -10 removed lines

@@ -5,16 +5,16 @@ 
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 
-if (!isset($_GET['aircraft_type'])){
+if (!isset($_GET['aircraft_type'])) {
 	header('Location: '.$globalURL.'/aircraft');
 } else {
 	//calculuation for the pagination
-	if(!isset($_GET['limit']) || count(explode(",", $_GET['limit'])) < 2)
+	if (!isset($_GET['limit']) || count(explode(",", $_GET['limit'])) < 2)
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -28,15 +28,15 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+	$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 	$page_url = $globalURL.'/aircraft/'.$aircraft_type;
 	
-	$sort = htmlspecialchars(filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING));
-	$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,$limit_start.",".$absolute_difference, $sort);
+	$sort = htmlspecialchars(filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING));
+	$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, $limit_start.",".$absolute_difference, $sort);
 	
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+		$title = sprintf(_("Detailed View for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 		require_once('header.php');
 	    
 		print '<div class="select-item">';
@@ -46,9 +46,9 @@ 
     		$Stats = new Stats();
 		$aircraft_types = $Stats->getAllAircraftTypes();
 		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-		foreach($aircraft_types as $aircrafttype)
+		foreach ($aircraft_types as $aircrafttype)
 		{
-			if($aircraft_type == $aircrafttype['aircraft_icao'])
+			if ($aircraft_type == $aircrafttype['aircraft_icao'])
 			{
 				print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_manufacturer'].' '.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 			} else {
@@ -75,7 +75,7 @@ 
 		include('aircraft-sub-menu.php');
 	        
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 		  
 		include('table-output.php');
 		  

aircraft-statistics-airline.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 	print '<option></option>';
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types)) {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	foreach($aircraft_types as $aircrafttype)
 	{
 		if($aircraft_type == $aircrafttype['aircraft_icao'])

Spacing +7 added lines, -7 removed lines

@@ -8,14 +8,14 @@ 
 	header('Location: '.$globalURL.'/aircraft');
 	die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Airlines from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
@@ -24,9 +24,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -52,7 +52,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Airlines").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$airline_array = $Spotter->countAllAirlinesByAircraft($aircraft_type);
 
@@ -70,7 +70,7 @@ 
 		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>';

aircraft-statistics-route.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 	print '<option></option>';
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types)) {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	foreach($aircraft_types as $aircrafttype)
 	{
 		if($aircraft_type == $aircrafttype['aircraft_icao'])

Spacing +7 added lines, -7 removed lines

@@ -7,14 +7,14 @@ 
         header('Location: '.$globalURL.'/aircraft');
         die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
@@ -23,9 +23,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -51,7 +51,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByAircraft($aircraft_type);
 	if (!empty($route_array))
@@ -68,7 +68,7 @@ 
 		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>';

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['aircraft_type'])) {
-        header('Location: '.$globalURL.'/aircraft');
-        die();
+		header('Location: '.$globalURL.'/aircraft');
+		die();
 }
 $aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();