Ysurac / FlightAirMap

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

live-sat-czml.php

Spacing +19 added lines, -19 removed lines

@@ -20,17 +20,17 @@ 
 
 $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, $timeb - $globalLiveInterval, $timeb), $spotter_array);
 	}
 }
 if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) {
-	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)',time()-$globalLiveInterval,time()),$spotter_array);
-	$spotter_array = array_merge($Satellite->position('TIANGONG 1',time()-$globalLiveInterval,time()),$spotter_array);
-	$spotter_array = array_merge($Satellite->position('TIANGONG-2',time()-$globalLiveInterval,time()),$spotter_array);
+	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)', time() - $globalLiveInterval, time()), $spotter_array);
+	$spotter_array = array_merge($Satellite->position('TIANGONG 1', time() - $globalLiveInterval, time()), $spotter_array);
+	$spotter_array = array_merge($Satellite->position('TIANGONG-2', time() - $globalLiveInterval, time()), $spotter_array);
 }
-$spotter_array = array_unique($spotter_array,SORT_REGULAR);
+$spotter_array = array_unique($spotter_array, SORT_REGULAR);
 /*
 $modelsdb = array();
 if (file_exists('models/space/space_modelsdb')) {
@@ -54,14 +54,14 @@ 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
-$output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
+$output .= ',"clock": {"currentTime" : "'.date("c", time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"step": "SYSTEM_CLOCK_MULTIPLIER"}';
 $output .= '},';
 if (!empty($spotter_array) && is_array($spotter_array))
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$j++;
 		date_default_timezone_set('UTC');
@@ -115,23 +115,23 @@ 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubiesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
 				} elseif ($spotter_item['name'] == 'TERRA') {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/terra.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'O3B') !== false) {
+				} elseif (strpos($spotter_item['name'], 'O3B') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/o3b.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GLOBALSTAR') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GLOBALSTAR') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/globalstar.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GPS') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GPS') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/gps.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GENESIS') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GENESIS') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/genesis.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'OSCAR 7') !== false) {
+				} elseif (strpos($spotter_item['name'], 'OSCAR 7') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/oscar7.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'FLOCK') !== false) {
+				} elseif (strpos($spotter_item['name'], 'FLOCK') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'PLEIADES') !== false) {
+				} elseif (strpos($spotter_item['name'], 'PLEIADES') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/pleiades.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'DUCHIFAT') !== false) {
+				} elseif (strpos($spotter_item['name'], 'DUCHIFAT') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/duchifat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'FORMOSAT-2') !== false) {
+				} elseif (strpos($spotter_item['name'], 'FORMOSAT-2') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/formosat2.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
 				} elseif ($spotter_item['type'] == 'iridium') {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/iridium.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
@@ -153,14 +153,14 @@ 
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= '"interpolationAlgorithm":"HERMITE","interpolationDegree":3,';
 			$output .= '"cartographicDegrees": [';
-			$output .= '"'.date("c",$spotter_item['timestamp']).'", ';
+			$output .= '"'.date("c", $spotter_item['timestamp']).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
 			$output .= $spotter_item['altitude']*1000;
 			$orientation = '"orientation" : { ';
 			$orientation .= '"unitQuaternion": [';
 		} else {
-			$output .= ',"'.date("c",$spotter_item['timestamp']).'", ';
+			$output .= ',"'.date("c", $spotter_item['timestamp']).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
 			$output .= $spotter_item['altitude']*1000;

location-data.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
 $Source = new Source();
 
 if (isset($_GET['sourceid'])) {
-	$sourceid = filter_input(INPUT_GET,'sourceid',FILTER_SANITIZE_NUMBER_INT);
+	$sourceid = filter_input(INPUT_GET, 'sourceid', FILTER_SANITIZE_NUMBER_INT);
 	$source_data = $Source->getLocationInfoById($sourceid);
 	if (isset($source_data[0])) {
  ?>
@@ -37,8 +37,8 @@ 
 print '</div>';
 
 if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
-if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
-print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>';
+if ($spotter_item['country'] != '') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
+print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 4).', '.round($spotter_item['longitude'], 4).'</div>';
 /*
 if ($spotter_item['atc_range'] > 0) {
     print '<div><span>'._("Range").'</span>';
@@ -47,7 +47,7 @@ 
 }
 */
 if ($spotter_item['type'] == 'wx') {
-	$weather = json_decode($spotter_item['description'],true);
+	$weather = json_decode($spotter_item['description'], true);
 	//print_r($weather);
 	if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
 	if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';

require/class.Source.php

Spacing +30 added lines, -30 removed lines

@@ -16,7 +16,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -29,20 +29,20 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function getLocationInfobyNameType($name,$type) {
+	public function getLocationInfobyNameType($name, $type) {
 		$query = "SELECT * FROM source_location WHERE name = :name AND type = :type";
-		$query_values = array(':name' => $name,':type' => $type);
+		$query_values = array(':name' => $name, ':type' => $type);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -55,7 +55,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -65,10 +65,10 @@ 
 	public function getLocationInfoByType($type, $coord = array(), $limit = false) {
 		$query = "SELECT * FROM source_location WHERE type = :type";
 		if (is_array($coord) && !empty($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 			$query .= " AND source_location.latitude BETWEEN ".$minlat." AND ".$maxlat." AND source_location.longitude BETWEEN ".$minlong." AND ".$maxlong." AND source_location.latitude <> 0 AND source_location.longitude <> 0";
 		}
 		$query .= " ORDER BY last_seen DESC";
@@ -77,7 +77,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -90,7 +90,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -103,56 +103,56 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
+	public function addLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') {
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
-		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
+		$query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 	}
 
-	public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') {
+	public function updateLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') {
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source";
-		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
+		$query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
 
-	public function updateLocationDescByName($name,$source,$source_id = 0,$description = '') {
+	public function updateLocationDescByName($name, $source, $source_id = 0, $description = '') {
 		$query = "UPDATE source_location SET description = :description WHERE source_id = :source_id AND name = :name AND source = :source";
-		$query_values = array(':name' => $name,':source' => $source,':source_id' => $source_id,':description' => $description);
+		$query_values = array(':name' => $name, ':source' => $source, ':source_id' => $source_id, ':description' => $description);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
 
-	public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') {
+	public function updateLocationByLocationID($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id, $last_seen = '', $description = '') {
 		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id";
-		$query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
+		$query_values = array(':source_id' => $source_id, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 	}
@@ -163,7 +163,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -174,7 +174,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -185,7 +185,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -195,7 +195,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -224,7 +224,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':type' => $type));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";

ident-detailed.php

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
 require_once('require/class.Language.php');
 require_once('require/class.Translation.php');
 $type = '';
-$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
+$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
 if (isset($_GET['marine'])) {
 	require_once('require/class.Marine.php');
 	require_once('require/class.MarineLive.php');
@@ -30,12 +30,12 @@ 
 	$page_url = $globalURL.'/ident/'.$_GET['ident'];
 }
 
-if (!isset($_GET['ident'])){
+if (!isset($_GET['ident'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Translation = new Translation();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
@@ -54,18 +54,18 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($type == 'aircraft') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 		if (empty($spotter_array)) {
@@ -74,14 +74,14 @@ 
 				$ident = $new_ident;
 				if ($sort != '') 
 				{
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					}
 				} else {
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					}
 				}
 			}
@@ -89,34 +89,34 @@ 
 	} elseif ($type == 'marine') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	} elseif ($type == 'tracker') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	}
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['ident']);
 		$ident = $spotter_array[0]['ident'];
 		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
 		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
@@ -135,7 +135,7 @@ 
 				$altitude_data = '';
 				$hour_data = '';
 				$speed_data = '';
-				foreach($all_data as $data)
+				foreach ($all_data as $data)
 				{
 					$hour_data .= '"'.$data['date'].'",';
 					if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
@@ -163,8 +163,8 @@ 
 					$speed_data .= $speed.',';
 				}
 				$hour_data = "['x',".substr($hour_data, 0, -1)."]";
-				$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
-				$speed_data = "['speed',".substr($speed_data,0,-1)."]";
+				$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
+				$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
 				print 'c3.generate({
 				    bindto: "#chart",
 				    data: {
@@ -208,9 +208,9 @@ 
 	
 		if ($type == 'aircraft') include('ident-sub-menu.php');
 		print '<div class="table column">';
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
+		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
+		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
 
 		include('table-output.php'); 
 		print '<div class="pagination">';

location-geojson.php

Spacing +15 added lines, -15 removed lines

@@ -12,52 +12,52 @@ 
 if (!isset($globalDemo)) {
 	if (isset($_GET['coord'])) 
 	{
-		$coords = explode(',',$_GET['coord']);
+		$coords = explode(',', $_GET['coord']);
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
 		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
 			//$spotter_array = $Source->getAllLocationInfo();
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs', $coords));
 		}
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
 		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx', $coords));
 		}
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
 		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning', $coords));
 		}
 		
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') 
 		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', $coords, true));
 		}
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
 	} else {
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
 		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
 			//$spotter_array = $Source->getAllLocationInfo();
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs'));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs'));
 		}
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
 		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx'));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx'));
 		}
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
 		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning'));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning'));
 		}
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') 
 		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', array(), true));
 		}
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
 	}
 }
 
 $output = '{"type": "FeatureCollection","features": [';
 if (!empty($spotter_array) && count($spotter_array) > 0)
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		$output .= '{"type": "Feature",';
@@ -76,8 +76,8 @@ 
 		$output .= '"icon": "'.$globalURL.'/images/'.$spotter_item['logo'].'",';
 		$output .= '"type": "'.$spotter_item['type'].'",';
 		if ($spotter_item['type'] == 'wx') {
-			$weather = json_decode($spotter_item['description'],true);
-			if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",';
+			$weather = json_decode($spotter_item['description'], true);
+			if (isset($weather['temp'])) $output .= '"temp": "'.$weather['temp'].'",';
 		}
 		$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
 		$output .= '},';
@@ -87,7 +87,7 @@ 
 		$output .= '}';
 		$output .= '},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 print $output;