From 8f3d97f450904da46a44b430f2963f1e98c2bbcf Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Mon, 23 Mar 2015 08:55:43 +0000
Subject: [PATCH] FHEMWEB: support space in room-name for the sortRoom and
 column attributes

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

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 6c24afbfd..c1d18700b 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -897,7 +897,8 @@ FW_updateHashes()
   $FW_room = AttrVal($FW_detail, "room", "Unsorted") if($FW_detail);
 
   if(AttrVal($FW_wname, "sortRooms", "")) { # Slow!
-    my @sortBy = split( " ", AttrVal( $FW_wname, "sortRooms", "" ) );
+    my @sortBy = map { s/%20/ /g; $_ }
+                 split( " ", AttrVal( $FW_wname, "sortRooms", "" ) );
     my %sHash;                                                       
     map { $sHash{$_} = FW_roomIdx(\@sortBy,$_) } keys %FW_rooms;
     @FW_roomsArr = sort { $sHash{$a} cmp $sHash{$b} } keys %FW_rooms;
@@ -1469,6 +1470,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);
     $colNo = 1;
     foreach my $groups (split(/\|/,$groupcolumn)) {
@@ -3077,7 +3079,9 @@ FW_widgetOverride($$)
     <a name="sortRooms"></a>
     <li>sortRooms<br>
         Space separated list of rooms to override the default
-        sort order of the room links. Example:<br>
+        sort order of the room links.
+        Space in room names to be written as %20 for this attribute.
+        Example:<br>
         attr WEB sortRooms DG OG EG Keller
         </li>
         <br>
@@ -3228,6 +3232,7 @@ FW_widgetOverride($$)
        a column if they are part of a <a href="#group">group</a>.
        This attribute can be used to sort the groups in a room, just specify
        the groups in one column.
+       Space in the room name has to be written as %20 for this attribute.
        </li>
 
      <a name="closeConn"></a>
@@ -3663,7 +3668,9 @@ FW_widgetOverride($$)
     <a name="sortRooms"></a>
     <li>sortRooms<br>
         Durch Leerzeichen getrennte Liste von R&auml;umen, um deren Reihenfolge
-        zu definieren.  Beispiel:<br>
+        zu definieren. Leerzeichen in Raumnamen muss als %20 spezifiziert
+        werden fuer dieses Attribut.
+        Beispiel:<br>
           attr WEB sortRooms DG OG EG Keller
         </li><br>
 
@@ -3829,6 +3836,8 @@ FW_widgetOverride($$)
         k&ouml;nnen nur dann Teil einer Spalte sein wenn sie in <a
         href="#group">group</a> stehen. Dieses Attribut kann man zum sortieren
         der Gruppen auch dann verwenden, wenn man nur eine Spalte hat.
+        Leerzeichen im Raumnamen sind f&uuml;r dieses Attribut als %20 zu
+        schreiben.
         </li><br>
 
      <a name="closeConn"></a>