diff options
| author | stonedDiscord <10584181+stonedDiscord@users.noreply.github.com> | 2020-11-17 23:28:38 +0100 |
|---|---|---|
| committer | stonedDiscord <10584181+stonedDiscord@users.noreply.github.com> | 2020-11-17 23:28:38 +0100 |
| commit | 03e1bd2b7b87cea01e2aab9ea54dfdbeff5874b9 (patch) | |
| tree | 56f35925a184126554c2bfe44c18608bb6bdf11a | |
| parent | 4858b67ea68cce8f485a0fd12e00e176b4ca33c7 (diff) | |
fix escaping
| -rw-r--r-- | webAO/encoding.js | 4 | ||||
| -rw-r--r-- | webAO/master.js | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/webAO/encoding.js b/webAO/encoding.js index 71ebe53..04a44e7 100644 --- a/webAO/encoding.js +++ b/webAO/encoding.js @@ -31,8 +31,8 @@ export function unescapeChat(estring) { export function safe_tags(unsafe) { if (unsafe) { return unsafe - .replace(/>/g, "&rt;") - .replace(/</g, "<"); + .replace(/>/g, '>') + .replace(/</g, '<'); } else { return ""; } diff --git a/webAO/master.js b/webAO/master.js index 1501398..aec279c 100644 --- a/webAO/master.js +++ b/webAO/master.js @@ -73,7 +73,7 @@ export function setServ(ID) { checkOnline(ID, servers[ID].ip + ":" + servers[ID].port); if (servers[ID].description !== undefined) { - document.getElementById("serverdescription_content").innerHTML = "<b>" + servers[ID].online + "</b><br>" + servers[ID].description; + document.getElementById("serverdescription_content").innerHTML = "<b>" + servers[ID].online + "</b><br>" + safe_tags(servers[ID].description); } else { document.getElementById("serverdescription_content").innerHTML = ""; @@ -126,11 +126,11 @@ function checkOnline(serverID, coIP) { } else if (coheader === "BD") { servers[serverID].online = "Banned"; - servers[serverID].description = safe_tags(coarguments[0]); + servers[serverID].description = coarguments[0]; oserv.close(); } if (serverID === selectedServer) - document.getElementById("serverdescription_content").innerHTML = "<b>" + servers[serverID].online + "</b><br>" + servers[serverID].description; + document.getElementById("serverdescription_content").innerHTML = "<b>" + servers[serverID].online + "</b><br>" + safe_tags(servers[serverID].description); } // assign the callbacks @@ -160,14 +160,14 @@ function onMessage(e) { const serverEntry = allservers[i]; const args = serverEntry.split("&"); - let thisserver = { name: safe_tags(args[0]), description: safe_tags(args[1]), ip: args[2], port: Number(args[3]), assets: args[4], online: "Online: ?/?" }; + let thisserver = { name: args[0], description: args[1], ip: args[2], port: Number(args[3]), assets: args[4], online: "Online: ?/?" }; servers[i] = thisserver; const ipport = args[2] + ":" + args[3]; const asset = args[4] ? `&asset=${args[4]}` : ""; document.getElementById("masterlist").innerHTML += - `<li id="server${i}" onmouseover="setServ(${i})"><p>${servers[i].name}</p>` + `<li id="server${i}" onmouseover="setServ(${i})"><p>${safe_tags(servers[i].name)}</p>` + `<a class="button" href="client.html?mode=watch&ip=${ipport}${asset}">Watch</a>` + `<a class="button" href="client.html?mode=join&ip=${ipport}${asset}">Join</a></li>`; } |