From c47c4bfb0a435fa74649d4f4fd0aa7e47c8d8afb Mon Sep 17 00:00:00 2001
From: deespe <DeeSPe@users.noreply.github.com>
Date: Thu, 25 May 2017 19:41:04 +0000
Subject: [PATCH] 22_HOMEMODE: v1.1.2 - fix showing details in detail view
 although if not set to do so, add missing substitution for placeholder
 %SENSORSBATTERY%, add max-width to homeinfopanel

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14376 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/22_HOMEMODE.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/FHEM/22_HOMEMODE.pm b/FHEM/22_HOMEMODE.pm
index b07b340a4..f88a3da40 100644
--- a/FHEM/22_HOMEMODE.pm
+++ b/FHEM/22_HOMEMODE.pm
@@ -16,7 +16,7 @@ use Time::HiRes qw(gettimeofday);
 use HttpUtils;
 use vars qw{%attr %defs %modules};
 
-my $HOMEMODE_version = "1.1.1";
+my $HOMEMODE_version = "1.1.2";
 my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night";
 my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter";
 my $HOMEMODE_UserModes = "gotosleep,awoken,asleep";
@@ -338,7 +338,7 @@ sub HOMEMODE_Notify($$)
       foreach my $device (devspec2array("TYPE=$prestype:FILTER=presence=(maybe.)?(absent|present|appeared|disappeared)"))
       {
         next if (lc($device) !~ /$residentregex/);
-        push @presentdevicespresent,$device if (ReadingsVal($device,"presence","absent") =~ /^(present|appeared|maybe.absent)$/);
+        push @presentdevicespresent,$device if (ReadingsVal($device,"presence","") =~ /^(present|appeared|maybe.absent)$/);
       }
       if (grep /^.*:\s(present|appeared)$/,@{$events})
       {
@@ -1944,6 +1944,7 @@ sub HOMEMODE_replacePlaceholders($$;$)
   $cmd =~ s/%PREVMOTION%/$pmotion/g;
   $cmd =~ s/%SEASON%/$season/g;
   $cmd =~ s/%SELF%/$name/g;
+  $cmd =~ s/%SENSORSBATTERY%/$sensorsbattery/g;
   $cmd =~ s/%SENSORSCONTACT%/$sensorscontact/g;
   $cmd =~ s/%SENSORSENERGY%/$sensorsenergy/g;
   $cmd =~ s/%SENSORSMOTION%/$sensorsmotion/g;
@@ -2938,7 +2939,7 @@ sub HOMEMODE_checkIP($;$)
 sub HOMEMODE_Details($$$)
 {
   my ($FW_name,$name,$room) = @_;
-  return if ((AttrVal($name,"HomeAdvancedDetails","none") eq "none") || (!$room && AttrVal($name,"HomeAdvancedDetails","none") eq "room"));
+  return if (AttrVal($name,"HomeAdvancedDetails","none") eq "none" || (AttrVal($name,"HomeAdvancedDetails","") eq "room" && $FW_detail eq $name));
   my $hash = $defs{$name};
   my $html = "<div>";
   $html .= "<style>.homehover{cursor:pointer}.homeinfo{display:none}.tar{text-align:right}.homeinfopanel{min-height:30px;padding:3px 10px}</style>";