Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_SVG: remove allowedCommands checking from the AnalyzeCommand parts

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7566 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-14 17:47:08 +00:00
parent cc4ae1aae9
commit 39bd43b66f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/98_SVG.pm
View File

@ -711,15 +711,14 @@ SVG_substcfg($$$$$$)
my $fileesc = $file; my $fileesc = $file;
$fileesc =~ s/\\/\\\\/g; # For Windows, by MarkusRR $fileesc =~ s/\\/\\\\/g; # For Windows, by MarkusRR
my $title = AttrVal($wl, "title", "\"$fileesc\""); my $title = AttrVal($wl, "title", "\"$fileesc\"");
my $allowed = AttrVal($FW_wname,"allowedCommands",undef);
$title = AnalyzeCommand(undef, "{ $title }", $allowed); $title = AnalyzeCommand(undef, "{ $title }");
my $label = AttrVal($wl, "label", undef); my $label = AttrVal($wl, "label", undef);
my @g_label; my @g_label;
if ($label) { if ($label) {
@g_label = split("::",$label); @g_label = split("::",$label);
foreach (@g_label) { foreach (@g_label) {
$_ = AnalyzeCommand(undef, "{ $_ }", $allowed); $_ = AnalyzeCommand(undef, "{ $_ }");
} }
} }
@ -1549,7 +1548,6 @@ SVG_render($$$$$$$$$;$$)
my (%hstep,%htics,%axdrawn); my (%hstep,%htics,%axdrawn);
my $allowed = AttrVal($FW_wname,"allowedCommands",undef);
#-- yrange handling for axes x1y1..x1y8 #-- yrange handling for axes x1y1..x1y8
for my $idx (0..7) { for my $idx (0..7) {
my $a = "x1y".($idx+1); my $a = "x1y".($idx+1);
@ -1558,7 +1556,7 @@ SVG_render($$$$$$$$$;$$)
$yra="yrange" if ($yra eq "y1range"); $yra="yrange" if ($yra eq "y1range");
#-- yrange is specified in plotfile #-- yrange is specified in plotfile
if($conf{$yra}) { if($conf{$yra}) {
$conf{$yra} = AnalyzeCommand(undef, $1, $allowed) $conf{$yra} = AnalyzeCommand(undef, $1)
if($conf{$yra} =~ /^({.*})$/); if($conf{$yra} =~ /^({.*})$/);
if($conf{$yra} =~ /\[(.*):(.*)\]/) { if($conf{$yra} =~ /\[(.*):(.*)\]/) {
$hmin{$a} = $1 if($1 ne ""); $hmin{$a} = $1 if($1 ne "");