From cad2292269ef503d807e1c8393bbbee35b44173b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 4 Dec 2018 12:40:06 +0100 Subject: [PATCH] Trying a fix for encoding issues occuring from time to time --- server/public/assets/js/channel.js | 6 +++++- server/public/assets/js/helpers.js | 7 +++++++ server/routing/client/router.js | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 847cf596..07f670e4 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -46,7 +46,11 @@ var Channel = { number_suggested = 0; var no_socket = true; - chan = Helper.decodeChannelName(Helper.html("#chan")); + //chan = Helper.decodeChannelName(Helper.html("#chan")); + var _p = window.location.pathname; + if(_p.substring(0,1) == "/") _p = _p.substring(1); + if(_p.substring(_p.length - 1) == "/") _p = _p.substring(0, _p.length - 1); + chan = Helper.decodeChannelName(_p); mobile_beginning = Helper.mobilecheck(); var side = Helper.mobilecheck() ? "left" : "right"; diff --git a/server/public/assets/js/helpers.js b/server/public/assets/js/helpers.js index f44ca351..d262e155 100755 --- a/server/public/assets/js/helpers.js +++ b/server/public/assets/js/helpers.js @@ -4,6 +4,13 @@ var Helper = { decodeChannelName: function(str) { var _fn = decodeURIComponent; str = str.toUpperCase(); + /*if(str.indexOf("%25") >= 0) { + var _percentSign = str.indexOf("%25") + 1; + var _before = str.substring(0, _percentSign); + var _after = str.substring(_percentSign); + str = _before + "25" + _after; + console.log(str); + }*/ var toReturn = _fn(str.replace(/%5F/g, "_")); toReturn = toReturn.toLowerCase().replace(/&/g, "&"); return toReturn.toLowerCase(); diff --git a/server/routing/client/router.js b/server/routing/client/router.js index 22784d28..45a563e0 100644 --- a/server/routing/client/router.js +++ b/server/routing/client/router.js @@ -255,7 +255,8 @@ function channel(req, res, next) { }*/ var data = { title: "404: File Not Found", - list_name: capitalizeFirstLetter(Functions.decodeChannelName(req.params.channel_name)), + //list_name: capitalizeFirstLetter(Functions.decodeChannelName(req.params.channel_name)), + list_name: capitalizeFirstLetter(req.params.channel_name), year: year, javascript_file: "main.min.js", captcha: res.recaptcha,