From 049c4cebdf0b98c65a16592a29e77fe44799501f Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Sat, 31 Mar 2012 11:20:42 +0000
Subject: [PATCH] eventMap / multiroom fixes

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1402 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem.pl                        |  1 +
 webfrontend/pgm2/01_FHEMWEB.pm | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/fhem.pl b/fhem.pl
index 9edaea6c5..2b3d366bb 100755
--- a/fhem.pl
+++ b/fhem.pl
@@ -1841,6 +1841,7 @@ CommandSetstate($$)
     if($a[1] =~ m/^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}) +([^ ].*)$/) {
       my ($tim, $nameval) =  ($1, $2);
       my ($sname, $sval) = split(" ", $nameval, 2);
+      (undef, $sval) = ReplaceEventMap($d, [$d, $sval], 0) if($attr{$d}{eventMap});
       my $ret = CallFn($sdev, "StateFn", $d, $tim, $sname, $sval);
       if($ret) {
         push @rets, $ret;
diff --git a/webfrontend/pgm2/01_FHEMWEB.pm b/webfrontend/pgm2/01_FHEMWEB.pm
index ee74e872d..98d055f92 100755
--- a/webfrontend/pgm2/01_FHEMWEB.pm
+++ b/webfrontend/pgm2/01_FHEMWEB.pm
@@ -1939,7 +1939,8 @@ FW_Notify($$)
   my $dn = $dev->{NAME};
   my $data;
 
-  if($filter eq "all" || AttrVal($dn, "room", "") eq $filter) {
+  my $rn = AttrVal($dn, "room", "");
+  if($filter eq "all" || $rn =~ m/\b$filter\b/) {
     FW_ReadIcons();
 
     my @old = ($FW_wname, $FW_ME, $FW_longpoll, $FW_ss, $FW_tp, $FW_subdir);
@@ -2050,7 +2051,14 @@ FW_devState($$)
 
   if($link) {
     my $room = AttrVal($d, "room", undef);
-    $link .= "&room=$room" if($room);
+    if($room) {
+      if($FW_room && $room =~ m/\b$FW_room\b/) {
+        $room = $FW_room;
+      } else {
+        $room =~ s/,.*//;
+      }
+      $link .= "&room=$room";
+    }
     if($FW_longpoll) {
       $txt = "<a onClick=\"cmd('$FW_ME$FW_subdir?XHR=1&$link')\">$txt</a>";