From 38852c4edcbb7dfb9e076574a1d3f890041b4eff Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sat, 6 Nov 2021 10:25:54 +0000 Subject: [PATCH] 98_SVG.pm: fix plotAsPng with get allowed (Forum #123937) git-svn-id: https://svn.fhem.de/fhem/trunk@25189 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 2 +- fhem/FHEM/98_SVG.pm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index aab78c10e..73a8aa283 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -76,6 +76,7 @@ use vars qw($FW_wname); # Web instance use vars qw($FW_subdir); # Sub-path in URL, used by FLOORPLAN/weblink use vars qw(%FW_pos); # scroll position use vars qw($FW_cname); # Current connection name +use vars qw($FW_chash); # client fhem hash use vars qw(%FW_hiddenroom); # hash of hidden rooms, used by weblink use vars qw($FW_plotmode);# Global plot mode (WEB attribute), used by SVG use vars qw($FW_plotsize);# Global plot size (WEB attribute), used by SVG @@ -120,7 +121,6 @@ my $FW_XHR; # Data only answer, no HTML my $FW_id=""; # id of current page my $FW_jsonp; # jasonp answer (sending function calls to the client) my $FW_headerlines; # -my $FW_chash; # client fhem hash my $FW_encoding="UTF-8"; my $FW_styleStamp=time(); my %FW_svgData; diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index bb27323a5..59cf33dbb 100644 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -13,6 +13,7 @@ sub FW_pO(@); use vars qw($FW_ME); # webname (default is fhem), needed by 97_GROUP use vars qw($FW_RET); # Returned data (html) use vars qw($FW_RETTYPE); # image/png or the like +use vars qw($FW_chash); # client fhem hash use vars qw($FW_cssdir); # css directory use vars qw($FW_detail); # currently selected device for detail view use vars qw($FW_dir); # base directory for web server @@ -2445,7 +2446,8 @@ plotAsPng(@) @webs=devspec2array("TYPE=FHEMWEB"); foreach(@webs) { if(!InternalVal($_,'TEMPORARY',undef)) { - $FW_wname=InternalVal($_,'NAME',''); + $FW_wname = InternalVal($_,'NAME',''); + $FW_chash = $defs{$FW_wname}; last; } }