Ysurac / FlightAirMap

getImages.php

Spacing +14 added lines, -14 removed lines

@@ -4,9 +4,9 @@ 
 	$hex = str_replace("#", "", $hex);
 	$color = array();
 	if (strlen($hex) == 3) {
-	    $color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1));
-	    $color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1));
-	    $color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1));
+	    $color['r'] = hexdec(substr($hex, 0, 1).substr($hex, 0, 1));
+	    $color['g'] = hexdec(substr($hex, 1, 1).substr($hex, 1, 1));
+	    $color['b'] = hexdec(substr($hex, 2, 1).substr($hex, 2, 1));
 	} else if (strlen($hex) == 6) {
 	    $color['r'] = hexdec(substr($hex, 0, 2));
 	    $color['g'] = hexdec(substr($hex, 2, 2));
@@ -16,7 +16,7 @@ 
 }
 
 
-if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/',$_GET['color'])) { 
+if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/', $_GET['color'])) { 
     exit(0);
 }
 $color = $_GET['color'];
@@ -47,15 +47,15 @@ 
 
 if (extension_loaded('gd') && function_exists('gd_info')) {
     $image = imagecreatefrompng($original);
-    $index = imagecolorexact($image,26,49,81);
+    $index = imagecolorexact($image, 26, 49, 81);
     if ($index < 0) {
-	$index = imagecolorexact($image,25,49,79);
+	$index = imagecolorexact($image, 25, 49, 79);
     }
     if ($index < 0) {
-	$index = imagecolorexact($image,0,0,0);
+	$index = imagecolorexact($image, 0, 0, 0);
     }
     $c = hexToRGB($color);
-    imagecolorset($image,$index,$c['r'],$c['g'],$c['b']);
+    imagecolorset($image, $index, $c['r'], $c['g'], $c['b']);
  /*
     $ig = imagecolorat($image, 0, 0);
     imagecolortransparent($image, $ig);
@@ -63,14 +63,14 @@ 
 
     header('Content-type: image/png');
     if (isset($_GET['resize']) && function_exists('imagecopyresampled')) {
-	$resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT);
-	$newimg = imagecreatetruecolor($resize,$resize);
+	$resize = filter_input(INPUT_GET, 'resize', FILTER_SANITIZE_NUMBER_INT);
+	$newimg = imagecreatetruecolor($resize, $resize);
         imagealphablending($newimg, false);
 	imagesavealpha($newimg, true);
-	imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image));
+	imagecopyresampled($newimg, $image, 0, 0, 0, 0, 15, 15, imagesx($image), imagesy($image));
 	if (isset($_GET['heading'])) {
-    	    $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT);
-    	    $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127));
+    	    $heading = filter_input(INPUT_GET, 'heading', FILTER_SANITIZE_NUMBER_INT);
+    	    $rotation = imagerotate($newimg, $heading, imageColorAllocateAlpha($newimg, 0, 0, 0, 127));
     	    imagealphablending($rotation, false);
 	    imagesavealpha($rotation, true);
     	    imagepng($rotation);
@@ -89,7 +89,7 @@ 
 	imagepng($image);
 	imagepng($image);
 	if (is_writable(dirname(__FILE__).'/cache')) {
-    	    imagepng($image,dirname(__FILE__).'/cache/'.$color.'-'.$filename);
+    	    imagepng($image, dirname(__FILE__).'/cache/'.$color.'-'.$filename);
 	}
         imagedestroy($image);
     }

pilot.php

Spacing +8 added lines, -8 removed lines

@@ -7,10 +7,10 @@ 
 
 if (isset($_POST['pilot']))
 {
-	header('Location: '.$globalURL.'/pilot/'.filter_input(INPUT_POST,'pilot',FILTER_SANITIZE_STRING));
+	header('Location: '.$globalURL.'/pilot/'.filter_input(INPUT_POST, 'pilot', FILTER_SANITIZE_STRING));
 //} else if (isset($_GET['airport'])){
 } else {
-	$Spotter= new Spotter();
+	$Spotter = new Spotter();
 	$Stats = new Stats();
 	$Common = new Common();
 	$title = _("Pilots");
@@ -24,11 +24,11 @@ 
 	//ksort($pilot_names);
 	$previous = null;
 	print '<div class="alphabet-legend">';
-	foreach($pilot_names as $value) {
+	foreach ($pilot_names as $value) {
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['pilot_name'], 0, 1));
-		if($previous !== $firstLetter && $firstLetter != "'")
+		if ($previous !== $firstLetter && $firstLetter != "'")
 		{
-			if ($previous !== null){
+			if ($previous !== null) {
 				print ' | ';
 			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
@@ -37,13 +37,13 @@ 
 	}
 	print '</div>';
 	$previous = null;
-	foreach($pilot_names as $value) {
+	foreach ($pilot_names as $value) {
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['pilot_name'], 0, 1));
 		if ($firstLetter != "")
 		{
-			if($previous !== $firstLetter && $firstLetter != "'")
+			if ($previous !== $firstLetter && $firstLetter != "'")
 			{
-				if ($previous !== null){
+				if ($previous !== null) {
 					print '</div>';
 				}
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';

owner.php

Spacing +8 added lines, -8 removed lines

@@ -7,10 +7,10 @@ 
 
 if (isset($_POST['owner']))
 {
-	header('Location: '.$globalURL.'/owner/'.filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING));
+	header('Location: '.$globalURL.'/owner/'.filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING));
 //} else if (isset($_GET['airport'])){
 } else {
-	$Spotter= new Spotter();
+	$Spotter = new Spotter();
 	$Stats = new Stats();
 	$Common = new Common();
 	$title = _("Owners");
@@ -24,11 +24,11 @@ 
 	ksort($owner_names);
 	$previous = null;
 	print '<div class="alphabet-legend">';
-	foreach($owner_names as $value) {
+	foreach ($owner_names as $value) {
 		$firstLetter = $Common->remove_accents(strtoupper($Common->replace_mb_substr($value['owner_name'], 0, 1)));
-		if($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"')
+		if ($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"')
 		{
-			if ($previous !== null){
+			if ($previous !== null) {
 				print ' | ';
 			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
@@ -37,13 +37,13 @@ 
 	}
 	print '</div>';
 	$previous = null;
-	foreach($owner_names as $value) {
+	foreach ($owner_names as $value) {
 		$firstLetter = $Common->remove_accents(strtoupper($Common->replace_mb_substr($value['owner_name'], 0, 1)));
 		if ($firstLetter != "")
 		{
-			if($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"')
+			if ($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"')
 			{
-				if ($previous !== null){
+				if ($previous !== null) {
 					print '</div>';
 				}
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';

accident-latest.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 
 $page_url = $globalURL.'/accident-latest';
 
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;
@@ -33,7 +33,7 @@ 
 
 print '<div class="table column">';
 print '<p>'._("The table below shows the latest Accidents.").'</p>';
-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'accident');
+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'accident');
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');
 	print '<div class="pagination">';

js/map-satellite.2d.js.php

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 
 // Compressed GeoJson is used if true
 if (!isset($globalJsonCompress)) $compress = true;
@@ -18,10 +18,10 @@ 
 
 <?php
 	if (isset($_GET['famsatid'])) {
-		$famsatid = filter_input(INPUT_GET,'famsatid',FILTER_SANITIZE_STRING);
+		$famsatid = filter_input(INPUT_GET, 'famsatid', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (!isset($ident) && !isset($famsatid)) {
 ?>
@@ -194,7 +194,7 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -210,7 +210,7 @@ 
 			    /*
 			    shadowUrl: iconURLShadowpath,
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
 			    */
 			})
 		    })
@@ -250,7 +250,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -305,7 +305,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}

airline.php

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 
 if (isset($_POST['airline']))
 {
-	header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST,'airline',FILTER_SANITIZE_STRING));
+	header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST, 'airline', FILTER_SANITIZE_STRING));
 } else {
 	$title = "Airlines";
 	require_once('header.php');
@@ -17,7 +17,7 @@ 
 	print '<div class="column">';
 	print '<h1>'._("Airlines").'</h1>';
 	if (isset($_POST['airline_type'])) {
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
 		//$airline_names = $Spotter->getAllAirlineNames($airline_type);
 	} else {
 		//$airline_names = $Spotter->getAllAirlineNames();
@@ -29,10 +29,10 @@ 
 		print '<div class="alphabet">';
 		foreach ($alliances as $alliance) {
 			print '<div class="alphabet-airline alphabet-item">';
-			print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ','_',$alliance['alliance']).'">';
-			if (file_exists('images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png'))
+			print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ', '_', $alliance['alliance']).'">';
+			if (file_exists('images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> ';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> ';
 			} else print $alliance['alliance'];
 			print '</a>';
 			print '</div>';
@@ -55,7 +55,7 @@ 
 	$Stats = new Stats();
 	if (isset($_POST['airline_type'])) 
 	{
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
 		//$airline_names = $Stats->getAllAirlineNames($airline_type);
 		$airline_names = $Spotter->getAllAirlineNames($airline_type);
 	} else {
@@ -68,12 +68,12 @@ 
 	}
 	$previous = null;
 	print '<div class="alphabet-legend">';
-	foreach($airline_names as $value) 
+	foreach ($airline_names as $value) 
 	{
 		//echo $value['airline_name']."\n";
 		//echo mb_substr($value['airline_name'],0,1).' - '.$value['airline_name']."\n";
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1));
-		if($previous !== $firstLetter)
+		if ($previous !== $firstLetter)
 		{
 			if ($previous !== null) print ' | ';
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
@@ -82,11 +82,11 @@ 
 	}
 	print '</div>';
 	$previous = null;
-	foreach($airline_names as $value) {
+	foreach ($airline_names as $value) {
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1));
 		if ($firstLetter != "")
 		{
-			if($previous !== $firstLetter)
+			if ($previous !== $firstLetter)
 			{
 				if ($previous !== null) print '</div>';
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';

install/class.create_db.php

Spacing +19 added lines, -19 removed lines

@@ -8,25 +8,25 @@ 
 	 * @param string $filename
 	 */
 	public static function import_file($filename) {
-		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
+		$filename = filter_var($filename, FILTER_SANITIZE_STRING);
 		$Connection = new Connection();
 		if (!$Connection->connectionExists()) return 'error: DB connection failed';
 		//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 = '';
@@ -43,21 +43,21 @@ 
 		$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,$port = '') {
-		$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, $port = '') {
+		$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);
 		if ($db_type == 'mysql' && $port == '') $port = 3306;
 		elseif ($port == '') $port = 5432;
 		// Dirty hack
@@ -65,8 +65,8 @@ 
 			$grantright = $_SERVER['SERVER_ADDR'];
 		} else $grantright = 'localhost';
 		try {
-			if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass);
-			else $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass);
+			if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1', $root, $root_pass);
+			else $dbh = new PDO($db_type.':host='.$host.';port='.$port, $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;");
@@ -76,7 +76,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();
 		}

require/class.Satellite.php

Spacing +23 added lines, -23 removed lines

@@ -20,7 +20,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':name' => $name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -32,7 +32,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -44,7 +44,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -56,7 +56,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':type' => $type));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -64,49 +64,49 @@ 
 		else return array();
 	}
 	
-	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all($timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names();
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			$result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			$result = array_merge($position, $result);
 		}
 		return $result;
 	}
 
-	public function position_all_type($type,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all_type($type, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names_type($type);
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			if (isset($position[0])) $result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			if (isset($position[0])) $result = array_merge($position, $result);
 			else $result[] = $position;
 		}
 		return $result;
 	}
 
-	public function position($name,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position($name, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$qth = new Predict_QTH();
 		$qth->lat = floatval(37.790252);
 		$qth->lon = floatval(-122.419968);
 	
 		$tle_file = $this->get_tle($name);
 		$type = $tle_file['tle_type'];
-		$tle = new Predict_TLE($tle_file['tle_name'],$tle_file['tle_tle1'],$tle_file['tle_tle2']);
+		$tle = new Predict_TLE($tle_file['tle_name'], $tle_file['tle_tle1'], $tle_file['tle_tle2']);
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
 		if ($timestamp_begin == '') $timestamp_begin = time();
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
-			$predict->predict_calc($sat,$qth,$now);
-			return array('name' => $name, 'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp_begin,'type' => $type);
+			$predict->predict_calc($sat, $qth, $now);
+			return array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp_begin, 'type' => $type);
 		} else {
 			$result = array();
-			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp=$timestamp+$second) {
+			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp = $timestamp + $second) {
 				$now = Predict_Time::unix2daynum($timestamp);
-				$predict->predict_calc($sat,$qth,$now);
-				$result[] = array('name' => $name,'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp,'type' => $type);
+				$predict->predict_calc($sat, $qth, $now);
+				$result[] = array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp, 'type' => $type);
 			}
 			return $result;
 		}
@@ -117,7 +117,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':name' => $name.'%'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -145,7 +145,7 @@ 
 		$sth->execute($query_values);
 		$launch_site_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['launch_site'] = $row['launch_site'];
 			$temp_array['launch_site_count'] = $row['launch_site_count'];
@@ -174,7 +174,7 @@ 
 		$sth->execute($query_values);
 		$owner_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['owner_name'] = $row['owner_name'];
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -203,7 +203,7 @@ 
 		$sth->execute($query_values);
 		$owner_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['country_name'] = $row['country_name'];
 			$temp_array['country_count'] = $row['country_count'];
@@ -247,7 +247,7 @@ 
 		$sth->execute($query_data);
 		$date_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['month_name'] = $row['month_name'];
@@ -292,7 +292,7 @@ 
 		$sth->execute($query_data);
 		$date_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['date_count'] = $row['date_count'];

live-sat-geojson.php

Spacing +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
 		header('Content-disposition: attachment; filename="flightairmap-sat.json"');
 	}
 }
-$history = urldecode(filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING));
+$history = urldecode(filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING));
 header('Content-Type: text/javascript');
 
 $begintime = microtime(true);
@@ -21,10 +21,10 @@ 
 
 $spotter_array = array();
 if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') {
-	$sattypes = explode(',',$_COOKIE['sattypes']);
+	$sattypes = explode(',', $_COOKIE['sattypes']);
 	foreach ($sattypes as $sattype) {
 		//$spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array);
-		$spotter_array = array_merge($Satellite->position_all_type($sattype),$spotter_array);
+		$spotter_array = array_merge($Satellite->position_all_type($sattype), $spotter_array);
 	}
 }
 
@@ -36,7 +36,7 @@ 
 
 //$spotter_array = array_unique($spotter_array,SORT_REGULAR);
 //print_r($spotter_array);
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
 $output = '{"type":"FeatureCollection","features":[';
 if (!empty($spotter_array) && is_array($spotter_array))
@@ -44,7 +44,7 @@ 
 	$last_name = '';
 	$coordinatearray = '';
 	$timearray = array();
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$output_data = '';
 		$output_data .= '{"type":"Feature","properties":{';
@@ -61,14 +61,14 @@ 
 		}
 		$output_data .= '"altitude":0,';
 		$output_data .= '"sqt":'.$sqltime.',';
-		$nextlatlon = $Satellite->position($spotter_item['name'],time()+$globalMapRefresh+20);
+		$nextlatlon = $Satellite->position($spotter_item['name'], time() + $globalMapRefresh + 20);
 		$nextlat = $nextlatlon['latitude'];
-		if (abs($nextlat-$spotter_item['latitude']) > 90) {
+		if (abs($nextlat - $spotter_item['latitude']) > 90) {
 			if ($spotter_item['latitude'] < 0) $nexlat = -90;
 			else $nexlat = 90;
 		}
 		$nextlon = $nextlatlon['longitude'];
-		if (abs($nextlon-$spotter_item['longitude']) > 180) {
+		if (abs($nextlon - $spotter_item['longitude']) > 180) {
 			if ($spotter_item['longitude'] < 0) $nextlon = -180;
 			else $nextlon = 180;
 		}
@@ -79,27 +79,27 @@ 
 		$output_data .= ']}},';
 		$output .= $output_data;
 		if ($history == $spotter_item['name']) {
-			$spotter_history_array = $Satellite->position($spotter_item['name'],time()-6000,time());
+			$spotter_history_array = $Satellite->position($spotter_item['name'], time() - 6000, time());
 			$spotter_history_array = array_reverse($spotter_history_array);
 			$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['name'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
 			foreach ($spotter_history_array as $key => $spotter_history) {
-				if ((isset($previous_lon) && abs($previous_lon-$spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat-$spotter_history['latitude']) > 90)) {
+				if ((isset($previous_lon) && abs($previous_lon - $spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat - $spotter_history['latitude']) > 90)) {
 					break;
 				}
 				$output_history .= '[';
-				$output_history .=  $spotter_history['longitude'].', ';
-				$output_history .=  $spotter_history['latitude'];
+				$output_history .= $spotter_history['longitude'].', ';
+				$output_history .= $spotter_history['latitude'];
 				$output_history .= '],';
 				$previous_lon = $spotter_history['longitude'];
 				$previous_lat = $spotter_history['latitude'];
 			}
-			$output_history = substr($output_history,0,-1);
+			$output_history = substr($output_history, 0, -1);
 			$output_history .= ']}},';
 			$output .= $output_history;
 		}
 	}
 }
-if (isset($output_data)) $output = substr($output,0,-1);
+if (isset($output_data)) $output = substr($output, 0, -1);
 $output .= ']}';
 print $output;
 ?>