FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 01:14:19 +00:00
Code Issues Releases Wiki Activity

10_RESIDENTS: fix realname

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13611 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-03-05 13:41:20 +00:00
parent f5ca36d060
commit 45e22fa235
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fhem/FHEM/10_RESIDENTS.pm
View File

@ -179,30 +179,13 @@ sub RESIDENTS_Notify($$) {
if ( $change !~ /:/ ) { if ( $change !~ /:/ ) {
# get user realname # get user realname
my $realnamesrc; my $realname =
if ( $dev->{TYPE} eq "GUEST" ) { AttrVal( $devName,
$realnamesrc = ( AttrVal( $devName, "rr_realname", "group" ), $devName );
defined( $attr{$devName}{rg_realname} ) $realname =
&& $attr{$devName}{rg_realname} ne "" AttrVal( $devName,
? $attr{$devName}{rg_realname} AttrVal( $devName, "rg_realname", "alias" ), $devName )
: "alias" if ( $dev->{TYPE} eq "GUEST" );
);
}
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 ""
? $attr{$devName}{$realnamesrc}
: $devName
);
# update statistics # update statistics
readingsBulkUpdate( $hash, "lastActivity", readingsBulkUpdate( $hash, "lastActivity",
@ -266,10 +249,10 @@ sub RESIDENTS_Notify($$) {
################################### ###################################
sub RESIDENTS_Set($@) { sub RESIDENTS_Set($@) {
my ( $hash, @a ) = @_; my ( $hash, @a ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $state = ReadingsVal( $name, "state", "initialized" ); my $state = ReadingsVal( $name, "state", "initialized" );
my $roommates = ( $hash->{ROOMMATES} ? $hash->{ROOMMATES} : "" ); my $roommates = ( $hash->{ROOMMATES} ? $hash->{ROOMMATES} : "" );
my $guests = ( $hash->{GUESTS} ? $hash->{GUESTS} : "" ); my $guests = ( $hash->{GUESTS} ? $hash->{GUESTS} : "" );
Log3 $name, 5, "RESIDENTS $name: called function RESIDENTS_Set()"; Log3 $name, 5, "RESIDENTS $name: called function RESIDENTS_Set()";
@ -628,7 +611,7 @@ sub RESIDENTS_UpdateReadings (@) {
my $roommateName = my $roommateName =
AttrVal( $roommate, AttrVal( $roommate,
AttrVal( $roommate, "rr_realname", "alias" ), "" ); AttrVal( $roommate, "rr_realname", "group" ), "" );
Log3 $name, 5, Log3 $name, 5,
"RESIDENTS $name: considering $roommate for state change"; "RESIDENTS $name: considering $roommate for state change";