mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

33_readingsGroup.pm: dont use <html> for commands. see forum: https://forum.fhem.de/index.php/topic,14425.msg503533.html#msg503533

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12335 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme1968
2016-10-13 19:33:58 +00:00
parent f46621d123
commit 7146e9049d
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/33_readingsGroup.pm
View File

@@ -156,8 +156,7 @@ readingsGroup_updateDevices($;$)
foreach my $device (@devices) {
my $regex = $device->[1];
my @list = (undef);
@list = split(",",$regex) if( $regex );
my @list = split(",",$regex) if( $regex );
my $first = 1;
my $multi = @list;
for( my $i = 0; $i <= $#list; ++$i ) {
@@ -749,10 +748,9 @@ readingsGroup_2html($;$)
my $name = $h->{NAME}; #FIXME: name/name2 confusion
my $name2 = $h->{NAME};
my @list = (undef);
@list = split(",",$regex) if( $regex );
delete $hash->{groupedList};
my @list = split(",",$regex) if( $regex );
if( @list && $list[0] =~ m/^@(.*)/ ) {
my $index = $1;
my $regex = $list[$index];
@@ -1226,8 +1224,7 @@ readingsGroup_Notify($$)
next if( $dev->{NAME} ne $h->{NAME} );
my $n = $h->{NAME};
my $regex = @{$device}[1];
my @list = (undef);
@list = split(",",$regex) if( $regex );
my @list = split(",",$regex) if( $regex );
if( $hash->{groupedList} ) {
@list = @{$hash->{groupedList}};
@@ -1352,9 +1349,11 @@ readingsGroup_Notify($$)
$cmd = lookup2($hash->{helper}{commands},$n,$reading,$value);
if( $cmd && $cmd =~ m/^(\w.*):(\S.*)?$/ ) {
if( $reading eq "state" ) {
DoTrigger( $name, "$n: <html>$value</html>" );
DoTrigger( $name, "$n: $value" );
#DoTrigger( $name, "$n: <html>$value</html>" );
} else {
DoTrigger( $name, "$n.$reading: <html>$value</html>" );
DoTrigger( $name, "$n.$reading: $value" );
#DoTrigger( $name, "$n.$reading: <html>$value</html>" );
}
next;
}