* merge from dav_rework:
[citadel.git] / webcit / roomlist.c
index 818b02d3a9ba2e3b02f34c768f382a0f67e2ab72..4405b5c2410c77e156dfa830aa4f8fd80f057b51 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: roomlist.c 7751 2009-08-28 21:13:28Z dothebart $
+ * $Id$
  * room listings and filters.
  */
 
@@ -9,16 +9,16 @@
 
 void DeleteFloor(void *vFloor)
 {
-       floor *Floor;
-       Floor = (floor*) vFloor;
-       FreeStrBuf(&Floor->Name);
-       free(Floor);
+       Floor *pFloor;
+       pFloor = (Floor*) vFloor;
+       FreeStrBuf(&pFloor->Name);
+       free(pFloor);
 }
 
 int SortFloorsByNameOrder(const void *vfloor1, const void *vfloor2) 
 {
-       floor *f1 = (floor*) GetSearchPayload(vfloor1);
-       floor *f2 = (floor*) GetSearchPayload(vfloor2);
+       Floor *f1 = (Floor*) GetSearchPayload(vfloor1);
+       Floor *f2 = (Floor*) GetSearchPayload(vfloor2);
        
        /* prefer My floor over alpabetical sort */
        if (f1->ID == VIRTUAL_MY_FLOOR)
@@ -31,12 +31,13 @@ int SortFloorsByNameOrder(const void *vfloor1, const void *vfloor2)
 
 HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP) 
 {
-
+       int Done = 0;
        const char *Err;
        StrBuf *Buf;
        HashList *floors;
+       HashList *floorsbyname;
        HashPos *it;
-       floor *Floor;
+       Floor *pFloor;
        void *vFloor;
        const char *Pos;
        int i;
@@ -47,33 +48,42 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
 
        if (WCC->Floors != NULL)
                return WCC->Floors;
-       WCC->Floors = floors = NewHash(1, NULL);
+       WCC->Floors = floors = NewHash(1, Flathash);
+       WCC->FloorsByName = floorsbyname = NewHash(1, NULL);
        Buf = NewStrBuf();
 
-       Floor = malloc(sizeof(floor));
-       Floor->ID = VIRTUAL_MY_FLOOR;
-       Floor->Name = NewStrBufPlain(_("My Folders"), -1);
-       Floor->NRooms = 0;
+       pFloor = (Floor*) malloc(sizeof(Floor));
+       pFloor->ID = VIRTUAL_MY_FLOOR;
+       pFloor->Name = NewStrBufPlain(_("My Folders"), -1);
+       pFloor->NRooms = 0;
        
-       Put(floors, IKEY(Floor->ID), Floor, DeleteFloor);
+       Put(floors, IKEY(pFloor->ID), pFloor, DeleteFloor);
+       Put(floorsbyname, SKEY(pFloor->Name), pFloor, reference_free_handler);
 
        serv_puts("LFLR"); /* get floors */
        StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err); /* '100', we hope */
        if (GetServerStatus(Buf, NULL) == 1) 
        {
-               while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) 
-               {
+               while(!Done && StrBuf_ServGetln(Buf))
+                       if ( (StrLength(Buf)==3) && 
+                            !strcmp(ChrPtr(Buf), "000")) 
+                       {
+                               Done = 1;
+                       }
+                       else
+                       {
                        
-                       Pos = NULL;
+                               Pos = NULL;
 
-                       Floor = malloc(sizeof(floor));
-                       Floor->ID = StrBufExtractNext_long(Buf, &Pos, '|');
-                       Floor->Name = NewStrBufPlain(NULL, StrLength(Buf));
-                       StrBufExtract_NextToken(Floor->Name, Buf, &Pos, '|');
-                       Floor->NRooms = StrBufExtractNext_long(Buf, &Pos, '|');
+                               pFloor = (Floor*) malloc(sizeof(Floor));
+                               pFloor->ID = StrBufExtractNext_int(Buf, &Pos, '|');
+                               pFloor->Name = NewStrBufPlain(NULL, StrLength(Buf));
+                               StrBufExtract_NextToken(pFloor->Name, Buf, &Pos, '|');
+                               pFloor->NRooms = StrBufExtractNext_long(Buf, &Pos, '|');
 
-                       Put(floors, IKEY(Floor->ID), Floor, DeleteFloor);
-               }
+                               Put(floors, IKEY(pFloor->ID), pFloor, DeleteFloor);
+                               Put(floorsbyname, SKEY(pFloor->Name), pFloor, reference_free_handler);
+                       }
        }
        FreeStrBuf(&Buf);
        
@@ -82,7 +92,7 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
        SortByPayload(floors, SortFloorsByNameOrder);
        it = GetNewHashPos(floors, 0);
        while ( GetNextHashPos(floors, it, &HKLen, &HashKey, &vFloor)) 
-               ((floor*) vFloor)->AlphaN = i++;
+               ((Floor*) vFloor)->AlphaN = i++;
        DeleteHashPos(&it);
        SortByHashKeyStr(floors);
 
@@ -91,23 +101,23 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
 {
-       floor *Floor = (floor *)(TP->Context);
+       Floor *myFloor = (Floor *)CTX;
 
-       StrBufAppendPrintf(Target, "%d", Floor->ID);
+       StrBufAppendPrintf(Target, "%d", myFloor->ID);
 }
 
 void tmplput_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
 {
-       floor *Floor = (floor *)(TP->Context);
+       Floor *myFloor = (Floor *)CTX;
 
-       StrBufAppendTemplate(Target, TP, Floor->Name, 0);
+       StrBufAppendTemplate(Target, TP, myFloor->Name, 0);
 }
 
 void tmplput_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
 {
-       floor *Floor = (floor *)(TP->Context);
+       Floor *myFloor = (Floor *)CTX;
 
-       StrBufAppendPrintf(Target, "%d", Floor->NRooms);
+       StrBufAppendPrintf(Target, "%d", myFloor->NRooms);
 }
 HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP) 
 {
@@ -116,29 +126,38 @@ HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP)
        if (WCC->Floors == NULL)
                GetFloorListHash(Target, TP);
        serv_puts("LKRA");
-       return GetRoomListHash(Target, TP);
+       if (WCC->Rooms == NULL) 
+               WCC->Rooms =  GetRoomListHash(Target, TP);
+       return WCC->Rooms;
 }
 
-void DeleteFolder(void *vFolder)
+void FlushFolder(folder *room)
 {
        int i;
-       folder *room;
-       room = (folder*) vFolder;
 
        FreeStrBuf(&room->name);
-
        if (room->RoomNameParts != NULL)
        {
                for (i=0; i < room->nRoomNameParts; i++)
                        FreeStrBuf(&room->RoomNameParts[i]);
                free(room->RoomNameParts);
        }
+}
+
+void vDeleteFolder(void *vFolder)
+{
+       folder *room;
+
+       room = (folder*) vFolder;
+       FlushFolder(room);
+
        free(room);
 }
 
 
 HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP) 
 {
+       int Done = 0;
        HashList *rooms;
        folder *room;
        StrBuf *Buf;
@@ -154,75 +173,79 @@ HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
        StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err);
        if (GetServerStatus(Buf, NULL) == 1) 
        {
-               while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), 
-                     strcmp(ChrPtr(Buf), "000")) 
-               {
-
-                       Pos = NULL;
-                       room = (folder*) malloc (sizeof(folder));
-                       memset(room, 0, sizeof(folder));
+               while(!Done && StrBuf_ServGetln(Buf))
+                       if ( (StrLength(Buf)==3) && 
+                            !strcmp(ChrPtr(Buf), "000")) 
+                       {
+                               Done = 1;
+                       }
+                       else
+                       {                               
+                               Pos = NULL;
+                               room = (folder*) malloc (sizeof(folder));
+                               memset(room, 0, sizeof(folder));
 
-                       /* Load the base data from the server reply */
-                       room->name = NewStrBufPlain(NULL, StrLength(Buf));
-                       StrBufExtract_NextToken(room->name, Buf, &Pos, '|');
+                               /* Load the base data from the server reply */
+                               room->name = NewStrBufPlain(NULL, StrLength(Buf));
+                               StrBufExtract_NextToken(room->name, Buf, &Pos, '|');
 
-                       room->QRFlags = StrBufExtractNext_long(Buf, &Pos, '|');
-                       room->floorid = StrBufExtractNext_long(Buf, &Pos, '|');
-                       room->listorder = StrBufExtractNext_long(Buf, &Pos, '|');
-                       room->QRFlags2 = StrBufExtractNext_long(Buf, &Pos, '|');
+                               room->QRFlags = StrBufExtractNext_long(Buf, &Pos, '|');
+                               room->floorid = StrBufExtractNext_int(Buf, &Pos, '|');
+                               room->listorder = StrBufExtractNext_long(Buf, &Pos, '|');
+                               room->QRFlags2 = StrBufExtractNext_long(Buf, &Pos, '|');
 
-                       room->RAFlags = StrBufExtractNext_long(Buf, &Pos, '|');
+                               room->RAFlags = StrBufExtractNext_long(Buf, &Pos, '|');
 
 /*
- ACWHUT?
-                       room->ACL = NewStrBufPlain(NULL, StrLength(Buf));
-                       StrBufExtract_NextToken(room->ACL, Buf, &Pos, '|');
 ACWHUT?
+  room->ACL = NewStrBufPlain(NULL, StrLength(Buf));
+  StrBufExtract_NextToken(room->ACL, Buf, &Pos, '|');
 */
 
-                       room->view = StrBufExtractNext_long(Buf, &Pos, '|');
-                       room->defview = StrBufExtractNext_long(Buf, &Pos, '|');
-                       room->lastchange = StrBufExtractNext_long(Buf, &Pos, '|');
+                               room->view = StrBufExtractNext_long(Buf, &Pos, '|');
+                               room->defview = StrBufExtractNext_long(Buf, &Pos, '|');
+                               room->lastchange = StrBufExtractNext_long(Buf, &Pos, '|');
 
-                       /* Evaluate the Server sent data for later use */
-                       /* find out, whether we are in a sub-room */
-                       room->nRoomNameParts = StrBufNum_tokens(room->name, '\\');
-                       if (room->nRoomNameParts > 1)
-                       {
-                               int i;
-
-                               Pos = NULL;
-                               room->RoomNameParts = malloc(sizeof(StrBuf*) * (room->nRoomNameParts + 1));
-                               memset(room->RoomNameParts, 0, sizeof(StrBuf*) * (room->nRoomNameParts + 1));
-                               for (i=0; i < room->nRoomNameParts; i++)
+                               /* Evaluate the Server sent data for later use */
+                               /* find out, whether we are in a sub-room */
+                               room->nRoomNameParts = StrBufNum_tokens(room->name, '\\');
+                               if (room->nRoomNameParts > 1)
                                {
-                                       room->RoomNameParts[i] = NewStrBuf();
-                                       StrBufExtract_NextToken(room->RoomNameParts[i],
-                                                               room->name, &Pos, '\\');
+                                       int i;
+
+                                       Pos = NULL;
+                                       room->RoomNameParts = malloc(sizeof(StrBuf*) * (room->nRoomNameParts + 1));
+                                       memset(room->RoomNameParts, 0, sizeof(StrBuf*) * (room->nRoomNameParts + 1));
+                                       for (i=0; i < room->nRoomNameParts; i++)
+                                       {
+                                               room->RoomNameParts[i] = NewStrBuf();
+                                               StrBufExtract_NextToken(room->RoomNameParts[i],
+                                                                       room->name, &Pos, '\\');
+                                       }
                                }
-                       }
 
-                       /* Private mailboxes on the main floor get remapped to the personal folder */
-                       if ((room->QRFlags & QR_MAILBOX) && 
-                           (room->floorid == 0))
-                       {
-                               room->floorid = VIRTUAL_MY_FLOOR;
-                               if ((room->nRoomNameParts == 1) && 
-                                   (StrLength(room->name) == 4) && 
-                                   (strcmp(ChrPtr(room->name), "Mail") == 0))
+                               /* Private mailboxes on the main floor get remapped to the personal folder */
+                               if ((room->QRFlags & QR_MAILBOX) && 
+                                   (room->floorid == 0))
                                {
-                                       room->is_inbox = 1;
-                               }
+                                       room->floorid = VIRTUAL_MY_FLOOR;
+                                       if ((room->nRoomNameParts == 1) && 
+                                           (StrLength(room->name) == 4) && 
+                                           (strcmp(ChrPtr(room->name), "Mail") == 0))
+                                       {
+                                               room->is_inbox = 1;
+                                       }
 
-                       }
-                       /* get a pointer to the floor we're on: */
-                       GetHash(WCC->Floors, IKEY(room->floorid), &vFloor);
-                       room->Floor = (const floor*) vFloor;
+                               }
+                               /* get a pointer to the floor we're on: */
+                               GetHash(WCC->Floors, IKEY(room->floorid), &vFloor);
+                               room->Floor = (const Floor*) vFloor;
 
 
 
-                       /* now we know everything, remember it... */
-                       Put(rooms, SKEY(room->name), room, DeleteFolder);
-               }
+                               /* now we know everything, remember it... */
+                               Put(rooms, SKEY(room->name), room, vDeleteFolder);
+                       }
        }
 
        SubTP.Filter.ContextType = CTX_ROOMS;
@@ -318,11 +341,11 @@ int CompareRoomListByFloorRoomPrivFirstRev(const void *room1, const void *room2)
 {
        folder *r1 = (folder*) GetSearchPayload(room1);
        folder *r2 = (folder*) GetSearchPayload(room2);
-  
+
        if ((r1->Floor == NULL)  ||
            (r2->Floor == NULL))
                return 0;
-               
+
        /**
         * are we on the same floor? else sort by floor.
         */
@@ -427,13 +450,13 @@ int GroupchangeRoomListByFloorRoomPrivFirst(const void *room1, const void *room2
 
 void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
 
        StrBufAppendTemplate(Target, TP, Folder->name, 0);
 }
 void tmplput_ROOM_BASENAME(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *room = (folder *)(TP->Context);
+       folder *room = (folder *)CTX;
 
        if (room->nRoomNameParts > 1)
                StrBufAppendTemplate(Target, TP, 
@@ -443,7 +466,7 @@ void tmplput_ROOM_BASENAME(StrBuf *Target, WCTemplputParams *TP)
 }
 void tmplput_ROOM_LEVEL_N_TIMES(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *room = (folder *)(TP->Context);
+       folder *room = (folder *)CTX;
        int i;
         const char *AppendMe;
         long AppendMeLen;
@@ -459,7 +482,7 @@ void tmplput_ROOM_LEVEL_N_TIMES(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_ACL(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
 
        StrBufAppendPrintf(Target, "%ld", Folder->RAFlags, 0);
 }
@@ -467,124 +490,129 @@ void tmplput_ROOM_ACL(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_QRFLAGS(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        StrBufAppendPrintf(Target, "%d", Folder->QRFlags);
 }
 
+void tmplput_ROOM_RAFLAGS(StrBuf *Target, WCTemplputParams *TP) 
+{
+       folder *Folder = (folder *)(TP->Context);
+       StrBufAppendPrintf(Target, "%d", Folder->RAFlags);
+}
 
 
 void tmplput_ROOM_FLOORID(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        StrBufAppendPrintf(Target, "%d", Folder->floorid);
 }
 
 void tmplput_ROOM_LISTORDER(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        StrBufAppendPrintf(Target, "%d", Folder->listorder);
 }
 void tmplput_ROOM_VIEW(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        StrBufAppendPrintf(Target, "%d", Folder->view);
 }
 void tmplput_ROOM_DEFVIEW(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        StrBufAppendPrintf(Target, "%d", Folder->defview);
 }
 void tmplput_ROOM_LASTCHANGE(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        StrBufAppendPrintf(Target, "%d", Folder->lastchange);
 }
 void tmplput_ROOM_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
-       const floor *Floor = Folder->Floor;
+       folder *Folder = (folder *)CTX;
+       const Floor *pFloor = Folder->Floor;
 
-       if (Floor == NULL)
+       if (pFloor == NULL)
                return;
 
-       StrBufAppendPrintf(Target, "%d", Floor->ID);
+       StrBufAppendPrintf(Target, "%d", pFloor->ID);
 }
 
 void tmplput_ROOM_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
-       const floor *Floor = Folder->Floor;
+       folder *Folder = (folder *)CTX;
+       const Floor *pFloor = Folder->Floor;
 
-       if (Floor == NULL)
+       if (pFloor == NULL)
                return;
 
-       StrBufAppendTemplate(Target, TP, Floor->Name, 0);
+       StrBufAppendTemplate(Target, TP, pFloor->Name, 0);
 }
 
 void tmplput_ROOM_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
-       const floor *Floor = Folder->Floor;
+       folder *Folder = (folder *)CTX;
+       const Floor *pFloor = Folder->Floor;
 
-       if (Floor == NULL)
+       if (pFloor == NULL)
                return;
-       StrBufAppendPrintf(Target, "%d", Floor->NRooms);
+       StrBufAppendPrintf(Target, "%d", pFloor->NRooms);
 }
 
 
 
 int ConditionalRoomHas_UA_KNOWN(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        return (Folder->RAFlags & UA_KNOWN) != 0;
 }
 
 int ConditionalRoomHas_UA_GOTOALLOWED(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        return (Folder->RAFlags & UA_GOTOALLOWED) != 0;
 }
 
 int ConditionalRoomHas_UA_HASNEWMSGS(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        return (Folder->RAFlags & UA_HASNEWMSGS) != 0;
 }
 
 int ConditionalRoomHas_UA_ZAPPED(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        return (Folder->RAFlags & UA_ZAPPED) != 0;
 }
 
 int ConditionalRoomHas_UA_POSTALLOWED(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        return (Folder->RAFlags & UA_POSTALLOWED) != 0;
 }
 
 int ConditionalRoomHas_UA_ADMINALLOWED(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        return (Folder->RAFlags & UA_ADMINALLOWED) != 0;
 }
 
 int ConditionalRoomHas_UA_DELETEALLOWED(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        return (Folder->RAFlags & UA_DELETEALLOWED) != 0;
 }
 
 
 int ConditionalRoomIsInbox(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        return Folder->is_inbox;
 }
 
 void tmplput_ROOM_COLLECTIONTYPE(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
        
        switch(Folder->view) {
        case VIEW_CALENDAR:
@@ -602,6 +630,9 @@ void tmplput_ROOM_COLLECTIONTYPE(StrBuf *Target, WCTemplputParams *TP)
        case VIEW_JOURNAL:
                StrBufAppendBufPlain(Target, HKEY("vjournal"), 0);
                break;
+       case VIEW_WIKI:
+               StrBufAppendBufPlain(Target, HKEY("wiki"), 0);
+               break;
        }
 }
 
@@ -610,7 +641,9 @@ void tmplput_ROOM_COLLECTIONTYPE(StrBuf *Target, WCTemplputParams *TP)
 
 int ConditionalRoomHasGroupdavContent(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)(TP->Context);
+       folder *Folder = (folder *)CTX;
+
+       lprintf(0, "-> %s: %ld\n", ChrPtr(Folder->name), Folder->view);
 
        return ((Folder->view == VIEW_CALENDAR) || 
                (Folder->view == VIEW_TASKS) || 
@@ -624,59 +657,94 @@ int ConditionalRoomHasGroupdavContent(StrBuf *Target, WCTemplputParams *TP)
 int ConditionalFloorIsRESTSubFloor(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession  *WCC = WC;
-
-       /** If we have dav_depth the client just wants the _current_ room without subfloors */
-       if (WCC->Hdr->HR.dav_depth == 0)
-               return 0;
-           
-       return 1;
+       Floor *MyFloor = (Floor *)CTX;
+       /** if we have dav_depth the client just wants the subfloors */
+       if ((WCC->Hdr->HR.dav_depth == 1) && 
+           (GetCount(WCC->Directory) == 0))
+               return 1;
+       return WCC->CurrentFloor == MyFloor;
 }
 
 
 int ConditionalRoomIsRESTSubRoom(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession  *WCC = WC;
-       folder     *Folder = (folder *)(TP->Context);
+       folder     *Folder = (folder *)CTX;
        HashPos    *it;
        StrBuf     * Dir;
        void       *vDir;
        long        len;
         const char *Key;
-       int i;
-
+       int i, j, urlp;
+       int delta;
 
 
+       /* list only folders relative to the current floor... */
        if (Folder->Floor != WCC->CurrentFloor)
                return 0;
 
-       if (GetCount(WCC->Directory) != Folder->nRoomNameParts)
+       urlp = GetCount(WCC->Directory);
+       delta = Folder->nRoomNameParts - urlp + 1;
+
+       lprintf(0, "\n->%s: %ld - %ld ", ChrPtr(Folder->name), urlp, 
+               Folder->nRoomNameParts);
+       /* list only the floors which are in relation to the dav_depth header */
+       if (WCC->Hdr->HR.dav_depth != delta) {
+               lprintf(0, "1\n");
                return 0;
+       }
+
 
        it = GetNewHashPos(WCC->Directory, 0);
-       for (i = 0; i < Folder->nRoomNameParts; i++)
-       {
-               if (!GetNextHashPos(WCC->Directory, it, &len, &Key, &vDir) ||
-                   (vDir == NULL))
+       /* Fast forward the floorname we checked above... */
+       GetNextHashPos(WCC->Directory, it, &len, &Key, &vDir);
+
+       if (Folder->nRoomNameParts > 1) {               
+               for (i = 0, j = 1; 
+                    (i > Folder->nRoomNameParts) && (j > urlp); 
+                    i++, j++)
                {
-                       DeleteHashPos(&it);
-                       return 0;
+                       if (!GetNextHashPos(WCC->Directory, 
+                                           it, &len, &Key, &vDir) ||
+                           (vDir == NULL))
+                       {
+                               DeleteHashPos(&it);
+
+                               lprintf(0, "3\n");
+                               return 0;
+                       }
+                       Dir = (StrBuf*) vDir;
+                       if (strcmp(ChrPtr(Folder->RoomNameParts[i]), 
+                                  ChrPtr(Dir)) != 0)
+                       {
+                               DeleteHashPos(&it);
+                               lprintf(0, "4\n");
+                               return 0;
+                       }
                }
-               Dir = (StrBuf*) vDir;
-               if (strcmp(ChrPtr(Folder->RoomNameParts[i]), 
-                          ChrPtr(Dir)) != 0)
+               DeleteHashPos(&it);
+               return 1;
+       }
+       else {
+               if (!GetNextHashPos(WCC->Directory, 
+                                   it, &len, &Key, &vDir) ||
+                   (vDir == NULL))
                {
                        DeleteHashPos(&it);
-                       return 0;
+                       
+                       lprintf(0, "5\n");
+                       return WCC->Hdr->HR.dav_depth == 1;
                }
-       }
-       DeleteHashPos(&it);
+               DeleteHashPos(&it);
+               Dir = (StrBuf*) vDir;
+               if (WCC->Hdr->HR.dav_depth == 0) {
+                       return (strcmp(ChrPtr(Folder->name), 
+                                      ChrPtr(Dir))
+                               == 0);
 
-       /** If we have dav_depth the client just wants the _current_ room without subfloors */
-       if ((WCC->Hdr->HR.dav_depth == 0) &&
-           (i != Folder->nRoomNameParts))
+               }
                return 0;
-
-       return 1;
+       }
 }
 
 
@@ -694,6 +762,14 @@ void jsonRoomFlr(void)
 }
 
 
+void 
+SessionDetachModule_ROOMLIST
+(wcsession *sess)
+{
+       DeleteHash(&sess->Floors);
+       DeleteHash(&sess->Rooms);
+       DeleteHash(&sess->FloorsByName);
+}
 
 void 
 InitModule_ROOMLIST
@@ -709,7 +785,7 @@ InitModule_ROOMLIST
 
        RegisterIterator("LFLR", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
 
-       RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
+       RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, NULL, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
 
        RegisterNamespace("ROOM:INFO:FLOORID", 0, 1, tmplput_ROOM_FLOORID, NULL, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS);
@@ -719,6 +795,7 @@ InitModule_ROOMLIST
 
        RegisterNamespace("ROOM:INFO:ACL", 0, 1, tmplput_ROOM_ACL, NULL, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:QRFLAGS", 0, 1, tmplput_ROOM_QRFLAGS, NULL, CTX_ROOMS);
+       RegisterNamespace("ROOM:INFO:RAFLAGS", 0, 1, tmplput_ROOM_RAFLAGS, NULL, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:LISTORDER", 0, 1, tmplput_ROOM_LISTORDER, NULL, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:VIEW", 0, 1, tmplput_ROOM_VIEW, NULL, CTX_ROOMS);
        RegisterNamespace("ROOM:INFO:DEFVIEW", 0, 1, tmplput_ROOM_DEFVIEW, NULL, CTX_ROOMS);