View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( dcc24f...94bffa )
by Yannick
37:15
created
Status
Category
Toggle Patches
live-czml.php 1 patch
Braces   +150 added lines, -54 removed lines patch added patch discarded remove patch 
@@ -26,8 +26,12 @@  discard block
 
 block discarded – undo
26 26 
 }
27 27 
 $tracker = false;
28 28 
 $marine = false;
29 
-if (isset($_GET['tracker'])) $tracker = true;
30 
-if (isset($_GET['marine'])) $marine = true;
29 
+if (isset($_GET['tracker'])) {
30 
+	$tracker = true;
31 
+}
32 
+if (isset($_GET['marine'])) {
33 
+	$marine = true;
34 
+}
31 35 
 if ($tracker) {
32 36 
 	require_once('require/class.Tracker.php');
33 37 
 	require_once('require/class.TrackerLive.php');
 
@@ -84,26 +88,55 @@  discard block
 
 block discarded – undo
84 88 
 }
85 89 
 header('Content-Type: text/javascript');
86 90
87 
-if (!isset($globalJsonCompress)) $compress = true;
88 
-else $compress = $globalJsonCompress;
91 
+if (!isset($globalJsonCompress)) {
92 
+	$compress = true;
93 
+} else {
94 
+	$compress = $globalJsonCompress;
95 
+}
89 96
90 97 
 $from_archive = false;
91 98 
 $min = false;
92 99 
 $allhistory = false;
93 100 
 $filter['source'] = array();
94 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
95 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
96 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
97 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
98 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
99 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
100 
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
101 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
102 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
103 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
104 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
105 
-if (isset($_COOKIE['filter_race']) && $_COOKIE['filter_race'] != 'all') $filter['race'] = filter_var($_COOKIE['filter_race'],FILTER_SANITIZE_NUMBER_INT);
106 
-if (isset($_COOKIE['filter_blocked']) && $_COOKIE['filter_blocked'] == 'true') $filter['blocked'] = true;
101 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
102 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
103 
+}
104 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
105 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
106 
+}
107 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
108 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
109 
+}
110 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
111 
+	$filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
112 
+}
113 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
114 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
115 
+}
116 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
117 
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
118 
+}
119 
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') {
120 
+	$filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
121 
+}
122 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
123 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
124 
+}
125 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
126 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
127 
+}
128 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
129 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
130 
+}
131 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
132 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
133 
+}
134 
+if (isset($_COOKIE['filter_race']) && $_COOKIE['filter_race'] != 'all') {
135 
+	$filter['race'] = filter_var($_COOKIE['filter_race'],FILTER_SANITIZE_NUMBER_INT);
136 
+}
137 
+if (isset($_COOKIE['filter_blocked']) && $_COOKIE['filter_blocked'] == 'true') {
138 
+	$filter['blocked'] = true;
139 
+}
107 140 
 /*
108 141 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
109 142 
 	$min = true;
 
@@ -280,8 +313,12 @@  discard block
 
 block discarded – undo
280 313 
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
281 314 
 		}
282 315 
 	}
283 
-	if ($flightcnt == '') $flightcnt = 0;
284 
-} else $flightcnt = 0;
316 
+	if ($flightcnt == '') {
317 
+		$flightcnt = 0;
318 
+	}
319 
+	} else {
320 
+	$flightcnt = 0;
321 
+}
285 322
286 323 
 $sqltime = round(microtime(true)-$begintime,2);
287 324 
 $minitime = time();
 
@@ -327,7 +364,9 @@  discard block
 
 block discarded – undo
327 364 
 $gltf2 = false;
328 365 
 $scale = 1.0;
329 366 
 $minimumpixelsize = 20;
330 
-if (isset($archivespeed)) $speed = $archivespeed;
367 
+if (isset($archivespeed)) {
368 
+	$speed = $archivespeed;
369 
+}
331 370 
 $output = '[';
332 371 
 if ($tracker) {
333 372 
 	$output .= '{"id" : "document", "name" : "tracker","version" : "1.0"';
 
@@ -363,9 +402,13 @@  discard block
 
 block discarded – undo
363 402 
 			$image = "images/placeholder_thumb.png";
364 403 
 		}
365 404
366 
-                if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
367 
-                elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
368 
-                elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
405 
+                if (isset($spotter_item['flightaware_id'])) {
406 
+                	$id = $spotter_item['flightaware_id'];
407 
+                } elseif (isset($spotter_item['famtrackid'])) {
408 
+                	$id = $spotter_item['famtrackid'];
409 
+                } elseif (isset($spotter_item['fammarine_id'])) {
410 
+                	$id = $spotter_item['fammarine_id'];
411 
+                }
369 412 
                 if ($prev_flightaware_id != $id) {
370 413 
 			if ($prev_flightaware_id != '') {
371 414 
 				/*
 
@@ -403,18 +446,36 @@  discard block
 
 block discarded – undo
403 446 
 			if (isset($spotter_item['squawk'])) {
404 447 
 				$output .= '"squawk": "'.$spotter_item['squawk'].'",';
405 448 
 			}
406 
-			if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
407 
-			if (isset($spotter_item['format_source'])) $output .= '"format": "'.$spotter_item['format_source'].'",';
408 
-			if (isset($spotter_item['ident'])) $output.= '"ident": '.json_encode($spotter_item['ident']).',';
449 
+			if (isset($spotter_item['registration'])) {
450 
+				$output .= '"registration": "'.$spotter_item['registration'].'",';
451 
+			}
452 
+			if (isset($spotter_item['format_source'])) {
453 
+				$output .= '"format": "'.$spotter_item['format_source'].'",';
454 
+			}
455 
+			if (isset($spotter_item['ident'])) {
456 
+				$output.= '"ident": '.json_encode($spotter_item['ident']).',';
457 
+			}
409 458 
 			if ($tracker) {
410 
-				if (isset($spotter_item['type'])) $output .= '"tracker_type": '.json_encode($spotter_item['type']).',';
459 
+				if (isset($spotter_item['type'])) {
460 
+					$output .= '"tracker_type": '.json_encode($spotter_item['type']).',';
461 
+				}
411 462 
 				$output.= '"type": "tracker"';
412 463 
 			} elseif ($marine) {
413 
-				if (isset($spotter_item['type'])) $output .= '"marine_type": '.json_encode($spotter_item['type']).',';
414 
-				if (isset($spotter_item['captain_name'])) $output .= '"captain": '.json_encode($spotter_item['captain_name']).',';
415 
-				if (isset($spotter_item['race_id'])) $output .= '"raceid": '.$spotter_item['race_id'].',';
416 
-				if (isset($spotter_item['race_name'])) $output .= '"race": '.json_encode($spotter_item['race_name']).',';
417 
-				if (isset($spotter_item['race_rank'])) $output .= '"rank": "'.$spotter_item['race_rank'].'",';
464 
+				if (isset($spotter_item['type'])) {
465 
+					$output .= '"marine_type": '.json_encode($spotter_item['type']).',';
466 
+				}
467 
+				if (isset($spotter_item['captain_name'])) {
468 
+					$output .= '"captain": '.json_encode($spotter_item['captain_name']).',';
469 
+				}
470 
+				if (isset($spotter_item['race_id'])) {
471 
+					$output .= '"raceid": '.$spotter_item['race_id'].',';
472 
+				}
473 
+				if (isset($spotter_item['race_name'])) {
474 
+					$output .= '"race": '.json_encode($spotter_item['race_name']).',';
475 
+				}
476 
+				if (isset($spotter_item['race_rank'])) {
477 
+					$output .= '"rank": "'.$spotter_item['race_rank'].'",';
478 
+				}
418 479 
 				$output.= '"type": "marine"';
419 480 
 			} else {
420 481 
 				if ($one3dmodel === false && isset($globalMap3DLiveries) && $globalMap3DLiveries) {
 
@@ -465,7 +526,9 @@  discard block
 
 block discarded – undo
465 526 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
466 527 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
467 528 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
468 
-						} else $aircraft_shadow = '';
529 
+						} else {
530 
+							$aircraft_shadow = '';
531 
+						}
469 532 
 	    					$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
470 533 
 						if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
471 534 
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 
@@ -473,7 +536,9 @@  discard block
 
 block discarded – undo
473 536 
 						}
474 537 
 						$output .= '},';
475 538 
 					}
476 
-				} else $output .= ' "billboard" : {"image" : "data:image/png;base64,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","scale" : 0.5},';
539 
+				} else {
540 
+					$output .= ' "billboard" : {"image" : "data:image/png;base64,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","scale" : 0.5},';
541 
+				}
477 542 
 			} elseif ($one3dmodel) {
478 543 
 				if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') {
479 544 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : '.$scale.',"minimumPixelSize": '.$minimumpixelsize.'';
 
@@ -513,7 +578,9 @@  discard block
 
 block discarded – undo
513 578 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
514 579 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
515 580 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
516 
-						} else $aircraft_shadow = '';
581 
+						} else {
582 
+							$aircraft_shadow = '';
583 
+						}
517 584 
 						if ($aircraft_shadow != '') {
518 585 
 							if (isset($modelsdb2[$aircraft_shadow])) {
519 586 
 								$output .= '"model": {"gltf" : "'.$globalURL.'/models/gltf2/'.$modelsdb2[$aircraft_shadow]['glb'].'","scale" : '.$scale.',"minimumPixelSize": '.$modelsdb2[$aircraft_shadow]['size'];
 
@@ -668,7 +735,9 @@  discard block
 
 block discarded – undo
668 735 
 								}
669 736 
 								$output .= '},';
670 737 
 								//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
671 
-								if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
738 
+								if ($spotter_item['aircraft_icao'] != '') {
739 
+									$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
740 
+								}
672 741 
 								$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
673 742 
 							}
674 743 
 						} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
 
@@ -690,7 +759,9 @@  discard block
 
 block discarded – undo
690 759 
 							}
691 760 
 							$output .= '},';
692 761 
 							//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
693 
-							if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
762 
+							if ($spotter_item['aircraft_icao'] != '') {
763 
+								$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
764 
+							}
694 765 
 							$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
695 766 
 						}
696 767 
 					} else {
 
@@ -703,7 +774,9 @@  discard block
 
 block discarded – undo
703 774 
 						}
704 775 
 						$output .= '},';
705 776 
 						//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
706 
-						if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
777 
+						if ($spotter_item['aircraft_icao'] != '') {
778 
+							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
779 
+						}
707 780 
 						$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
708 781 
 					}
709 782 
 				} elseif ($tracker && isset($spotter_item['type'])) {
 
@@ -811,8 +884,11 @@  discard block
 
 block discarded – undo
811 884 
 					$output .= '},';
812 885 
 				}
813 886 
 			}
814 
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
815 
-			else $output = str_replace('%onground%','false',$output);
887 
+			if (isset($onground) && $onground) {
888 
+				$output = str_replace('%onground%','true',$output);
889 
+			} else {
890 
+				$output = str_replace('%onground%','false',$output);
891 
+			}
816 892
817 893 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
818 894 
 			//$output .= '"heightReference": "'.$heightrelative.'",';
 
@@ -825,9 +901,15 @@  discard block
 
 block discarded – undo
825 901 
 	//		$output .= '"interpolationDegree" : 5,';
826 902 
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
827 903 
 			$output .= '"cartographicDegrees": [';
828 
-			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
829 
-			if (isset($_COOKIE['MapTrack']) && $id == $_COOKIE['MapTrack'] && $minitracktime > strtotime($spotter_item['date'])) $minitracktime = strtotime($spotter_item['date']);
830 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
904 
+			if ($minitime > strtotime($spotter_item['date'])) {
905 
+				$minitime = strtotime($spotter_item['date']);
906 
+			}
907 
+			if (isset($_COOKIE['MapTrack']) && $id == $_COOKIE['MapTrack'] && $minitracktime > strtotime($spotter_item['date'])) {
908 
+				$minitracktime = strtotime($spotter_item['date']);
909 
+			}
910 
+			if ($maxitime < strtotime($spotter_item['date'])) {
911 
+				$maxitime = strtotime($spotter_item['date']);
912 
+			}
831 913 
 			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
832 914 
 			$output .= $spotter_item['longitude'].', ';
833 915 
 			$output .= $spotter_item['latitude'];
 
@@ -850,7 +932,9 @@  discard block
 
 block discarded – undo
850 932 
 					$output .= ', '.round($spotter_item['altitude']*30.48);
851 933 
 					$prevalt = round($spotter_item['altitude']*30.48);
852 934 
 				}
853 
-			} else $output .= ', 0';
935 
+			} else {
936 
+				$output .= ', 0';
937 
+			}
854 938 
 			//$orientation = '"orientation" : { ';
855 939 
 			//$orientation .= '"unitQuaternion": [';
856 940 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 
@@ -858,13 +942,18 @@  discard block
 
 block discarded – undo
858 942 
 		} else {
859 943 
 			$nblatlong = $nblatlong+1;
860 944 
 			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
861 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
945 
+			if ($maxitime < strtotime($spotter_item['date'])) {
946 
+				$maxitime = strtotime($spotter_item['date']);
947 
+			}
862 948 
 			if ($spotter_item['ground_speed'] == 0) {
863 949 
 				$output .= $prevlong.', ';
864 950 
 				$output .= $prevlat;
865 951 
 				//if (!$marine && (!isset($onground) || !$onground)) $output .= ', '.$prevalt;
866 
-				if (!$marine) $output .= ', '.$prevalt;
867 
-				else $output .= ', 0';
952 
+				if (!$marine) {
953 
+					$output .= ', '.$prevalt;
954 
+				} else {
955 
+					$output .= ', 0';
956 
+				}
868 957 
 			} else {
869 958 
 				$output .= $spotter_item['longitude'].', ';
870 959 
 				$output .= $spotter_item['latitude'];
 
@@ -877,14 +966,17 @@  discard block
 
 block discarded – undo
877 966 
 							$output .= ', 0';
878 967 
 						}
879 968 
 					} else {
880 
-						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') $output .= ', '.round($spotter_item['real_altitude']*0.3048);
881 
-						elseif ($tracker) {
969 
+						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
970 
+							$output .= ', '.round($spotter_item['real_altitude']*0.3048);
971 
+						} elseif ($tracker) {
882 972 
 							$output .= ', '.round($spotter_item['altitude']*0.3048);
883 973 
 						} else {
884 974 
 							$output .= ', '.round($spotter_item['altitude']*30.48);
885 975 
 						}
886 976 
 					}
887 
-				} else $output .= ', 0';
977 
+				} else {
978 
+					$output .= ', 0';
979 
+				}
888 980 
 			}
889 981 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
890 982 
 			//$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 
@@ -905,9 +997,10 @@  discard block
 
 block discarded – undo
905 997 
 		} else {
906 998 
 			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
907 999 
 		}
1000 
+	} else {
1001 
+		$output = str_replace('%minitime%',date("c",$minitime),$output);
908 1002 
 	}
909 
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
910 
-} elseif (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '' && $minitracktime != $minitracktime_begin) {
1003 
+	} elseif (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '' && $minitracktime != $minitracktime_begin) {
911 1004 
 	$output = str_replace('%minitime%',date("c",$minitracktime),$output);
912 1005 
 } else {
913 1006 
 	$output = str_replace('%minitime%',date("c",$minitime),$output);
 
@@ -917,7 +1010,10 @@  discard block
 
 block discarded – undo
917 1010 
 } else {
918 1011 
 	$output = str_replace('%maxitime%',date("c",$maxitime),$output);
919 1012 
 }
920 
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
921 
-else $output = str_replace('%gltf2%','false',$output);
1013 
+if ($gltf2) {
1014 
+	$output = str_replace('%gltf2%','true',$output);
1015 
+} else {
1016 
+	$output = str_replace('%gltf2%','false',$output);
1017 
+}
922 1018 
 print $output;
923 1019 
 ?>
Please login to merge, or discard this patch.