Completed
Push — master ( ef9e9e...16b40d )
by Yannick
31:21
created
js/map-aircraft.3d.js.php 1 patch
Braces   +24 added lines, -4 removed lines patch added patch discarded remove patch
@@ -275,7 +275,12 @@  discard block
 block discarded – undo
275 275
 			<?php
276 276
 			    } else {
277 277
 			?>
278
-			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
278
+			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
279
+	print $globalMapRefresh*2000;
280
+} else {
281
+	print '60000';
282
+}
283
+?>)) {
279 284
 				viewer.dataSources.get(dsn).entities.remove(entity);
280 285
 				czmlds.entities.removeById(entityid);
281 286
 			}
@@ -564,7 +569,12 @@  discard block
 block discarded – undo
564 569
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
565 570
 ?>
566 571
 update_polarLayer();
567
-setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
572
+setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) {
573
+	print $globalMapRefresh*1000*2;
574
+} else {
575
+	print '60000';
576
+}
577
+?>);
568 578
 <?php
569 579
 		}
570 580
 ?>
@@ -695,7 +705,12 @@  discard block
 block discarded – undo
695 705
 				}
696 706
 			}
697 707
 		}
698
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
708
+	,<?php if (isset($globalMapRefresh)) {
709
+	print $globalMapRefresh*1000;
710
+} else {
711
+	print '30000';
712
+}
713
+?>);
699 714
 } else {
700 715
 	var clockViewModel = new Cesium.ClockViewModel(viewer.clock);
701 716
 	var animationViewModel = new Cesium.AnimationViewModel(clockViewModel);
@@ -724,7 +739,12 @@  discard block
 block discarded – undo
724 739
     if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
725 740
 ?>
726 741
 update_atcLayer();
727
-setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
742
+setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) {
743
+	print $globalMapRefresh*1000*2;
744
+} else {
745
+	print '60000';
746
+}
747
+?>);
728 748
 <?php
729 749
     }
730 750
 ?>
Please login to merge, or discard this patch.
js/map-aircraft.2d.js.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
 if (!isset($globalJsonCompress)) $compress = true;
7 7
 else $compress = $globalJsonCompress;
8 8
 
9
-if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
10
-if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
9
+if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
10
+if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
11 11
 $archive = false;
12 12
 if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') $archive = true;
13 13
 ?>
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 		if (typeof props != 'undefined') {
216 216
 			var thedate = new Date(props);
217 217
 			$("#thedate").html(thedate.toUTCString());
218
-		//	$("#archivebox").html('<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>');
218
+		//	$("#archivebox").html('<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>');
219 219
 		}
220 220
 	}
221 221
 <?php
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 <?php
367 367
 		} else {
368 368
 ?>
369
-					var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
369
+					var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
370 370
 					return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
371 371
 <?php
372 372
 		}
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 							/*
384 384
 							shadowUrl: iconURLShadowpath,
385 385
 							shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
386
-							shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
386
+							shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
387 387
 							*/
388 388
 						})
389 389
 					})
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 <?php
417 417
 		} else {
418 418
 ?>
419
-						var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
419
+						var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
420 420
 						return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
421 421
 <?php
422 422
 		}
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
 <?php
464 464
 		} else {
465 465
 ?>
466
-							var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
466
+							var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
467 467
 							return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
468 468
 <?php
469 469
 		}
Please login to merge, or discard this patch.