From 76b730ad5bf9b5560a02f289ff5bcb9d6bf24f6e Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 18 Nov 2019 21:28:30 +0000 Subject: [PATCH] FileLog.pm/SVG.pm: add plotReplace CGI parameter (Forum #105499) git-svn-id: https://svn.fhem.de/fhem/trunk@20537 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/92_FileLog.pm | 1 + fhem/FHEM/98_SVG.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index 17df1e564..0d22ea716 100644 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -570,6 +570,7 @@ FileLog_logWrapper($) FW_pO ""; my $logtype = $defs{$d}{NAME}; my $wl = "&pos=" . join(";", map {"$_=$FW_pos{$_}"} keys %FW_pos); + $wl .= "&plotReplace=$FW_webArgs{plotReplace}" if($FW_webArgs{plotReplace}); my $arg = "$FW_ME/SVG_showLog&dev=$logtype&logdev=$d". "&gplotfile=$type&logfile=$file$wl"; if(AttrVal($d,"plotmode",$FW_plotmode) eq "SVG") { diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index 546807dcb..ffc456961 100644 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -745,7 +745,7 @@ SVG_readgplotfile($$$) my $specval = AttrVal($wl, "plotfunction", undef); - my $plotReplace = AttrVal($wl, "plotReplace", undef); + my $plotReplace = AttrVal($wl, "plotReplace", $FW_webArgs{plotReplace}); my $pr; (undef, $pr) = parseParams($plotReplace,"\\s"," ") if($plotReplace); my $prSubst = sub($) @@ -838,7 +838,7 @@ SVG_substcfg($$$$$$) my $gplot_script = join("", @{$cfg}); $gplot_script .= $plot if(!$splitret); - my $plotReplace = AttrVal($wl, "plotReplace", undef); + my $plotReplace = AttrVal($wl, "plotReplace", $FW_webArgs{plotReplace}); if($plotReplace) { my ($list, $pr) = parseParams($plotReplace, "\\s"," "); for my $k (keys %$pr) {