From b9f836b9ab279ec87ed45ccb5170b572b21d7a26 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Tue, 2 May 2017 18:06:49 +0000
Subject: [PATCH] 01_FHEMWEB.pm: regexp for Columns (Forum #71381)

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

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 2a51563f2..60ecd2692 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -1855,7 +1855,7 @@ FW_parseColumns()
   foreach my $roomgroup (split("[ \t\r\n]+", AttrVal($FW_wname,"column",""))) {
     my ($room, $groupcolumn)=split(":",$roomgroup,2);
     $room =~ s/%20/ /g; # Space
-    next if(!defined($groupcolumn) || $room ne $FW_room);
+    next if(!defined($groupcolumn) || $FW_room !~ m/$room/);
     $colNo = 1;
     foreach my $groups (split(/\|/,$groupcolumn)) {
       my $lineNo = 1;
@@ -1865,6 +1865,7 @@ FW_parseColumns()
       }
       $colNo++;
     }
+    last;
   }
   return (\%columns, $colNo);
 }
@@ -3310,7 +3311,7 @@ FW_widgetOverride($$)
       This attribute can be used to sort the groups in a room, just specify
       the groups in one column.
       Space in the room and group name has to be written as %20 for this
-      attribute.
+      attribute. The room name is a regeular expression.
       </li>
       <br>
 
@@ -4076,7 +4077,7 @@ FW_widgetOverride($$)
         href="#group">group</a> stehen. Dieses Attribut kann man zum sortieren
         der Gruppen auch dann verwenden, wenn man nur eine Spalte hat.
         Leerzeichen im Raum- und Gruppennamen sind f&uuml;r dieses Attribut als
-        %20 zu schreiben.
+        %20 zu schreiben. Raumname is ein regul&auml;rer Ausdruck.
         </li><br>
 
     <a name="confirmDelete"></a>