Ysurac / FlightAirMap

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

Braces +42 added lines, -10 removed lines

@@ -5,8 +5,11 @@ 
 setcookie("MapFormat",'2d');
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 ?>
 
 
@@ -157,9 +160,13 @@ 
 		    if (callsign != ""){ markerTrackerLabel += callsign; }
 		    if (type != ""){ markerTrackerLabel += ' - '+type; }
 <?php
-	if (isset($_COOKIE['TrackerIconColor'])) $IconColor = $_COOKIE['TrackerIconColor'];
-	elseif (isset($globalTrackerIconColor)) $IconColor = $globalTrackerIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['TrackerIconColor'])) {
+		$IconColor = $_COOKIE['TrackerIconColor'];
+	} elseif (isset($globalTrackerIconColor)) {
+		$IconColor = $globalTrackerIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($famtrackid)) {
 ?>
 		    //info_tracker_update(feature.properties.fc);
@@ -193,7 +200,12 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -249,7 +261,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -304,7 +321,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -595,14 +617,24 @@ 
 	if (isset($archive) && $archive) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 reloadTrackerPage = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
 reloadTrackerPage = setInterval(
-    function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 <?php
 	}
 ?>

install/class.create_db.php

Braces +25 added lines, -9 removed lines

@@ -10,7 +10,9 @@ 
 	public static function import_file($filename) {
 		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
 		$Connection = new Connection();
-		if (!$Connection->connectionExists()) return 'error: DB connection failed';
+		if (!$Connection->connectionExists()) {
+			return 'error: DB connection failed';
+		}
 		//Connection::$db->beginTransaction();
 		$templine = '';
 		$handle = @fopen($filename,"r");
@@ -19,7 +21,9 @@ 
 			//foreach ($lines as $line)
 			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) == ';')
 				{
@@ -45,7 +49,9 @@ 
 		//foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename)
 		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;
 	}
@@ -58,19 +64,29 @@ 
 		$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;
+		if ($db_type == 'mysql' && $port == '') {
+			$port = 3306;
+		} elseif ($port == '') {
+			$port = 5432;
+		}
 		// Dirty hack
 		if ($host != 'localhost' && $host != '127.0.0.1') {
 			$grantright = $_SERVER['SERVER_ADDR'];
-		} else $grantright = 'localhost';
+		} 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;");
-				if ($grantright == 'localhost') $dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
+				if ($grantright == 'localhost') {
+					$dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
+				}
 			} else if ($db_type == 'pgsql') {
 				$dbh->exec("CREATE DATABASE ".$db.";");
 				$dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."';

require/class.Satellite.php

Braces +63 added lines, -23 removed lines

@@ -12,7 +12,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 	public function get_tle($name) {
@@ -24,8 +26,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_types() {
 		$query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type';
@@ -36,8 +41,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names() {
 		$query = 'SELECT DISTINCT tle_name, tle_type FROM tle';
@@ -48,8 +56,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names_type($type) {
 		$query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name';
@@ -60,8 +71,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	
 	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
@@ -79,8 +93,11 @@ 
 		$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);
-			else $result[] = $position;
+			if (isset($position[0])) {
+				$result = array_merge($position,$result);
+			} else {
+				$result[] = $position;
+			}
 		}
 		return $result;
 	}
@@ -96,7 +113,9 @@ 
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
-		if ($timestamp_begin == '') $timestamp_begin = time();
+		if ($timestamp_begin == '') {
+			$timestamp_begin = time();
+		}
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
 			$predict->predict_calc($sat,$qth,$now);
@@ -121,8 +140,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -140,7 +162,9 @@ 
 		    FROM satellite".$filter_query." satellite.launch_site <> '' AND satellite.launch_site IS NOT NULL";
 		$query_values = array();
 		$query .= " GROUP BY satellite.launch_site ORDER BY launch_site_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$launch_site_array = array();
@@ -169,7 +193,9 @@ 
 		    FROM satellite".$filter_query." satellite.owner <> '' AND satellite.owner IS NOT NULL";
 		$query_values = array();
 		$query .= " GROUP BY satellite.owner ORDER BY owner_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$owner_array = array();
@@ -198,7 +224,9 @@ 
 		    FROM satellite".$filter_query." satellite.country_owner <> '' AND satellite.country_owner IS NOT NULL";
 		$query_values = array();
 		$query .= " GROUP BY satellite.country_owner ORDER BY country_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$owner_array = array();
@@ -225,20 +253,26 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		//$filter_query = $this->getFilter($filters,true,true);
 		$filter_query = ' WHERE';
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name, month_name
 				ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
 		} else {
 			$query  = "SELECT EXTRACT(MONTH FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS month_name, EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 YEARS'";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name, month_name
 				ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
@@ -270,20 +304,26 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		//$filter_query = $this->getFilter($filters,true,true);
 		$filter_query = ' WHERE';
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 YEAR)";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name
 				ORDER BY year_name ASC";
 			$query_data = array(':offset' => $offset);
 		} else {
 			$query  = "SELECT EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '10 YEARS'";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name
 				ORDER BY year_name ASC";
 			$query_data = array(':offset' => $offset);

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

Braces +42 added lines, -10 removed lines

@@ -5,8 +5,11 @@ 
 setcookie("MapFormat",'2d');
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 $compress = false;
 ?>
 
@@ -159,9 +162,13 @@ 
 		    if (callsign != ""){ markerSatelliteLabel += callsign; }
 		    if (type != ""){ markerSatelliteLabel += ' - '+type; }
 <?php
-	if (isset($_COOKIE['SatelliteIconColor'])) $IconColor = $_COOKIE['SatelliteIconColor'];
-	elseif (isset($globalSatelliteIconColor)) $IconColor = $globalSatelliteIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['SatelliteIconColor'])) {
+		$IconColor = $_COOKIE['SatelliteIconColor'];
+	} elseif (isset($globalSatelliteIconColor)) {
+		$IconColor = $globalSatelliteIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($famsatid)) {
 ?>
 		    info_satellite_update(feature.properties.fc);
@@ -195,7 +202,12 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -251,7 +263,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -306,7 +323,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -601,14 +623,24 @@ 
 	if (isset($archive) && $archive) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 reloadSatellitePage = setInterval(function(){if (noTimeout) updateSat(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
 reloadSatellitePage = setInterval(
-    function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 <?php
 	}
 ?>

live-sat-geojson.php

Braces +13 added lines, -5 removed lines

@@ -64,13 +64,19 @@ 
 		$nextlatlon = $Satellite->position($spotter_item['name'],time()+$globalMapRefresh+20);
 		$nextlat = $nextlatlon['latitude'];
 		if (abs($nextlat-$spotter_item['latitude']) > 90) {
-			if ($spotter_item['latitude'] < 0) $nexlat = -90;
-			else $nexlat = 90;
+			if ($spotter_item['latitude'] < 0) {
+				$nexlat = -90;
+			} else {
+				$nexlat = 90;
+			}
 		}
 		$nextlon = $nextlatlon['longitude'];
 		if (abs($nextlon-$spotter_item['longitude']) > 180) {
-			if ($spotter_item['longitude'] < 0) $nextlon = -180;
-			else $nextlon = 180;
+			if ($spotter_item['longitude'] < 0) {
+				$nextlon = -180;
+			} else {
+				$nextlon = 180;
+			}
 		}
 		$output_data .= '"nextlatlon":['.$nextlat.','.$nextlon.']},';
 		//$output_data .= '"heading":"'.$Common->getHeading($spotter_item['latitude'],$spotter_item['longitude'],$nextlatlon['latitude'],$nextlatlon['longitude']).'",';
@@ -99,7 +105,9 @@ 
 		}
 	}
 }
-if (isset($output_data)) $output = substr($output,0,-1);
+if (isset($output_data)) {
+	$output = substr($output,0,-1);
+}
 $output .= ']}';
 print $output;
 ?>

js/map-aircraft.3d.js.php

Braces +24 added lines, -4 removed lines

@@ -218,7 +218,12 @@ 
 			<?php
 			    } else {
 			?>
-			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
+			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*2000;
+} else {
+	print '60000';
+}
+?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmlds.entities.removeById(entityid);
 			}
@@ -502,7 +507,12 @@ 
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
 ?>
 update_polarLayer();
-setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 		}
 ?>
@@ -613,7 +623,12 @@ 
 				}
 			}
 		}
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	,<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 } else {
 	//var widget = new Cesium.CesiumWidget('archivebox');
 //	var timeline = new Cesium.Timeline(viewer);
@@ -632,7 +647,12 @@ 
     if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 update_atcLayer();
-setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
     }
 ?>

js/map-marine.3d.js.php

Braces +12 added lines, -2 removed lines

@@ -47,7 +47,12 @@ 
 			<?php
 			    } else {
 			?>
-			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
+			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*2000;
+} else {
+	print '60000';
+}
+?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 			}
 			<?php
@@ -129,7 +134,12 @@ 
 		function(){
 			updateMarineData();
 		}
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	,<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 } else {
 	var clockViewModel = new Cesium.ClockViewModel(viewer.clock);
 	var animationViewModel = new Cesium.AnimationViewModel(clockViewModel);

js/map-tracker.3d.js.php

Braces +12 added lines, -2 removed lines

@@ -90,7 +90,12 @@ 
 			<?php
 			    } else {
 			?>
-			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
+			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*2000;
+} else {
+	print '60000';
+}
+?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmldstracker.entities.removeById(entityid);
 			}
@@ -173,7 +178,12 @@ 
 		function(){
 			updateTrackerData();
 		}
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	,<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 } else {
 	var clockViewModel = new Cesium.ClockViewModel(viewer.clock);
 	var animationViewModel = new Cesium.AnimationViewModel(clockViewModel);

location-geojson.php

Braces +3 added lines, -1 removed lines

@@ -79,7 +79,9 @@
 		$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'].'",';
+			if (isset($weather['temp'])) {
+				$output.= '"temp": "'.$weather['temp'].'",';
+			}
 		}
 		$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
 		$output .= '},';