FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

FileLog.pm/SVG.pm: add plotReplace CGI parameter (Forum #105499)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20537 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2019-11-18 21:28:30 +00:00
parent 7ec9d900b3
commit 76b730ad5b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/FHEM/92_FileLog.pm
View File

@ -570,6 +570,7 @@ FileLog_logWrapper($)
FW_pO "<td>"; FW_pO "<td>";
my $logtype = $defs{$d}{NAME}; my $logtype = $defs{$d}{NAME};
my $wl = "&amp;pos=" . join(";", map {"$_=$FW_pos{$_}"} keys %FW_pos); my $wl = "&amp;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". my $arg = "$FW_ME/SVG_showLog&dev=$logtype&logdev=$d".
"&gplotfile=$type&logfile=$file$wl"; "&gplotfile=$type&logfile=$file$wl";
if(AttrVal($d,"plotmode",$FW_plotmode) eq "SVG") { if(AttrVal($d,"plotmode",$FW_plotmode) eq "SVG") {

4
fhem/FHEM/98_SVG.pm
View File

@ -745,7 +745,7 @@ SVG_readgplotfile($$$)
my $specval = AttrVal($wl, "plotfunction", undef); my $specval = AttrVal($wl, "plotfunction", undef);
my $plotReplace = AttrVal($wl, "plotReplace", undef); my $plotReplace = AttrVal($wl, "plotReplace", $FW_webArgs{plotReplace});
my $pr; my $pr;
(undef, $pr) = parseParams($plotReplace,"\\s"," ") if($plotReplace); (undef, $pr) = parseParams($plotReplace,"\\s"," ") if($plotReplace);
my $prSubst = sub($) my $prSubst = sub($)
@ -838,7 +838,7 @@ SVG_substcfg($$$$$$)
my $gplot_script = join("", @{$cfg}); my $gplot_script = join("", @{$cfg});
$gplot_script .= $plot if(!$splitret); $gplot_script .= $plot if(!$splitret);
my $plotReplace = AttrVal($wl, "plotReplace", undef); my $plotReplace = AttrVal($wl, "plotReplace", $FW_webArgs{plotReplace});
if($plotReplace) { if($plotReplace) {
my ($list, $pr) = parseParams($plotReplace, "\\s"," "); my ($list, $pr) = parseParams($plotReplace, "\\s"," ");
for my $k (keys %$pr) { for my $k (keys %$pr) {