0.3.6.2

Fix old compatibility issue #4 Simplify javascript to prevent modification #5
AnthoDingo · Jun 8, 2016 · 1b5dd4d · 1b5dd4d
1 parent 1ca960e
commit 1b5dd4d
Show file tree

Hide file tree

Showing 5 changed files with 348 additions and 357 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,5 +42,10 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
+
+# Project Ignore
+# =========================
+
+ftp-sync.json
 config.php
-user.php
+users.php
diff --git a/index.php b/index.php
@@ -1,6 +1,6 @@
 <?php 
 
-$version = "0.3.6.1";
+$version = "0.3.6.2";
 /*
 * Original work from https://github.com/LinhyCZ/DynmapSource
 * Original autor : LinhyCZ https://github.com/LinhyCZ

diff --git a/js/js_map.js b/js/js_map.js
@@ -0,0 +1,339 @@
+//Request na server
+var firstRun = true;
+var xmultiplicator, zmultiplicator;
+var oldTop = {}, oldLeft = {}, oldRotation = {}, animateOldRotation = "";
+var animatePlayerCSteamID = "", animateTop = "", animateLeft = "", animateRotation = "";
+var skipAnimate = false;
+var admin = 0;
+var resize = false;
+var naturalHeight, naturalWidth, offsetHeight, offsetWidth;
+
+
+$(function() {
+
+	$(document).keydown(function(event) {
+		if (event.ctrlKey==true && (event.which == "61" || event.which == "107" || event.which == "173" || event.which == "109"  || event.which == "187"  || event.which == "189"  ) ) {
+			event.preventDefault();
+		}
+	});
+
+	$(window).bind("mousewheel DOMMouseScroll", function (event) {
+		if (event.ctrlKey == true) {
+			event.preventDefault();
+		}
+	});
+
+	var ms_ie = false;
+	var ua = window.navigator.userAgent;
+	var old_ie = ua.indexOf("MSIE ");
+	var new_ie = ua.indexOf("Trident/");
+	var edge = ua.indexOf("Edge/");
+
+	if ((old_ie > -1) || (new_ie > -1) || (edge > -1)) {
+		ms_ie = true;
+	}
+
+	if ( ms_ie ) {
+		document.body.innerHTML = document.body.innerHTML + '<div style="position: fixed; background: #8B0000; width: 600px; top: 10px; left: 50%; margin-left: -320px; font-size: 30px; padding-left: 20px; padding-right: 20px; color: red; border: 2px solid black; z-index: 99999999999; border-radius: 20px; text-align: center">You are using browser, that is not supported!</div>';
+	}
+
+	sendRequest();
+	$("#mainImage").load(function() {if(firstRun==true){init();firstRun=false;sendRequest();};});
+	$(window).resize(function(){resize = true; init()});
+	var interval = setInterval(sendRequest, syncinterval);
+});
+function init() {
+	if (document.body.offsetHeight > document.body.offsetWidth) {
+		//Pozice obrázku
+		$("#mainImage").css({
+			'height': '',
+			'width': '100%',
+			'position': 'absolute',
+			'top': '50%',
+			'marginTop': Number((mainImage.offsetHeight/2)*-1)+'px'
+		});
+		$("#positionFrame").css({
+			'top': '50%',
+			'marginTop': Number((mainImage.offsetHeight/2)*-1)+'px'
+		});
+	} else {
+		$("#mainImage").css({
+			'height': '100%',
+			'width': '',
+			'position': 'static',
+			'top': '',
+			'margin': '0 auto',
+			'marginTop': ''
+		});
+
+		$("#positionFrame").css({
+			'top': '',
+			'marginTop': ''
+		}); 
+	}
+
+	$("*").css("visibility", "visible");
+	$("#loading").css("visibility", "hidden");
+	$("#positionFrame").css({
+		'height': $("#mainImage").height() + 'px',
+		'width': $("#mainImage").width() + 'px',
+		'marginLeft': Number(($("#mainImage").width() / 2) * -1) + 'px'
+	});
+
+	//Vypočítání poměru velikosti obrázku a skutečného rozlišení obrázku
+
+	/*
+	naturalHeight = $("#mainImage").get(0).naturalHeight;
+	naturalWidth = $("#mainImage").get(0).naturalWidth;
+	offsetHeight = $("#mainImage").get(0).offsetHeight;
+	offsetWidth = $("#mainImage").get(0).offsetWidth;
+
+	xmultiplicator =  Number(offsetWidth) / Number(naturalWidth);
+	zmultiplicator = Number(offsetHeight) / Number(naturalHeight);
+	*/
+	sendRequest();
+}
+
+function sendRequest() {
+	admin = 0;
+	var conn;
+	if(window.XMLHttpRequest) {
+		conn = new XMLHttpRequest();
+	} else {
+		conn = new ActiveXObject("Microsoft.XMLHTTP");
+	}
+	conn.open("GET", "core.php?user=client", false);
+	conn.setRequestHeader("Content-type","application/x-www-form-urlencoded");
+	conn.send();
+
+	var data = conn.responseText;
+	var data = data.split("]");
+
+	var players = Number(data.length) - 2;
+	if (players != 1) {s = "s"} else {s = ""};
+
+	//Zjisštění aktuální mapy
+	var map = data[0].substring(1);
+	var map = map.split("=");
+	var map = map[1];
+	$("#info").html("Current map: " + map + "<br>Currently " + players + " player" + s + " online");
+	$("#mainImage").attr("src", ".maps/"+map+".png");
+
+	naturalHeight = $("#mainImage").get(0).naturalHeight;
+	naturalWidth = $("#mainImage").get(0).naturalWidth;
+	offsetHeight = $("#mainImage").get(0).offsetHeight;
+	offsetWidth = $("#mainImage").get(0).offsetWidth;
+
+	xmultiplicator =  Number(offsetWidth) / Number(naturalWidth);
+	zmultiplicator = Number(offsetHeight) / Number(naturalHeight);
+
+	//Vypsání hráčů
+	if (firstRun == false) {
+		$("#positionFrameWrap").html("");
+		for (var i = 1; i < data.length; i++) {
+			if (data[i] != "") {
+				player = data[i].substring(1);
+
+				//Jméno hráče
+				var playerName = player.split(";");
+				var playerName = playerName[0];
+				var playerName = playerName.split("=");
+				var playerName = playerName[1];
+
+				//CSteamID hráče
+				var playerCSteamID = player.split(";");
+				var playerCSteamID = playerCSteamID[1];
+				var playerCSteamID = playerCSteamID.split("=");
+				var playerCSteamID = playerCSteamID[1];
+
+				//Pozice hráče
+				var playerPosition = player.split(";");
+				var playerPosition = playerPosition[2];
+				var playerPosition = playerPosition.split("=");
+				var playerPosition = playerPosition[1];
+				var playerPosition = playerPosition.substring(1);
+				var playerPosition = playerPosition.substring(0, playerPosition.length -1);
+
+				//Pozice x
+				var x = playerPosition.split(",");
+				var x = x[0];
+
+				//Pozice z
+				var z = playerPosition.split(",");
+				var z = z[2];
+
+				//Rotace
+				var rotation = player.split(";");
+				var rotation = rotation[3];
+				var rotation = rotation.split("=");
+				var rotation = rotation[1];
+
+				//PlayerStatus
+				var playerStatus = player.split(";");
+				var playerStatus = playerStatus[4];
+				var playerStatus = playerStatus.split("=");
+				var playerStatus = playerStatus[1];
+				if (playerStatus == "player") {
+					playerStatus = "playerColor";
+				};
+				if (playerStatus == "admin") {
+					admin++;
+				};
+
+				var coeff;
+				//Přepočítání pozice x na hodnotu left
+				if ($("#mainImage").get(0).naturalHeight == "1024") {
+					coeff = 512;
+				} else if($("#mainImage").get(0).naturalHeight == "2048") {
+
+					coeff = 1024;
+				} else if($("#mainImage").get(0).naturalHeight == "512") {
+					coeff = 256;
+				}
+
+				if (Number(x) < 0) {
+					var left = Number(x)*-1;
+					var left = Number(left)/1.93630573;
+					var left = coeff - Number(left);
+					var left = Number(left) * Number(xmultiplicator);
+				} else {
+					var left = Number(x);
+					var left = Number(left)/1.93630573;
+					var left = Number(left) + coeff;
+					var left = Number(left) * Number(xmultiplicator);
+				}
+
+				//Přepočítání hodnoty x na hodnotu top
+				if (Number(z) < 0) {
+					var top = Number(z);
+					var top = Number(top)/1.93630573;
+					var top = coeff - Number(top);
+					var top = Number(top) * Number(zmultiplicator);
+				} else {
+					var top = Number(z)*-1;
+					var top = Number(top)/1.93630573;
+					var top = Number(top) + coeff;
+					var top = Number(top) * Number(zmultiplicator);
+				}
+
+				var adding = $("#positionFrameWrap").html() + '\
+				<div style="visibility: visible" class="player" id="' + playerCSteamID + '"> \
+					<img style="visibility: visible" class="playerImage" id="' + playerCSteamID +'_cursor" src="cursor.png"> \
+					<div style="visibility: visible" class="playerInfo '+ playerStatus + '"> \
+						'+ playerName + '\
+					</div> \
+				</div>';
+				$("#positionFrameWrap").html(adding);
+				if (oldTop[playerCSteamID] != undefined && resize != true) {	
+					var topDiference = oldTop[playerCSteamID] - top;
+					var leftDiference = oldLeft[playerCSteamID] - left;
+					if (topDiference > 100 || topDiference < -100 || leftDiference > 100 || leftDiference < -100) {skipAnimate = true};
+					$("#"+playerCSteamID).css({
+						'top': oldTop[playerCSteamID] + 'px',
+						'left': oldLeft[playerCSteamID] + 'px'
+					});
+					$("#"+playerCSteamID+"_cursor").css({
+						'transform': 'rotate('+oldRotation[playerCSteamID]+'deg)',
+						'msTransform': 'rotate('+oldRotation[playerCSteamID]+'deg)',
+						'webkitTransform': 'rotate('+oldRotation[playerCSteamID]+'deg)'
+					});
+				} else {
+					$("#"+playerCSteamID).css({
+						'top': top + 'px',
+						'left': left + 'px'
+					});
+
+					$("#"+playerCSteamID+"_cursor").css({
+						'transform': 'rotate('+rotation+'deg)',
+						'msTransform': 'rotate('+rotation+'deg)',
+						'webkitTransform': 'rotate('+rotation+'deg)'
+					});
+				}
+				if (skipAnimate == false || resize == true) {
+					animatePlayerCSteamID = animatePlayerCSteamID + ";" + playerCSteamID;
+					animateTop = animateTop + ";" + top;
+					animateLeft = animateLeft + ";" + left;
+					if (oldRotation[playerCSteamID] != undefined) {
+						cache = Number(rotation) - Number(oldRotation[playerCSteamID]);
+						animateRotation = animateRotation + ";" + cache;
+					} else {
+						animateRotation = animateRotation + ";" + rotation;
+					}
+					animateOldRotation = animateOldRotation + ";" + oldRotation[playerCSteamID];
+				} else {
+					skipAnimate = false;
+					$("#"+playerCSteamID).css({
+						'top': top + 'px',
+						'left': left + 'px'
+					});
+					$("#"+playerCSteamID+"_cursor").css({
+						'transform': 'rotate('+rotation+'deg)',
+						'msTransform': 'rotate('+rotation+'deg)',
+						'webkitTransform': 'rotate('+rotation+'deg)'
+					});
+				}
+
+				oldTop[playerCSteamID] = top;
+				oldLeft[playerCSteamID] = left;
+				oldRotation[playerCSteamID] = rotation;
+			}
+		}
+
+		if(resize != true) {animate()};
+		if (admin <= 1) {
+			admins = "";
+		} else {
+			admins = "s";
+		}
+		var infos = $("#info").html() + '<br>Currently ' + admin + ' admin' + admins + ' online';
+		$("#info").html(infos);
+		resize = false;
+	};
+}
+
+function animate() {
+	animatePlayerCSteamID = animatePlayerCSteamID.split(";");
+	animateTop = animateTop.split(";");
+	animateLeft = animateLeft.split(";");
+	animateRotation = animateRotation.split(";");
+	animateOldRotation = animateOldRotation.split(";");
+	for (var i = 0; i < animatePlayerCSteamID.length; i++) {
+		$("#" + animatePlayerCSteamID[i]).animate({top: animateTop[i], left: animateLeft[i]}, {duration: syncinterval, easing:"linear", queue: false});
+		AnimateRotate(animateRotation[i], animateOldRotation[i], animatePlayerCSteamID[i]);
+	};
+	animatePlayerCSteamID = "";
+	animateTop = "";
+	animateLeft = "";
+	animateRotation = "";
+	animateOldRotation = "";
+
+	checkArray();
+}
+
+function AnimateRotate(d, old, id){
+	$({deg: 0}).animate({deg: d}, {
+		duration: syncinterval,
+		step: function(now, fx){
+			rotationLevel = Number(now) + Number(old);
+			$("#" + id + "cursor").css({
+				transform: "rotate(" + rotationLevel + "deg)"
+			});
+		}
+	});
+}
+
+function checkArray() {
+	var inputs = document.getElementsByClassName("player");
+	var shownPlayers = []
+	var array = Object.keys(oldTop);
+	for (var i = 0; i < inputs.length; i++) {
+		shownPlayers.push(inputs[i].id);
+	}
+
+	for (var i = 0; i < array.length; i++) {
+		if(shownPlayers.indexOf(array[i]) == -1) {
+			delete oldLeft[array[i]];
+			delete oldTop[array[i]];
+		}
+	};
+}