FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

AttrTemplate.pm: move error (if any) in html (if any) (Forum #108999)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25155 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2021-10-30 12:48:21 +00:00
parent 706184536c
commit 8201991147
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/AttrTemplate.pm
View File

@ -372,6 +372,7 @@ AttrTemplate_Set($$@)
my $cmd = ""; my $cmd = "";
my @ret; my @ret;
my $option = 1; my $option = 1;
my $withHtml;
map { map {
if($_ =~ m/^(.*)\\$/) { if($_ =~ m/^(.*)\\$/) {
@ -393,7 +394,13 @@ AttrTemplate_Set($$@)
$cmd =~ s/##.*//; #114109 $cmd =~ s/##.*//; #114109
Log3 $name, 5, "AttrTemplate exec $cmd"; Log3 $name, 5, "AttrTemplate exec $cmd";
my $r = AnalyzeCommand($cl, $cmd); my $r = AnalyzeCommand($cl, $cmd);
push(@ret, $r) if($r); if($r) {
if($r =~ m,^<html>(.*)</html>$,s) {
$r = $1;
$withHtml = 1;
}
push(@ret, $r);
}
} else { } else {
Log3 $name, 5, "AttrTemplate skip $cmd"; Log3 $name, 5, "AttrTemplate skip $cmd";
@ -403,7 +410,11 @@ AttrTemplate_Set($$@)
} }
} split("\n", $cmdlist); } split("\n", $cmdlist);
return join("\n", @ret) if(@ret); if(@ret) {
my $r = join("\n", @ret);
$r = "<html>$r</html>" if($withHtml);
return $r;
}
if($h->{farewell}) { if($h->{farewell}) {
my $fw = $h->{farewell}; my $fw = $h->{farewell};