Ysurac / FlightAirMap

notam-data.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 <button type="button" class="close">&times;</button>
 <?php
 
-$notamref = filter_input(INPUT_GET,'notam',FILTER_SANITIZE_STRING);
+$notamref = filter_input(INPUT_GET, 'notam', FILTER_SANITIZE_STRING);
 $notamref = urldecode($notamref);
 $NOTAM = new NOTAM();
 $notam = $NOTAM->getNOTAMbyRef($notamref);

notam-geojson.php

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 .= ']}';
 

waypoints-geojson.php

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">';

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') {

scripts/update_db.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 	exec("ps ux", $output, $result);
 	$j = 0;
-	foreach ($output as $line) if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
+	foreach ($output as $line) if (strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
 	if ($j > 1) {
 		echo "Script is already runnning...";
 		die();

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);

install/class.create_db.php

Spacing +18 added lines, -18 removed lines

@@ -4,24 +4,24 @@ 
 
 class create_db {
 	public static function import_file($filename) {
-		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
+		$filename = filter_var($filename, FILTER_SANITIZE_STRING);
 		$Connection = new Connection();
 		//Connection::$db->beginTransaction();
 		$templine = '';
-		$handle = @fopen($filename,"r");
+		$handle = @fopen($filename, "r");
 		if ($handle) {
 			//$lines = file($filename);
 			//foreach ($lines as $line)
-			while (($line = fgets($handle,4096)) !== false)
+			while (($line = fgets($handle, 4096)) !== false)
 			{
-				if (substr($line,0,2) == '--' || $line == '') continue;
+				if (substr($line, 0, 2) == '--' || $line == '') continue;
 				$templine .= $line;
-				if (substr(trim($line), -1,1) == ';')
+				if (substr(trim($line), -1, 1) == ';')
 				{
 					try {
 						$sth = $Connection->db->prepare($templine);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error (import ".$filename.") : ".$e->getMessage()."\n";
 					}
 					$templine = '';
@@ -38,27 +38,27 @@ 
 		$error = '';
 		$dh = opendir($directory);
 		//foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename)
-		while(false !== ($filename = readdir($dh)))
+		while (false !== ($filename = readdir($dh)))
 		{
-		    if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename);
+		    if (preg_match('/\.sql$/', $filename)) $error .= create_db::import_file($directory.$filename);
 		}
 		return $error;
 	}
 
-	public static function create_database($root,$root_pass,$user,$pass,$db,$db_type,$host) {
-		$root = filter_var($root,FILTER_SANITIZE_STRING);
-		$root_pass = filter_var($root_pass,FILTER_SANITIZE_STRING);
-		$user = filter_var($user,FILTER_SANITIZE_STRING);
-		$password = filter_var($pass,FILTER_SANITIZE_STRING);
-		$db = filter_var($db,FILTER_SANITIZE_STRING);
-		$db_type = filter_var($db_type,FILTER_SANITIZE_STRING);
-		$host = filter_var($host,FILTER_SANITIZE_STRING);
+	public static function create_database($root, $root_pass, $user, $pass, $db, $db_type, $host) {
+		$root = filter_var($root, FILTER_SANITIZE_STRING);
+		$root_pass = filter_var($root_pass, FILTER_SANITIZE_STRING);
+		$user = filter_var($user, FILTER_SANITIZE_STRING);
+		$password = filter_var($pass, FILTER_SANITIZE_STRING);
+		$db = filter_var($db, FILTER_SANITIZE_STRING);
+		$db_type = filter_var($db_type, FILTER_SANITIZE_STRING);
+		$host = filter_var($host, FILTER_SANITIZE_STRING);
 		// Dirty hack
 		if ($host != 'localhost' && $host != '127.0.0.1') {
 		    $grantright = $_SERVER['SERVER_ADDR'];
 		} else $grantright = 'localhost';
 		try {
-			$dbh = new PDO($db_type.':host='.$host,$root,$root_pass);
+			$dbh = new PDO($db_type.':host='.$host, $root, $root_pass);
 			$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 			if ($db_type == 'mysql') {
 				$dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
@@ -68,7 +68,7 @@ 
 				$dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."';
 					GRANT ALL PRIVILEGES ON DATABASE ".$db." TO ".$user.";");
 			}
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			$dbh = null;
 			return "error : ".$e->getMessage();
 		}

airport-statistics-route.php

Spacing +7 added lines, -7 removed lines

@@ -7,14 +7,14 @@ 
         header('Location: '.$globalURL.'/airport');
         die();
 }
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirport($airport,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirport($airport, "0,1", "");
 $airport_array = $Spotter->getAllAirportInfo($airport);
 
 if (!empty($airport_array))
 {
-	$title = sprintf(_("Most Common Routes to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Routes to/from %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -25,9 +25,9 @@ 
 	$airport_names = $Stats->getAllAirportNames();
 	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
 	ksort($airport_names);
-	foreach($airport_names as $airport_name)
+	foreach ($airport_names as $airport_name)
 	{
-		if($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -58,7 +58,7 @@ 
 	include('airport-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByAirport($airport);
 	if (!empty($route_array))
@@ -74,7 +74,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>';