From 4121ebceae411cebd1577b67284305cf686a19b2 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Mon, 24 Apr 2017 10:33:00 +0000 Subject: [PATCH] RESIDENTS: fix lastActivityBy git-svn-id: https://svn.fhem.de/fhem/trunk@14095 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/RESIDENTStk.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/fhem/FHEM/RESIDENTStk.pm b/fhem/FHEM/RESIDENTStk.pm index 7d910d305..7b93423c5 100644 --- a/fhem/FHEM/RESIDENTStk.pm +++ b/fhem/FHEM/RESIDENTStk.pm @@ -1078,11 +1078,12 @@ m/^([a-zA-Z\d._]+(:[A-Za-z\d_\.\-\/]+)?,?)([a-zA-Z\d._]+(:[A-Za-z\d_\.\-\/]+)?,? sub RESIDENTStk_Notify($$) { my ( $hash, $dev ) = @_; - my $name = $hash->{NAME}; - my $TYPE = GetType($name); - my $prefix = RESIDENTStk_GetPrefixFromType($name); - my $devName = $dev->{NAME}; - my $devType = GetType($devName); + my $name = $hash->{NAME}; + my $TYPE = GetType($name); + my $prefix = RESIDENTStk_GetPrefixFromType($name); + my $devName = $dev->{NAME}; + my $devPrefix = RESIDENTStk_GetPrefixFromType($devName); + my $devType = GetType($devName); if ( $devName eq "global" ) { my $events = deviceEvents( $dev, 1 ); @@ -1222,11 +1223,9 @@ m/^((?:DELETE)?ATTR)\s+([A-Za-z\d._]+)\s+([A-Za-z\d_\.\-\/]+)(?:\s+(.*)\s*)?$/ if ( $event !~ /^[a-zA-Z\d._]+:/ || $event =~ /^state:/ ) { # get user realname - my $aliasAttr = "group"; - $aliasAttr = "alias" if ( $prefix eq "rg_" ); my $realname = AttrVal( $devName, - AttrVal( $devName, $prefix . "realname", $aliasAttr ), + AttrVal( $devName, $devPrefix . "realname", "group" ), $devName ); # update statistics