Completed
Push — master ( 8ef4e4...fedfa0 )
by Yannick
06:48
created
js/map.js.php 1 patch
Spacing   +28 added lines, -28 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
 //$_COOKIE['MapFormat'] = '2d';
7 7
 
8 8
 // Compressed GeoJson is used if true
@@ -21,10 +21,10 @@  discard block
 block discarded – undo
21 21
 		$lastupd = $_GET['archivespeed']*$archiveupdatetime;
22 22
 		if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
23 23
 		else $enddate = time();
24
-		setcookie("archive_begin",$begindate);
25
-		setcookie("archive_end",$enddate);
26
-		setcookie("archive_update",$lastupd);
27
-		setcookie("archive_speed",$archivespeed);
24
+		setcookie("archive_begin", $begindate);
25
+		setcookie("archive_end", $enddate);
26
+		setcookie("archive_update", $lastupd);
27
+		setcookie("archive_speed", $archivespeed);
28 28
 ?>
29 29
 
30 30
 document.cookie =  'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
@@ -95,16 +95,16 @@  discard block
 block discarded – undo
95 95
 <?php
96 96
 	}
97 97
 	if (isset($_GET['ident'])) {
98
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
98
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
99 99
 	}
100 100
 	if (isset($_GET['flightaware_id'])) {
101
-		$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
101
+		$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
102 102
 	}
103 103
 	if (isset($_GET['latitude'])) {
104
-		$latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
104
+		$latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
105 105
 	}
106 106
 	if (isset($_GET['longitude'])) {
107
-		$longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
107
+		$longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
108 108
 	}
109 109
 ?>
110 110
 
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	     || navigator.userAgent.match(/BlackBerry/i)
140 140
 	     || navigator.userAgent.match(/Windows Phone/i))
141 141
 	{
142
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
142
+		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom - 1; else print '8'; ?>;
143 143
 	} else {
144 144
 		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
145 145
 	}
@@ -233,19 +233,19 @@  discard block
 block discarded – undo
233 233
 	map.addLayer(yandexLayer);
234 234
 <?php
235 235
 	} elseif ($MapType == 'Bing-Aerial') {
236
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
236
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
237 237
 ?>
238 238
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
239 239
 	map.addLayer(bingLayer);
240 240
 <?php
241 241
 	} elseif ($MapType == 'Bing-Hybrid') {
242
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
242
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
243 243
 ?>
244 244
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
245 245
 	map.addLayer(bingLayer);
246 246
 <?php
247 247
 	} elseif ($MapType == 'Bing-Road') {
248
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
248
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
249 249
 ?>
250 250
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
251 251
 	map.addLayer(bingLayer);
@@ -535,10 +535,10 @@  discard block
 block discarded – undo
535 535
 	};
536 536
 	archive.update = function (props) {
537 537
 		if (typeof props != 'undefined') {
538
-			//this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i>  <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>  <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
539
-			this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
538
+			//this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i>  <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>  <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
539
+			this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
540 540
 		} else {
541
-			this._div.innerHTML = '<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>';
541
+			this._div.innerHTML = '<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>';
542 542
 		}
543 543
 
544 544
 	};
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 <?php
739 739
 		} else {
740 740
 ?>
741
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
741
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
742 742
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
743 743
 <?php
744 744
 		}
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
 			    iconAnchor: [<?php print $globalAircraftSize/2; ?>, <?php print $globalAircraftSize; ?>],
754 754
 			    shadowUrl: iconURLShadowpath,
755 755
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
756
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
756
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
757 757
 			})
758 758
 		    })
759 759
 <?php
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
 <?php
786 786
 		} else {
787 787
 ?>
788
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
788
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
789 789
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
790 790
 <?php
791 791
 		}
@@ -831,7 +831,7 @@  discard block
 block discarded – undo
831 831
 <?php
832 832
 		} else {
833 833
 ?>
834
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
834
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
835 835
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
836 836
 <?php
837 837
 		}
@@ -1420,12 +1420,12 @@  discard block
 block discarded – undo
1420 1420
 	    airs.push(air.value);
1421 1421
 	}
1422 1422
     }
1423
-    document.cookie =  'Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
1423
+    document.cookie =  'Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
1424 1424
 }
1425 1425
 function airlinestype(selectObj) {
1426 1426
     var idx = selectObj.selectedIndex;
1427 1427
     var airtype = selectObj.options[idx].value;
1428
-    document.cookie =  'airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
1428
+    document.cookie =  'airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
1429 1429
 }
1430 1430
 function sources(selectObj) {
1431 1431
     var sources = [], source;
@@ -1436,7 +1436,7 @@  discard block
 block discarded – undo
1436 1436
 	}
1437 1437
     }
1438 1438
     //document.cookie =  'Sources='+sources.join()+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1439
-    document.cookie =  'Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
1439
+    document.cookie =  'Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
1440 1440
 }
1441 1441
 
1442 1442
 function show3D() {
@@ -1459,23 +1459,23 @@  discard block
 block discarded – undo
1459 1459
 
1460 1460
 function clickVATSIM(cb) {
1461 1461
     //document.cookie =  'ShowVATSIM='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1462
-    document.cookie =  'ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
1462
+    document.cookie =  'ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1463 1463
 }
1464 1464
 function clickIVAO(cb) {
1465 1465
     //document.cookie =  'ShowIVAO='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1466
-    document.cookie =  'ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
1466
+    document.cookie =  'ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1467 1467
 }
1468 1468
 function clickphpVMS(cb) {
1469 1469
     //document.cookie =  'ShowVMS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1470
-    document.cookie =  'ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
1470
+    document.cookie =  'ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1471 1471
 }
1472 1472
 function clickSBS1(cb) {
1473 1473
     //document.cookie =  'ShowSBS1='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1474
-    document.cookie =  'ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
1474
+    document.cookie =  'ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1475 1475
 }
1476 1476
 function clickAPRS(cb) {
1477 1477
     //document.cookie =  'ShowAPRS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1478
-    document.cookie =  'ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
1478
+    document.cookie =  'ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1479 1479
 }
1480 1480
 function clickFlightPopup(cb) {
1481 1481
     document.cookie =  'flightpopup='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
Please login to merge, or discard this patch.