Completed
Push — master ( c3eca6...804bdc )
by Yannick
51:24 queued 25:06
created
accident-latest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 $page_url = $globalURL.'/accident-latest';
10 10
 
11
-if(!isset($_GET['limit']))
11
+if (!isset($_GET['limit']))
12 12
 {
13 13
 	$limit_start = 0;
14 14
 	$limit_end = 25;
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
 print '<div class="table column">';
35 35
 print '<p>'._("The table below shows the latest Accidents.").'</p>';
36
-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'accident');
36
+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'accident');
37 37
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
38 38
 	include('table-output.php');
39 39
 	print '<div class="pagination">';
Please login to merge, or discard this patch.
js/map-satellite.2d.js.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 require_once('../require/settings.php');
3 3
 require_once('../require/class.Language.php'); 
4 4
 
5
-setcookie("MapFormat",'2d');
5
+setcookie("MapFormat", '2d');
6 6
 
7 7
 // Compressed GeoJson is used if true
8 8
 if (!isset($globalJsonCompress)) $compress = true;
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 
19 19
 <?php
20 20
 	if (isset($_GET['famsatid'])) {
21
-		$famsatid = filter_input(INPUT_GET,'famsatid',FILTER_SANITIZE_STRING);
21
+		$famsatid = filter_input(INPUT_GET, 'famsatid', FILTER_SANITIZE_STRING);
22 22
 	}
23 23
 	if (isset($_GET['ident'])) {
24
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
24
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
25 25
 	}
26 26
 	if (!isset($ident) && !isset($famsatid)) {
27 27
 ?>
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 <?php
195 195
 		} else {
196 196
 ?>
197
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
197
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
198 198
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
199 199
 <?php
200 200
 		}
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 			    /*
211 211
 			    shadowUrl: iconURLShadowpath,
212 212
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
213
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
213
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
214 214
 			    */
215 215
 			})
216 216
 		    })
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 <?php
251 251
 		} else {
252 252
 ?>
253
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
253
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
254 254
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
255 255
 <?php
256 256
 		}
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 <?php
306 306
 		} else {
307 307
 ?>
308
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
308
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
309 309
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
310 310
 <?php
311 311
 		}
Please login to merge, or discard this patch.
airline.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 if (isset($_POST['airline']))
10 10
 {
11
-	header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST,'airline',FILTER_SANITIZE_STRING));
11
+	header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST, 'airline', FILTER_SANITIZE_STRING));
12 12
 } else {
13 13
 	$title = "Airlines";
14 14
 	require_once('header.php');
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	print '<div class="column">';
18 18
 	print '<h1>'._("Airlines").'</h1>';
19 19
 	if (isset($_POST['airline_type'])) {
20
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
20
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
21 21
 		//$airline_names = $Spotter->getAllAirlineNames($airline_type);
22 22
 	} else {
23 23
 		//$airline_names = $Spotter->getAllAirlineNames();
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
29 29
 		print '<div class="alphabet">';
30 30
 		foreach ($alliances as $alliance) {
31 31
 			print '<div class="alphabet-airline alphabet-item">';
32
-			print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ','_',$alliance['alliance']).'">';
33
-			if (file_exists('images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png'))
32
+			print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ', '_', $alliance['alliance']).'">';
33
+			if (file_exists('images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png'))
34 34
 			{
35
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> ';
35
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> ';
36 36
 			} else print $alliance['alliance'];
37 37
 			print '</a>';
38 38
 			print '</div>';
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	$Stats = new Stats();
56 56
 	if (isset($_POST['airline_type'])) 
57 57
 	{
58
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
58
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
59 59
 		//$airline_names = $Stats->getAllAirlineNames($airline_type);
60 60
 		$airline_names = $Spotter->getAllAirlineNames($airline_type);
61 61
 	} else {
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
68 68
 	}
69 69
 	$previous = null;
70 70
 	print '<div class="alphabet-legend">';
71
-	foreach($airline_names as $value) 
71
+	foreach ($airline_names as $value) 
72 72
 	{
73 73
 		//echo $value['airline_name']."\n";
74 74
 		//echo mb_substr($value['airline_name'],0,1).' - '.$value['airline_name']."\n";
75 75
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1));
76
-		if($previous !== $firstLetter)
76
+		if ($previous !== $firstLetter)
77 77
 		{
78 78
 			if ($previous !== null) print ' | ';
79 79
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
@@ -82,11 +82,11 @@  discard block
 block discarded – undo
82 82
 	}
83 83
 	print '</div>';
84 84
 	$previous = null;
85
-	foreach($airline_names as $value) {
85
+	foreach ($airline_names as $value) {
86 86
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1));
87 87
 		if ($firstLetter != "")
88 88
 		{
89
-			if($previous !== $firstLetter)
89
+			if ($previous !== $firstLetter)
90 90
 			{
91 91
 				if ($previous !== null) print '</div>';
92 92
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
Please login to merge, or discard this patch.
install/class.create_db.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -8,25 +8,25 @@  discard block
 block discarded – undo
8 8
 	 * @param string $filename
9 9
 	 */
10 10
 	public static function import_file($filename) {
11
-		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
11
+		$filename = filter_var($filename, FILTER_SANITIZE_STRING);
12 12
 		$Connection = new Connection();
13 13
 		if (!$Connection->connectionExists()) return 'error: DB connection failed';
14 14
 		//Connection::$db->beginTransaction();
15 15
 		$templine = '';
16
-		$handle = @fopen($filename,"r");
16
+		$handle = @fopen($filename, "r");
17 17
 		if ($handle) {
18 18
 			//$lines = file($filename);
19 19
 			//foreach ($lines as $line)
20
-			while (($line = fgets($handle,4096)) !== false)
20
+			while (($line = fgets($handle, 4096)) !== false)
21 21
 			{
22
-				if (substr($line,0,2) == '--' || $line == '') continue;
22
+				if (substr($line, 0, 2) == '--' || $line == '') continue;
23 23
 				$templine .= $line;
24
-				if (substr(trim($line), -1,1) == ';')
24
+				if (substr(trim($line), -1, 1) == ';')
25 25
 				{
26 26
 					try {
27 27
 						$sth = $Connection->db->prepare($templine);
28 28
 						$sth->execute();
29
-					} catch(PDOException $e) {
29
+					} catch (PDOException $e) {
30 30
 						return "error (import ".$filename.") : ".$e->getMessage()."\n";
31 31
 					}
32 32
 					$templine = '';
@@ -43,21 +43,21 @@  discard block
 block discarded – undo
43 43
 		$error = '';
44 44
 		$dh = opendir($directory);
45 45
 		//foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename)
46
-		while(false !== ($filename = readdir($dh)))
46
+		while (false !== ($filename = readdir($dh)))
47 47
 		{
48
-			if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename);
48
+			if (preg_match('/\.sql$/', $filename)) $error .= create_db::import_file($directory.$filename);
49 49
 		}
50 50
 		return $error;
51 51
 	}
52 52
 
53
-	public static function create_database($root,$root_pass,$user,$pass,$db,$db_type,$host,$port = '') {
54
-		$root = filter_var($root,FILTER_SANITIZE_STRING);
55
-		$root_pass = filter_var($root_pass,FILTER_SANITIZE_STRING);
56
-		$user = filter_var($user,FILTER_SANITIZE_STRING);
57
-		$password = filter_var($pass,FILTER_SANITIZE_STRING);
58
-		$db = filter_var($db,FILTER_SANITIZE_STRING);
59
-		$db_type = filter_var($db_type,FILTER_SANITIZE_STRING);
60
-		$host = filter_var($host,FILTER_SANITIZE_STRING);
53
+	public static function create_database($root, $root_pass, $user, $pass, $db, $db_type, $host, $port = '') {
54
+		$root = filter_var($root, FILTER_SANITIZE_STRING);
55
+		$root_pass = filter_var($root_pass, FILTER_SANITIZE_STRING);
56
+		$user = filter_var($user, FILTER_SANITIZE_STRING);
57
+		$password = filter_var($pass, FILTER_SANITIZE_STRING);
58
+		$db = filter_var($db, FILTER_SANITIZE_STRING);
59
+		$db_type = filter_var($db_type, FILTER_SANITIZE_STRING);
60
+		$host = filter_var($host, FILTER_SANITIZE_STRING);
61 61
 		if ($db_type == 'mysql' && $port == '') $port = 3306;
62 62
 		elseif ($port == '') $port = 5432;
63 63
 		// Dirty hack
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 			$grantright = $_SERVER['SERVER_ADDR'];
66 66
 		} else $grantright = 'localhost';
67 67
 		try {
68
-			if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass);
69
-			else $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass);
68
+			if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1', $root, $root_pass);
69
+			else $dbh = new PDO($db_type.':host='.$host.';port='.$port, $root, $root_pass);
70 70
 			$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
71 71
 			if ($db_type == 'mysql') {
72 72
 				$dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 				$dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."';
77 77
 					GRANT ALL PRIVILEGES ON DATABASE ".$db." TO ".$user.";");
78 78
 			}
79
-		} catch(PDOException $e) {
79
+		} catch (PDOException $e) {
80 80
 			$dbh = null;
81 81
 			return "error : ".$e->getMessage();
82 82
 		}
Please login to merge, or discard this patch.
require/class.Satellite.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 		try {
21 21
 			$sth = $this->db->prepare($query);
22 22
 			$sth->execute(array(':name' => $name));
23
-		} catch(PDOException $e) {
23
+		} catch (PDOException $e) {
24 24
 			echo $e->getMessage();
25 25
 		}
26 26
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 		try {
33 33
 			$sth = $this->db->prepare($query);
34 34
 			$sth->execute();
35
-		} catch(PDOException $e) {
35
+		} catch (PDOException $e) {
36 36
 			echo $e->getMessage();
37 37
 		}
38 38
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		try {
45 45
 			$sth = $this->db->prepare($query);
46 46
 			$sth->execute();
47
-		} catch(PDOException $e) {
47
+		} catch (PDOException $e) {
48 48
 			echo $e->getMessage();
49 49
 		}
50 50
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		try {
57 57
 			$sth = $this->db->prepare($query);
58 58
 			$sth->execute(array(':type' => $type));
59
-		} catch(PDOException $e) {
59
+		} catch (PDOException $e) {
60 60
 			echo $e->getMessage();
61 61
 		}
62 62
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -64,49 +64,49 @@  discard block
 block discarded – undo
64 64
 		else return array();
65 65
 	}
66 66
 	
67
-	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
67
+	public function position_all($timestamp_begin = '', $timestamp_end = '', $second = 10) {
68 68
 		$all_sat = $this->get_tle_names();
69 69
 		$result = array();
70 70
 		foreach ($all_sat as $sat) {
71
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
72
-			$result = array_merge($position,$result);
71
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
72
+			$result = array_merge($position, $result);
73 73
 		}
74 74
 		return $result;
75 75
 	}
76 76
 
77
-	public function position_all_type($type,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
77
+	public function position_all_type($type, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
78 78
 		$all_sat = $this->get_tle_names_type($type);
79 79
 		$result = array();
80 80
 		foreach ($all_sat as $sat) {
81
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
82
-			if (isset($position[0])) $result = array_merge($position,$result);
81
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
82
+			if (isset($position[0])) $result = array_merge($position, $result);
83 83
 			else $result[] = $position;
84 84
 		}
85 85
 		return $result;
86 86
 	}
87 87
 
88
-	public function position($name,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
88
+	public function position($name, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
89 89
 		$qth = new Predict_QTH();
90 90
 		$qth->lat = floatval(37.790252);
91 91
 		$qth->lon = floatval(-122.419968);
92 92
 	
93 93
 		$tle_file = $this->get_tle($name);
94 94
 		$type = $tle_file['tle_type'];
95
-		$tle = new Predict_TLE($tle_file['tle_name'],$tle_file['tle_tle1'],$tle_file['tle_tle2']);
95
+		$tle = new Predict_TLE($tle_file['tle_name'], $tle_file['tle_tle1'], $tle_file['tle_tle2']);
96 96
 		$sat = new Predict_Sat($tle);
97 97
 		$predict = new Predict();
98 98
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
99 99
 		if ($timestamp_begin == '') $timestamp_begin = time();
100 100
 		if ($timestamp_end == '') {
101 101
 			$now = Predict_Time::unix2daynum($timestamp_begin);
102
-			$predict->predict_calc($sat,$qth,$now);
103
-			return array('name' => $name, 'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp_begin,'type' => $type);
102
+			$predict->predict_calc($sat, $qth, $now);
103
+			return array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp_begin, 'type' => $type);
104 104
 		} else {
105 105
 			$result = array();
106
-			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp=$timestamp+$second) {
106
+			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp = $timestamp + $second) {
107 107
 				$now = Predict_Time::unix2daynum($timestamp);
108
-				$predict->predict_calc($sat,$qth,$now);
109
-				$result[] = array('name' => $name,'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp,'type' => $type);
108
+				$predict->predict_calc($sat, $qth, $now);
109
+				$result[] = array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp, 'type' => $type);
110 110
 			}
111 111
 			return $result;
112 112
 		}
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 		try {
118 118
 			$sth = $this->db->prepare($query);
119 119
 			$sth->execute(array(':name' => $name.'%'));
120
-		} catch(PDOException $e) {
120
+		} catch (PDOException $e) {
121 121
 			echo $e->getMessage();
122 122
 		}
123 123
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 		$sth->execute($query_values);
146 146
 		$launch_site_array = array();
147 147
 		$temp_array = array();
148
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
148
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
149 149
 		{
150 150
 			$temp_array['launch_site'] = $row['launch_site'];
151 151
 			$temp_array['launch_site_count'] = $row['launch_site_count'];
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 		$sth->execute($query_values);
175 175
 		$owner_array = array();
176 176
 		$temp_array = array();
177
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
177
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
178 178
 		{
179 179
 			$temp_array['owner_name'] = $row['owner_name'];
180 180
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 		$sth->execute($query_values);
204 204
 		$owner_array = array();
205 205
 		$temp_array = array();
206
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
206
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
207 207
 		{
208 208
 			$temp_array['country_name'] = $row['country_name'];
209 209
 			$temp_array['country_count'] = $row['country_count'];
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 		$sth->execute($query_data);
248 248
 		$date_array = array();
249 249
 		$temp_array = array();
250
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
250
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
251 251
 		{
252 252
 			$temp_array['year_name'] = $row['year_name'];
253 253
 			$temp_array['month_name'] = $row['month_name'];
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 		$sth->execute($query_data);
293 293
 		$date_array = array();
294 294
 		$temp_array = array();
295
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
295
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
296 296
 		{
297 297
 			$temp_array['year_name'] = $row['year_name'];
298 298
 			$temp_array['date_count'] = $row['date_count'];
Please login to merge, or discard this patch.
live-sat-geojson.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 		header('Content-disposition: attachment; filename="flightairmap-sat.json"');
14 14
 	}
15 15
 }
16
-$history = urldecode(filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING));
16
+$history = urldecode(filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING));
17 17
 header('Content-Type: text/javascript');
18 18
 
19 19
 $begintime = microtime(true);
@@ -21,10 +21,10 @@  discard block
 block discarded – undo
21 21
 
22 22
 $spotter_array = array();
23 23
 if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') {
24
-	$sattypes = explode(',',$_COOKIE['sattypes']);
24
+	$sattypes = explode(',', $_COOKIE['sattypes']);
25 25
 	foreach ($sattypes as $sattype) {
26 26
 		//$spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array);
27
-		$spotter_array = array_merge($Satellite->position_all_type($sattype),$spotter_array);
27
+		$spotter_array = array_merge($Satellite->position_all_type($sattype), $spotter_array);
28 28
 	}
29 29
 }
30 30
 
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
 //$spotter_array = array_unique($spotter_array,SORT_REGULAR);
38 38
 //print_r($spotter_array);
39
-$sqltime = round(microtime(true)-$begintime,2);
39
+$sqltime = round(microtime(true) - $begintime, 2);
40 40
 
41 41
 $output = '{"type":"FeatureCollection","features":[';
42 42
 if (!empty($spotter_array) && is_array($spotter_array))
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	$last_name = '';
45 45
 	$coordinatearray = '';
46 46
 	$timearray = array();
47
-	foreach($spotter_array as $spotter_item)
47
+	foreach ($spotter_array as $spotter_item)
48 48
 	{
49 49
 		$output_data = '';
50 50
 		$output_data .= '{"type":"Feature","properties":{';
@@ -61,14 +61,14 @@  discard block
 block discarded – undo
61 61
 		}
62 62
 		$output_data .= '"altitude":0,';
63 63
 		$output_data .= '"sqt":'.$sqltime.',';
64
-		$nextlatlon = $Satellite->position($spotter_item['name'],time()+$globalMapRefresh+20);
64
+		$nextlatlon = $Satellite->position($spotter_item['name'], time() + $globalMapRefresh + 20);
65 65
 		$nextlat = $nextlatlon['latitude'];
66
-		if (abs($nextlat-$spotter_item['latitude']) > 90) {
66
+		if (abs($nextlat - $spotter_item['latitude']) > 90) {
67 67
 			if ($spotter_item['latitude'] < 0) $nexlat = -90;
68 68
 			else $nexlat = 90;
69 69
 		}
70 70
 		$nextlon = $nextlatlon['longitude'];
71
-		if (abs($nextlon-$spotter_item['longitude']) > 180) {
71
+		if (abs($nextlon - $spotter_item['longitude']) > 180) {
72 72
 			if ($spotter_item['longitude'] < 0) $nextlon = -180;
73 73
 			else $nextlon = 180;
74 74
 		}
@@ -79,27 +79,27 @@  discard block
 block discarded – undo
79 79
 		$output_data .= ']}},';
80 80
 		$output .= $output_data;
81 81
 		if ($history == $spotter_item['name']) {
82
-			$spotter_history_array = $Satellite->position($spotter_item['name'],time()-6000,time());
82
+			$spotter_history_array = $Satellite->position($spotter_item['name'], time() - 6000, time());
83 83
 			$spotter_history_array = array_reverse($spotter_history_array);
84 84
 			$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['name'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
85 85
 			foreach ($spotter_history_array as $key => $spotter_history) {
86
-				if ((isset($previous_lon) && abs($previous_lon-$spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat-$spotter_history['latitude']) > 90)) {
86
+				if ((isset($previous_lon) && abs($previous_lon - $spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat - $spotter_history['latitude']) > 90)) {
87 87
 					break;
88 88
 				}
89 89
 				$output_history .= '[';
90
-				$output_history .=  $spotter_history['longitude'].', ';
91
-				$output_history .=  $spotter_history['latitude'];
90
+				$output_history .= $spotter_history['longitude'].', ';
91
+				$output_history .= $spotter_history['latitude'];
92 92
 				$output_history .= '],';
93 93
 				$previous_lon = $spotter_history['longitude'];
94 94
 				$previous_lat = $spotter_history['latitude'];
95 95
 			}
96
-			$output_history = substr($output_history,0,-1);
96
+			$output_history = substr($output_history, 0, -1);
97 97
 			$output_history .= ']}},';
98 98
 			$output .= $output_history;
99 99
 		}
100 100
 	}
101 101
 }
102
-if (isset($output_data)) $output = substr($output,0,-1);
102
+if (isset($output_data)) $output = substr($output, 0, -1);
103 103
 $output .= ']}';
104 104
 print $output;
105 105
 ?>
Please login to merge, or discard this patch.
live-sat-czml.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -20,17 +20,17 @@  discard block
 block discarded – undo
20 20
 
21 21
 $spotter_array = array();
22 22
 if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') {
23
-	$sattypes = explode(',',$_COOKIE['sattypes']);
23
+	$sattypes = explode(',', $_COOKIE['sattypes']);
24 24
 	foreach ($sattypes as $sattype) {
25
-		$spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array);
25
+		$spotter_array = array_merge($Satellite->position_all_type($sattype, $timeb - $globalLiveInterval, $timeb), $spotter_array);
26 26
 	}
27 27
 }
28 28
 if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) {
29
-	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)',time()-$globalLiveInterval,time()),$spotter_array);
30
-	$spotter_array = array_merge($Satellite->position('TIANGONG 1',time()-$globalLiveInterval,time()),$spotter_array);
31
-	$spotter_array = array_merge($Satellite->position('TIANGONG-2',time()-$globalLiveInterval,time()),$spotter_array);
29
+	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)', time() - $globalLiveInterval, time()), $spotter_array);
30
+	$spotter_array = array_merge($Satellite->position('TIANGONG 1', time() - $globalLiveInterval, time()), $spotter_array);
31
+	$spotter_array = array_merge($Satellite->position('TIANGONG-2', time() - $globalLiveInterval, time()), $spotter_array);
32 32
 }
33
-$spotter_array = array_unique($spotter_array,SORT_REGULAR);
33
+$spotter_array = array_unique($spotter_array, SORT_REGULAR);
34 34
 /*
35 35
 $modelsdb = array();
36 36
 if (file_exists('models/space/space_modelsdb')) {
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}';
55 55
 
56 56
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
57
-$output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
57
+$output .= ',"clock": {"currentTime" : "'.date("c", time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
58 58
 //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
59 59
 
60 60
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"step": "SYSTEM_CLOCK_MULTIPLIER"}';
61 61
 $output .= '},';
62 62
 if (!empty($spotter_array) && is_array($spotter_array))
63 63
 {
64
-	foreach($spotter_array as $spotter_item)
64
+	foreach ($spotter_array as $spotter_item)
65 65
 	{
66 66
 		$j++;
67 67
 		date_default_timezone_set('UTC');
@@ -115,23 +115,23 @@  discard block
 block discarded – undo
115 115
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubiesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
116 116
 				} elseif ($spotter_item['name'] == 'TERRA') {
117 117
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/terra.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
118
-				} elseif (strpos($spotter_item['name'],'O3B') !== false) {
118
+				} elseif (strpos($spotter_item['name'], 'O3B') !== false) {
119 119
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/o3b.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
120
-				} elseif (strpos($spotter_item['name'],'GLOBALSTAR') !== false) {
120
+				} elseif (strpos($spotter_item['name'], 'GLOBALSTAR') !== false) {
121 121
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/globalstar.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
122
-				} elseif (strpos($spotter_item['name'],'GPS') !== false) {
122
+				} elseif (strpos($spotter_item['name'], 'GPS') !== false) {
123 123
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/gps.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
124
-				} elseif (strpos($spotter_item['name'],'GENESIS') !== false) {
124
+				} elseif (strpos($spotter_item['name'], 'GENESIS') !== false) {
125 125
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/genesis.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
126
-				} elseif (strpos($spotter_item['name'],'OSCAR 7') !== false) {
126
+				} elseif (strpos($spotter_item['name'], 'OSCAR 7') !== false) {
127 127
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/oscar7.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
128
-				} elseif (strpos($spotter_item['name'],'FLOCK') !== false) {
128
+				} elseif (strpos($spotter_item['name'], 'FLOCK') !== false) {
129 129
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
130
-				} elseif (strpos($spotter_item['name'],'PLEIADES') !== false) {
130
+				} elseif (strpos($spotter_item['name'], 'PLEIADES') !== false) {
131 131
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/pleiades.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
132
-				} elseif (strpos($spotter_item['name'],'DUCHIFAT') !== false) {
132
+				} elseif (strpos($spotter_item['name'], 'DUCHIFAT') !== false) {
133 133
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/duchifat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
134
-				} elseif (strpos($spotter_item['name'],'FORMOSAT-2') !== false) {
134
+				} elseif (strpos($spotter_item['name'], 'FORMOSAT-2') !== false) {
135 135
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/formosat2.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
136 136
 				} elseif ($spotter_item['type'] == 'iridium') {
137 137
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/iridium.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
@@ -153,14 +153,14 @@  discard block
 block discarded – undo
153 153
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
154 154
 			$output .= '"interpolationAlgorithm":"HERMITE","interpolationDegree":3,';
155 155
 			$output .= '"cartographicDegrees": [';
156
-			$output .= '"'.date("c",$spotter_item['timestamp']).'", ';
156
+			$output .= '"'.date("c", $spotter_item['timestamp']).'", ';
157 157
 			$output .= $spotter_item['longitude'].', ';
158 158
 			$output .= $spotter_item['latitude'].', ';
159 159
 			$output .= $spotter_item['altitude']*1000;
160 160
 			$orientation = '"orientation" : { ';
161 161
 			$orientation .= '"unitQuaternion": [';
162 162
 		} else {
163
-			$output .= ',"'.date("c",$spotter_item['timestamp']).'", ';
163
+			$output .= ',"'.date("c", $spotter_item['timestamp']).'", ';
164 164
 			$output .= $spotter_item['longitude'].', ';
165 165
 			$output .= $spotter_item['latitude'].', ';
166 166
 			$output .= $spotter_item['altitude']*1000;
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 require_once('require/class.Language.php');
5 5
 require_once('require/class.Satellite.php');
6 6
 
7
-$trackident = filter_input(INPUT_GET,'trackid',FILTER_SANITIZE_STRING);
7
+$trackident = filter_input(INPUT_GET, 'trackid', FILTER_SANITIZE_STRING);
8 8
 if ($trackident != '') {
9 9
 	require_once('require/class.SpotterLive.php');
10 10
 	$SpotterLive = new SpotterLive();
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 		$spotterid = $Spotter->getSpotterIDBasedOnFlightAwareID($trackident);
15 15
 		header('Location: '.$globalURL.'/flightid/'.$spotterid);
16 16
 	} else {
17
-		setcookie('MapTrack',$resulttrackident[0]['flightaware_id']);
17
+		setcookie('MapTrack', $resulttrackident[0]['flightaware_id']);
18 18
 	}
19 19
 } else {
20 20
 	unset($_COOKIE['MapTrack']);
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 		        <div class="form-group">
195 195
 			    <label>From (UTC):</label>
196 196
 		            <div class='input-group date' id='datetimepicker1'>
197
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
197
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a", $_COOKIE['archive_begin']); ?>" required />
198 198
 		                <span class="input-group-addon">
199 199
             			    <span class="glyphicon glyphicon-calendar"></span>
200 200
 		                </span>
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 		        <div class="form-group">
204 204
 			    <label>To (UTC):</label>
205 205
 		            <div class='input-group date' id='datetimepicker2'>
206
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" />
206
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a", $_COOKIE['archive_end']); ?>" />
207 207
             			<span class="input-group-addon">
208 208
 		                    <span class="glyphicon glyphicon-calendar"></span>
209 209
             			</span>
@@ -327,9 +327,9 @@  discard block
 block discarded – undo
327 327
 		    <li><?php echo _("Type of Terrain:"); ?>
328 328
 			<select  class="selectpicker" onchange="terrainType(this);">
329 329
 			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
330
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
331
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
332
-			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option>
330
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected'; ?>>ellipsoid</option>
331
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected'; ?>>vr terrain</option>
332
+			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected'; ?>>ArticDEM</option>
333 333
 			</select>
334 334
 		    </li>
335 335
 <?php
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
366 366
 <?php
367 367
     }
368
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
368
+    if (time() > mktime(0, 0, 0, 12, 1, date("Y")) && time() < mktime(0, 0, 0, 12, 31, date("Y"))) {
369 369
 ?>
370 370
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
371 371
 <?php
@@ -541,10 +541,10 @@  discard block
 block discarded – undo
541 541
 					$Spotter = new Spotter();
542 542
 					$allairlinenames = $Spotter->getAllAirlineNames();
543 543
 				}
544
-				foreach($allairlinenames as $airline) {
544
+				foreach ($allairlinenames as $airline) {
545 545
 					$airline_name = $airline['airline_name'];
546
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
547
-					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
546
+					if (strlen($airline_name) > 30) $airline_name = substr($airline_name, 0, 30).'...';
547
+					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'], explode(',', $_COOKIE['filter_Airlines']))) {
548 548
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
549 549
 					} else {
550 550
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
564 564
 			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
565 565
 			    <?php
566
-				foreach($allalliancenames as $alliance) {
566
+				foreach ($allalliancenames as $alliance) {
567 567
 					$alliance_name = $alliance['alliance'];
568 568
 					if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] == $alliance_name) {
569 569
 						echo '<option value="'.$alliance_name.'" selected>'.$alliance_name.'</option>';
@@ -599,8 +599,8 @@  discard block
 block discarded – undo
599 599
 				*/
600 600
 				$Source = new Source();
601 601
 				$datasource = $Source->getLocationInfoByType('gs');
602
-				foreach($datasource as $src) {
603
-					if (isset($_COOKIE['filter_Sources']) && in_array($src['name'],explode(',',$_COOKIE['filter_Sources']))) {
602
+				foreach ($datasource as $src) {
603
+					if (isset($_COOKIE['filter_Sources']) && in_array($src['name'], explode(',', $_COOKIE['filter_Sources']))) {
604 604
 						echo '<option value="'.$src['name'].'" selected>'.$src['name'].'</option>';
605 605
 					} else {
606 606
 						echo '<option value="'.$src['name'].'">'.$src['name'].'</option>';
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
 					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
680 680
 					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
681 681
 					
682
-					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
682
+					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'], explode(',', $_COOKIE['sattypes']))) {
683 683
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';
684 684
 					} else {
685 685
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
Please login to merge, or discard this patch.
location-data.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 $Source = new Source();
6 6
 
7 7
 if (isset($_GET['sourceid'])) {
8
-	$sourceid = filter_input(INPUT_GET,'sourceid',FILTER_SANITIZE_NUMBER_INT);
8
+	$sourceid = filter_input(INPUT_GET, 'sourceid', FILTER_SANITIZE_NUMBER_INT);
9 9
 	$source_data = $Source->getLocationInfoById($sourceid);
10 10
 	if (isset($source_data[0])) {
11 11
  ?>
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 print '</div>';
38 38
 
39 39
 if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
40
-if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
41
-print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>';
40
+if ($spotter_item['country'] != '') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
41
+print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 4).', '.round($spotter_item['longitude'], 4).'</div>';
42 42
 /*
43 43
 if ($spotter_item['atc_range'] > 0) {
44 44
     print '<div><span>'._("Range").'</span>';
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 }
48 48
 */
49 49
 if ($spotter_item['type'] == 'wx') {
50
-	$weather = json_decode($spotter_item['description'],true);
50
+	$weather = json_decode($spotter_item['description'], true);
51 51
 	//print_r($weather);
52 52
 	if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
53 53
 	if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
Please login to merge, or discard this patch.