From 820199114748c2174e54a8225ba37cb3c81645bc Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sat, 30 Oct 2021 12:48:21 +0000 Subject: [PATCH] AttrTemplate.pm: move error (if any) in html (if any) (Forum #108999) git-svn-id: https://svn.fhem.de/fhem/trunk@25155 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/AttrTemplate.pm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/AttrTemplate.pm b/fhem/FHEM/AttrTemplate.pm index 6f008d7e1..8355b6d23 100644 --- a/fhem/FHEM/AttrTemplate.pm +++ b/fhem/FHEM/AttrTemplate.pm @@ -372,6 +372,7 @@ AttrTemplate_Set($$@) my $cmd = ""; my @ret; my $option = 1; + my $withHtml; map { if($_ =~ m/^(.*)\\$/) { @@ -393,7 +394,13 @@ AttrTemplate_Set($$@) $cmd =~ s/##.*//; #114109 Log3 $name, 5, "AttrTemplate exec $cmd"; my $r = AnalyzeCommand($cl, $cmd); - push(@ret, $r) if($r); + if($r) { + if($r =~ m,^(.*)$,s) { + $r = $1; + $withHtml = 1; + } + push(@ret, $r); + } } else { Log3 $name, 5, "AttrTemplate skip $cmd"; @@ -403,7 +410,11 @@ AttrTemplate_Set($$@) } } split("\n", $cmdlist); - return join("\n", @ret) if(@ret); + if(@ret) { + my $r = join("\n", @ret); + $r = "$r" if($withHtml); + return $r; + } if($h->{farewell}) { my $fw = $h->{farewell};