KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #449 from zoff-music/fix/encoding

Browse Source 
Trying a fix for encoding issues occuring from time to time
This commit is contained in:
Kasper Rynning-Tønnesen
2018-12-04 12:40:28 +01:00
committed by GitHub
parent 14d8ef51bb cad2292269
commit 664a5de46d
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/public/assets/js/channel.js
View File

@@ -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";

7
server/public/assets/js/helpers.js
View File

@@ -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();

3
server/routing/client/router.js
View File

@@ -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,