mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fhemweb.js: quote returned <> from modify (Forum #69138)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13722 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2017-03-17 11:05:48 +00:00
parent 436e3f232e
commit 197b65be80
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/www/pgm2/fhemweb.js
View File

@@ -600,6 +600,14 @@ FW_replaceLink(el)
$(el).css("cursor", "pointer"); $(el).css("cursor", "pointer");
} }
function
FW_htmlQuote(text)
{
return text.replace(/&/g, '&amp;') // Same as in 01_FHEMWEB
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
}
function function
FW_inlineModify() // Do not generate a new HTML page upon pressing modify FW_inlineModify() // Do not generate a new HTML page upon pressing modify
{ {
@@ -655,16 +663,16 @@ FW_inlineModify() // Do not generate a new HTML page upon pressing modify
FW_cmd(FW_root+"?"+encodeURIComponent(cmd)+"&XHR=1", function(resp){ FW_cmd(FW_root+"?"+encodeURIComponent(cmd)+"&XHR=1", function(resp){
if(resp) { if(resp) {
resp = FW_htmlQuote(resp);
if(resp.indexOf("\n") >= 0) if(resp.indexOf("\n") >= 0)
resp = '<pre>'+resp+'</pre>'; resp = '<pre>'+resp+'</pre>';
return FW_okDialog(resp); return FW_okDialog(resp);
} }
newDef = newDef.replace(/&/g, '&amp;') // Same as in 01_FHEMWEB
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
if(isDef) { if(isDef) {
if(newDef.indexOf("\n") >= 0) if(newDef.indexOf("\n") >= 0)
newDef = '<pre>'+newDef+'</pre>'; newDef = '<pre>'+newDef+'</pre>';
else
newDef = FW_htmlQuote(newDef);
$("div#disp").html(newDef).css("display", ""); $("div#disp").html(newDef).css("display", "");
$("div#edit").css("display", "none"); $("div#edit").css("display", "none");
} }