admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STAM#51298 url werd dubbel ge-escaped waardoor querystring's er niet goed uitkwamen.

Browse Source 
svn path=/Website/trunk/; revision=39486
This commit is contained in:
Koen Reefman
2018-10-22 12:58:30 +00:00
parent a6fa18192c
commit 8a3f747e55
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/FAC/fac_setting.asp
View File

@@ -248,7 +248,7 @@ function hexttl (setting_type, val)
if (oRs("fac_setting_pvalue").value != actual &&
oRs("fac_setting_default").value != actual)
{
ROTEXTAREATR("fldtxt", L("lcl_fac_effective") + clr(oRs, "fac_setting_default") , actual);
ROTEXTAREATR("fldtxt", L("lcl_fac_effective") + clr(oRs, "fac_setting_default") , String(actual));
}
};
BLOCK_END();

8
APPL/Shared/Shared.inc
View File

@@ -297,6 +297,8 @@ var shared = {
},
stripbbcodes: function (waarde)
{
if (!waarde) // early exit
return "";
var safepairs = "h1,h2,h3,h4,h5,h6,b,i,u,em,strong,small,big,th,td,tr,table,xmp".split(",");
for (var i = 0; i < safepairs.length; i++)
{
@@ -311,7 +313,7 @@ var shared = {
var strre = "\\[link\\](.*?)\\[\\/link\\]";
var re = new RegExp(strre, "gi");
var allowedLinkRegex = new RegExp(S("allowedLinkRegex"), "gi");
var matched = waarde && waarde.match(re);
var matched = waarde.match(re);
if (matched != null)
{
for (var i = 0; i < matched.length; i++)
@@ -917,6 +919,8 @@ safe = {
// Pas die eventueel ook aan
fclthtml: function (waarde, mldlink)
{
if (!waarde) // early exit
return "";
var safepairs = "h1,h2,h3,h4,h5,h6,b,i,u,em,strong,small,big,th,td,tr,table,pre,code".split(",");
var safehtml = safe.html(waarde); // Let op: vervangt *alle* \n door <br>. Dat gaan we deels later nog terugdraaien
// We hebben het wel *nodig* omdat .* niet over meerdere regels werkt (hoewel dat
@@ -926,7 +930,7 @@ safe = {
var strre = "\\[link\\](.*?)\\[\\/link\\]";
var re = new RegExp(strre, "gi");
var allowedLinkRegex = new RegExp(S("allowedLinkRegex"), "gi");
var matched = waarde && waarde.match(re);
var matched = waarde.match(re);
if (matched != null)
{
var url = "";