From 5cafd156db9b91219b19d8f876428917ee5d3fd5 Mon Sep 17 00:00:00 2001 From: loredo Date: Sun, 29 Mar 2015 13:16:00 +0000 Subject: [PATCH] RESIDENTS: fix reading lastActivityBy for GUEST child devices git-svn-id: https://svn.fhem.de/fhem/trunk@8325 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_RESIDENTS.pm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/fhem/FHEM/10_RESIDENTS.pm b/fhem/FHEM/10_RESIDENTS.pm index 1e5279d61..8274bde20 100644 --- a/fhem/FHEM/10_RESIDENTS.pm +++ b/fhem/FHEM/10_RESIDENTS.pm @@ -183,12 +183,24 @@ sub RESIDENTS_Notify($$) { if ( $change !~ /:/ ) { # get user realname - my $realnamesrc = ( - defined( $attr{$devName}{rr_realname} ) - && $attr{$devName}{rr_realname} ne "" - ? $attr{$devName}{rr_realname} - : "group" - ); + my $realnamesrc; + if ( $dev->{TYPE} eq "GUEST" ) { + $realnamesrc = ( + defined( $attr{$devName}{rg_realname} ) + && $attr{$devName}{rg_realname} ne "" + ? $attr{$devName}{rg_realname} + : "alias" + ); + } + else { + $realnamesrc = ( + defined( $attr{$devName}{rr_realname} ) + && $attr{$devName}{rr_realname} ne "" + ? $attr{$devName}{rr_realname} + : "group" + ); + } + my $realname = ( defined( $attr{$devName}{$realnamesrc} ) && $attr{$devName}{$realnamesrc} ne ""