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

FSN#35474 BBCodes in textarea strippen in lijsten, excel en csv

Browse Source 
svn path=/Website/trunk/; revision=28469
This commit is contained in:
Jos Groot Lipman
2016-03-14 09:53:15 +00:00
parent 2cacfd91a3
commit 8d2b598ec2
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
APPL/Shared/Shared.inc
View File

@@ -237,7 +237,20 @@ var shared = {
filter[name] = shared._qssafe(model, name, String(data));
}
return filter;
}
},
stripbbcodes: function (waarde)
{
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++)
{
var code = safepairs[i];
var strre = "\\[{0}\\](.*?)\\[\\/{0}\\]".format(code); // De ? maakt de .* lazy (ipv greedy)
var strnew = "$1";
var re = new RegExp(strre, "g");
var waarde = waarde.replace(re, strnew);
}
return waarde;
}
};
// Check for parameter pName and return the value
@@ -774,19 +787,6 @@ safe = {
}
return safehtml;
},
stripbbcodes: function (waarde)
{
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++)
{
var code = safepairs[i];
var strre = "\\[{0}\\](.*?)\\[\\/{0}\\]".format(code); // De ? maakt de .* lazy (ipv greedy)
var strnew = "$1";
var re = new RegExp(strre, "g");
var waarde = waarde.replace(re, strnew);
}
return waarde;
},
mldlinkhtml: function (safehtml)
{
if (!S("mld_autolink_regexp")) /// (?:(?:melding [A-Z]*)|(?:[A-Z]*\#[A-Z]*))(\d*)

9
APPL/Shared/resultset_table_v2.inc
View File

@@ -1516,7 +1516,6 @@ function Column(params)
{
if (param == "content" && params.content)
{
this.orgConent = this.content;
if (params.content instanceof Function)
{
this.content = params.content;
@@ -1575,7 +1574,13 @@ ResultsetTable.formatValue = function (val, params) //datatype, decimals)
if (!val)
return "";
val = safe.stripbbcodes(val);
if (typeof val != "string")
{ // Je raakt bijvoorbeeld de rechtse uitlijning van number-velden kwijt
__Log("Ongespecificeerd datatype van veld '{0}'{1} is {2}, fallback naar string".format(params.caption, typeof params.orgContent=='string'?' (' + params.orgContent + ')':"", typeof val), "#FF0");
val = String(val);
}
val = shared.stripbbcodes(val);
if (isXMLXSL || isCSV)
return val; // DOM lost encoding wel op of we doen safe.csv.