X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomlist.c;h=6246e313b22c48100e5920686b9e0de6b15bc83f;hb=d0a61d5cc7cb65fbef956eca1fd40ade5d7cadc0;hp=0370a4dcee07fbc03a0254dc0b8f3196c46e75b5;hpb=5c792a88f3115c1811c5080c90ba1a5f9d97ce5d;p=citadel.git

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index 0370a4dce..6246e313b 100644
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * room listings and filters.
  */
 
@@ -7,6 +6,50 @@
 #include "webserver.h"
 
 
+HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
+{
+	StrBuf *Line;
+	StrBuf *Token;
+	long State;
+	HashList *Whok = NULL;
+	int Done = 0;
+	int n = 0;
+
+	serv_puts("WHOK");
+	Line = NewStrBuf();
+	StrBuf_ServGetln(Line);
+	if (GetServerStatus(Line, &State) == 1) 
+	{
+		Whok = NewHash(1, Flathash);
+		while(!Done && (StrBuf_ServGetln(Line) >= 0) )
+			if ( (StrLength(Line)==3) && 
+			     !strcmp(ChrPtr(Line), "000")) 
+			{
+				Done = 1;
+			}
+			else
+			{
+			
+				const char *Pos = NULL;
+				Token = NewStrBufPlain (NULL, StrLength(Line));
+				StrBufExtract_NextToken(Token, Line, &Pos, '|');
+
+				Put(Whok, 
+				    IKEY(n),
+				    Token, 
+				    HFreeStrBuf);
+				n++;
+			}
+	}
+	else if (State == 550)
+		AppendImportantMessage(_("Higher access is required to access this function."), -1);
+
+
+	FreeStrBuf(&Line);
+	return Whok;
+}
+
+
 void DeleteFloor(void *vFloor)
 {
 	Floor *pFloor;
@@ -35,6 +78,7 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
 	const char *Err;
 	StrBuf *Buf;
 	HashList *floors;
+	HashList *floorsbyname;
 	HashPos *it;
 	Floor *pFloor;
 	void *vFloor;
@@ -48,6 +92,7 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
 	if (WCC->Floors != NULL)
 		return WCC->Floors;
 	WCC->Floors = floors = NewHash(1, Flathash);
+	WCC->FloorsByName = floorsbyname = NewHash(1, NULL);
 	Buf = NewStrBuf();
 
 	pFloor = (Floor*) malloc(sizeof(Floor));
@@ -56,12 +101,13 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
 	pFloor->NRooms = 0;
 	
 	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(!Done && StrBuf_ServGetln(Buf))
+		while(!Done && StrBuf_ServGetln(Buf) >= 0)
 			if ( (StrLength(Buf)==3) && 
 			     !strcmp(ChrPtr(Buf), "000")) 
 			{
@@ -79,6 +125,7 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
 				pFloor->NRooms = StrBufExtractNext_long(Buf, &Pos, '|');
 
 				Put(floors, IKEY(pFloor->ID), pFloor, DeleteFloor);
+				Put(floorsbyname, SKEY(pFloor->Name), pFloor, reference_free_handler);
 			}
 	}
 	FreeStrBuf(&Buf);
@@ -95,47 +142,69 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
 	return floors;
 }
 
-void tmplput_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
+HashList *GetZappedRoomListHash(StrBuf *Target, WCTemplputParams *TP) 
 {
-	Floor *pFloor = (Floor *)(TP->Context);
+	wcsession *WCC = WC;
 
-	StrBufAppendPrintf(Target, "%d", pFloor->ID);
+	if (WCC->Floors == NULL)
+		GetFloorListHash(Target, TP);
+	serv_puts("LZRM -1");
+	return GetRoomListHash(Target, TP);
 }
-
-void tmplput_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
+HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP) 
 {
-	Floor *pFloor = (Floor *)(TP->Context);
+	wcsession *WCC = WC;
 
-	StrBufAppendTemplate(Target, TP, pFloor->Name, 0);
+	if (WCC->Floors == NULL)
+		GetFloorListHash(Target, TP);
+	if (WCC->Rooms == NULL) 
+	{
+		serv_puts("LKRA");
+		WCC->Rooms =  GetRoomListHash(Target, TP);
+	}
+	return WCC->Rooms;
 }
 
-void tmplput_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
+HashList *GetRoomListHashLPRM(StrBuf *Target, WCTemplputParams *TP) 
 {
-	Floor *pFloor = (Floor *)(TP->Context);
-
-	StrBufAppendPrintf(Target, "%d", pFloor->NRooms);
+	serv_puts("LPRM");
+	return GetRoomListHash(Target, TP);
 }
-HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP) 
+
+
+void FlushIgnetCfgs(folder *room)
 {
-	wcsession *WCC = WC;
+	int i;
+	if (room->IgnetCfgs[maxRoomNetCfg] == (HashList*) StrBufNOTNULL)
+	{
+		for (i = ignet_push_share; i < maxRoomNetCfg; i++)
+			DeleteHash(&room->IgnetCfgs[i]);
+	}
+	memset(&room->IgnetCfgs, 0, sizeof(HashList *) * (maxRoomNetCfg + 1));
 
-	if (WCC->Floors == NULL)
-		GetFloorListHash(Target, TP);
-	serv_puts("LKRA");
-	return GetRoomListHash(Target, TP);
 }
 
 void FlushFolder(folder *room)
 {
 	int i;
 
+	FreeStrBuf(&room->XAPass);
+	FreeStrBuf(&room->Directory);
+	FreeStrBuf(&room->RoomAide);
+	FreeStrBuf(&room->XInfoText);
+	room->XHaveInfoTextLoaded = 0;
+
 	FreeStrBuf(&room->name);
+
+	FlushIgnetCfgs(room);
+
 	if (room->RoomNameParts != NULL)
 	{
 		for (i=0; i < room->nRoomNameParts; i++)
 			FreeStrBuf(&room->RoomNameParts[i]);
 		free(room->RoomNameParts);
 	}
+	memset(room, 0, sizeof(folder));
 }
 
 void vDeleteFolder(void *vFolder)
@@ -156,7 +225,6 @@ HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
 	folder *room;
 	StrBuf *Buf;
 	const char *Pos;
-	const char *Err;
 	void *vFloor;
 	wcsession *WCC = WC;
 	CompareFunc SortIt;
@@ -164,10 +232,10 @@ HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
 
 	Buf = NewStrBuf();
 	rooms = NewHash(1, NULL);
-	StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err);
+	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) == 1) 
 	{
-		while(!Done && StrBuf_ServGetln(Buf))
+		while(!Done && (StrBuf_ServGetln(Buf) >= 0))
 			if ( (StrLength(Buf)==3) && 
 			     !strcmp(ChrPtr(Buf), "000")) 
 			{
@@ -185,7 +253,7 @@ HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
 
 				room->QRFlags = StrBufExtractNext_long(Buf, &Pos, '|');
 				room->floorid = StrBufExtractNext_int(Buf, &Pos, '|');
-				room->listorder = StrBufExtractNext_long(Buf, &Pos, '|');
+				room->Order = StrBufExtractNext_long(Buf, &Pos, '|');
 				room->QRFlags2 = StrBufExtractNext_long(Buf, &Pos, '|');
 
 				room->RAFlags = StrBufExtractNext_long(Buf, &Pos, '|');
@@ -252,14 +320,150 @@ HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP)
 	return rooms;
 }
 
+HashList *GetThisRoomMAlias(StrBuf *Target, WCTemplputParams *TP) 
+{
+	wcsession *WCC = WC;
+	StrBuf *Line;
+	StrBuf *Token;
+	HashList *Aliases = NULL;
+	const char *pComma;
+	long aliaslen;
+	long locallen;
+	long State;
+	
+	serv_puts("GNET "FILE_MAILALIAS);
+	Line = NewStrBuf();
+	StrBuf_ServGetln(Line);
+	if (GetServerStatus(Line, &State) == 1) 
+	{
+		int Done = 0;
+		int n = 0;
+
+		Aliases = NewHash(1, NULL);
+		while(!Done && (StrBuf_ServGetln(Line) >= 0))
+			if ( (StrLength(Line)==3) && 
+			     !strcmp(ChrPtr(Line), "000"))
+			{
+				Done = 1;
+			}
+			else
+			{
+				pComma = strchr(ChrPtr(Line), ',');
+				if (pComma == NULL)
+					continue;
+				aliaslen = pComma - ChrPtr(Line);
+				locallen = StrLength(Line) - 1 - aliaslen;
+				if (locallen - 5 != StrLength(WCC->CurRoom.name))
+					continue;
+				if (strncmp(pComma + 1, "room_", 5) != 0)
+					continue;
+
+				if (strcasecmp(pComma + 6, ChrPtr(WCC->CurRoom.name)) != 0)
+					continue;
+				Token = NewStrBufPlain(ChrPtr(Line), aliaslen);
+				Put(Aliases, 
+				    IKEY(n),
+				    Token, 
+				    HFreeStrBuf);
+				n++; /* #0 is the type... */
+			}
+	}
+	else if (State == 550)
+		AppendImportantMessage(_("Higher access is required to access this function."), -1);
+
+	FreeStrBuf(&Line);
+
+	return Aliases;
+}
+
+HashList *GetNetConfigHash(StrBuf *Target, WCTemplputParams *TP) 
+{
+	wcsession *WCC = WC;
+	StrBuf *Line;
+	StrBuf *Token;
+	StrBuf *Content;
+	long WantThisOne;
+	long PutTo;
+	long State;
+	
+	WantThisOne = GetTemplateTokenNumber(Target, TP, 5, -1);
+	if ((WantThisOne < 0) || (WantThisOne > maxRoomNetCfg))
+		return NULL;
+	if (WCC->CurRoom.IgnetCfgs[maxRoomNetCfg] == (HashList*) StrBufNOTNULL)
+		return WCC->CurRoom.IgnetCfgs[WantThisOne];
+
+	WCC->CurRoom.IgnetCfgs[maxRoomNetCfg] = (HashList*) StrBufNOTNULL;
+	serv_puts("GNET");
+	Line = NewStrBuf();
+	Token = NewStrBuf();
+	StrBuf_ServGetln(Line);
+	if (GetServerStatus(Line, &State) == 1) 
+	{
+		const char *Pos = NULL;
+		int Done = 0;
+
+		while(!Done && (StrBuf_ServGetln(Line) >= 0))
+			if ( (StrLength(Line)==3) && 
+			     !strcmp(ChrPtr(Line), "000"))
+			{
+				Done = 1;
+			}
+			else
+			{
+				StrBufExtract_NextToken(Token, Line, &Pos, '|');
+				PutTo = GetTokenDefine(SKEY(Token), -1);
+				if ((PutTo >= 0) && 
+				    (PutTo < maxRoomNetCfg) &&
+				    (Pos != StrBufNOTNULL))
+				{
+					int n;
+					HashList *SubH;
+					
+					if (WCC->CurRoom.IgnetCfgs[PutTo] == NULL)
+					{
+						n = 0;
+						WCC->CurRoom.IgnetCfgs[PutTo] = NewHash(1, NULL);
+					}
+					else 
+					{
+						n = GetCount(WCC->CurRoom.IgnetCfgs[PutTo]);
+					}
+					SubH = NewHash(1, NULL);
+					Put(WCC->CurRoom.IgnetCfgs[PutTo], 
+					    IKEY(n),
+					    SubH, 
+					    HDeleteHash);
+					n = 1; /* #0 is the type... */
+					while (Pos != StrBufNOTNULL) {
+						Content = NewStrBuf();
+						StrBufExtract_NextToken(Content, Line, &Pos, '|');
+						Put(SubH, 
+						    IKEY(n),
+						    Content, 
+						    HFreeStrBuf);
+						n++;
+					}
+				}
+				Pos = NULL;
+			}
+	}
+	else if (State == 550)
+		AppendImportantMessage(_("Higher access is required to access this function."), -1);
+
+	FreeStrBuf(&Line);
+	FreeStrBuf(&Token);
+
+	return WCC->CurRoom.IgnetCfgs[WantThisOne];
+}
+
 /** Unused function that orders rooms by the listorder flag */
 int SortRoomsByListOrder(const void *room1, const void *room2) 
 {
 	folder *r1 = (folder*) GetSearchPayload(room1);
 	folder *r2 = (folder*) GetSearchPayload(room2);
   
-	if (r1->listorder == r2->listorder) return 0;
-	if (r1->listorder > r2->listorder) return 1;
+	if (r1->Order == r2->Order) return 0;
+	if (r1->Order > r2->Order) return 1;
 	return -1;
 }
 
@@ -438,288 +642,94 @@ int GroupchangeRoomListByFloorRoomPrivFirst(const void *room1, const void *room2
 }
 
 
-
-
-
-
-void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-
-	StrBufAppendTemplate(Target, TP, Folder->name, 0);
-}
-void tmplput_ROOM_BASENAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *room = (folder *)(TP->Context);
-
-	if (room->nRoomNameParts > 1)
-		StrBufAppendTemplate(Target, TP, 
-				      room->RoomNameParts[room->nRoomNameParts - 1], 0);
-	else 
-		StrBufAppendTemplate(Target, TP, room->name, 0);
-}
-void tmplput_ROOM_LEVEL_N_TIMES(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *room = (folder *)(TP->Context);
-	int i;
-        const char *AppendMe;
-        long AppendMeLen;
-
-
-	if (room->nRoomNameParts > 1)
-	{
-		GetTemplateTokenString(Target, TP, 0, &AppendMe, &AppendMeLen);
-		for (i = 0; i < room->nRoomNameParts; i++)
-			StrBufAppendBufPlain(Target, AppendMe, AppendMeLen, 0);
-	}
-}
-
-void tmplput_ROOM_ACL(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-
-	StrBufAppendPrintf(Target, "%ld", Folder->RAFlags, 0);
-}
-
-
-void tmplput_ROOM_QRFLAGS(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	StrBufAppendPrintf(Target, "%d", Folder->QRFlags);
-}
-
-void tmplput_ROOM_RAFLAGS(StrBuf *Target, WCTemplputParams *TP) 
+int CompareRooms(const folder *room1, const folder *room2) 
 {
-	folder *Folder = (folder *)(TP->Context);
-	StrBufAppendPrintf(Target, "%d", Folder->RAFlags);
-}
-
-
-void tmplput_ROOM_FLOORID(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	StrBufAppendPrintf(Target, "%d", Folder->floorid);
-}
-
-void tmplput_ROOM_LISTORDER(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	StrBufAppendPrintf(Target, "%d", Folder->listorder);
-}
-void tmplput_ROOM_VIEW(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	StrBufAppendPrintf(Target, "%d", Folder->view);
-}
-void tmplput_ROOM_DEFVIEW(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	StrBufAppendPrintf(Target, "%d", Folder->defview);
-}
-void tmplput_ROOM_LASTCHANGE(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	StrBufAppendPrintf(Target, "%d", Folder->lastchange);
-}
-void tmplput_ROOM_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	const Floor *pFloor = Folder->Floor;
-
-	if (pFloor == NULL)
-		return;
-
-	StrBufAppendPrintf(Target, "%d", pFloor->ID);
-}
-
-void tmplput_ROOM_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	const Floor *pFloor = Folder->Floor;
-
-	if (pFloor == NULL)
-		return;
-
-	StrBufAppendTemplate(Target, TP, pFloor->Name, 0);
-}
-
-void tmplput_ROOM_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	const Floor *pFloor = Folder->Floor;
-
-	if (pFloor == NULL)
-		return;
-	StrBufAppendPrintf(Target, "%d", pFloor->NRooms);
-}
-
-
-
-int ConditionalRoomHas_UA_KNOWN(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
-	return (Folder->RAFlags & UA_KNOWN) != 0;
-}
-
-int ConditionalRoomHas_UA_GOTOALLOWED(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
-	return (Folder->RAFlags & UA_GOTOALLOWED) != 0;
-}
-
-int ConditionalRoomHas_UA_HASNEWMSGS(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
-	return (Folder->RAFlags & UA_HASNEWMSGS) != 0;
-}
-
-int ConditionalRoomHas_UA_ZAPPED(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
-	return (Folder->RAFlags & UA_ZAPPED) != 0;
-}
-
-int ConditionalRoomHas_UA_POSTALLOWED(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
-	return (Folder->RAFlags & UA_POSTALLOWED) != 0;
-}
-
-int ConditionalRoomHas_UA_ADMINALLOWED(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
-	return (Folder->RAFlags & UA_ADMINALLOWED) != 0;
-}
-
-int ConditionalRoomHas_UA_DELETEALLOWED(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
-	return (Folder->RAFlags & UA_DELETEALLOWED) != 0;
-}
-
-
-int ConditionalRoomIsInbox(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
-	return Folder->is_inbox;
-}
-
-void tmplput_ROOM_COLLECTIONTYPE(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
-	
-	switch(Folder->view) {
-	case VIEW_CALENDAR:
-		StrBufAppendBufPlain(Target, HKEY("vevent"), 0);
-		break;
-	case VIEW_TASKS:
-		StrBufAppendBufPlain(Target, HKEY("vtodo"), 0);
-		break;
-	case VIEW_ADDRESSBOOK:
-		StrBufAppendBufPlain(Target, HKEY("vcard"), 0);
-		break;
-	case VIEW_NOTES:
-		StrBufAppendBufPlain(Target, HKEY("vnotes"), 0);
-		break;
-	case VIEW_JOURNAL:
-		StrBufAppendBufPlain(Target, HKEY("vjournal"), 0);
-		break;
-	}
-}
-
-
-
-
-int ConditionalRoomHasGroupdavContent(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
-
-	return ((Folder->view == VIEW_CALENDAR) || 
-		(Folder->view == VIEW_TASKS) || 
-		(Folder->view == VIEW_ADDRESSBOOK) ||
-		(Folder->view == VIEW_NOTES) ||
-		(Folder->view == VIEW_JOURNAL) );
-}
-
-
-
-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;
+	if ((room1 == NULL) || (room2 == NULL))
+		return -1;
+	return CompareRoomListByFloorRoomPrivFirst(room1, room2);
 }
 
-
 int ConditionalRoomIsRESTSubRoom(StrBuf *Target, WCTemplputParams *TP)
 {
 	wcsession  *WCC = WC;
-	folder     *Folder = (folder *)(TP->Context);
+	folder     *Folder = (folder *)CTX(CTX_ROOMS);
 	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;
+
+	syslog(0, "\n->%s: %d - %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) {
+		syslog(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);
+
+				syslog(0, "3\n");
+				return 0;
+			}
+			Dir = (StrBuf*) vDir;
+			if (strcmp(ChrPtr(Folder->RoomNameParts[i]), 
+				   ChrPtr(Dir)) != 0)
+			{
+				DeleteHashPos(&it);
+				syslog(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;
+			
+			syslog(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;
-}
-
-
-void jsonRoomFlr(void) 
-{
-	/* Send as our own (application/json) content type */
-	hprintf("HTTP/1.1 200 OK\r\n");
-	hprintf("Content-type: application/json; charset=utf-8\r\n");
-	hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
-	hprintf("Connection: close\r\n");
-	hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
-	begin_burst();
-	DoTemplate(HKEY("json_roomflr"),NULL,&NoCtx);
-	end_burst(); 
-}
-
-void 
-SessionDetachModule_ROOMLIST
-(wcsession *sess)
-{
-	DeleteHash(&sess->Floors);
+	}
 }
 
 
@@ -727,49 +737,23 @@ void
 InitModule_ROOMLIST
 (void)
 {
-	WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0);
-
+	/* we duplicate this, just to be shure its already done. */
+	RegisterCTX(CTX_ROOMS);
+	RegisterCTX(CTX_FLOORS);
 
-	RegisterNamespace("FLOOR:ID", 0, 0, tmplput_FLOOR_ID, NULL, CTX_FLOORS);
-	RegisterNamespace("FLOOR:NAME", 0, 1, tmplput_FLOOR_NAME, NULL, CTX_FLOORS);
-	RegisterNamespace("FLOOR:NROOMS", 0, 0, tmplput_FLOOR_NROOMS, NULL, CTX_FLOORS);
-	RegisterConditional(HKEY("COND:ROOM:REST:ISSUBFLOOR"), 0, ConditionalFloorIsRESTSubFloor, CTX_FLOORS);
+	RegisterIterator("ITERATE:THISROOM:WHO_KNOWS", 0, NULL, GetWhoKnowsHash, NULL, DeleteHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
+	RegisterIterator("ITERATE:THISROOM:GNET", 1, NULL, GetNetConfigHash, NULL, NULL, CTX_STRBUFARR, CTX_NONE, IT_NOFLAG);
+	RegisterIterator("ITERATE:THISROOM:MALIAS", 1, NULL, GetThisRoomMAlias, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
 
 	RegisterIterator("LFLR", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
+	RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, NULL, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
+	RegisterIterator("LZRM", 0, NULL, GetZappedRoomListHash, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
+	RegisterIterator("LPRM", 0, NULL, GetRoomListHashLPRM, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
+
 
-	RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, DeleteHash, 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);
-	RegisterNamespace("ROOM:INFO:PRINT_NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS);/// TODO!
-	RegisterNamespace("ROOM:INFO:BASENAME", 0, 1, tmplput_ROOM_BASENAME, NULL, CTX_ROOMS);
-	RegisterNamespace("ROOM:INFO:LEVELNTIMES", 1, 2, tmplput_ROOM_LEVEL_N_TIMES, NULL, CTX_ROOMS);
-
-	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);
-	RegisterNamespace("ROOM:INFO:LASTCHANGE", 0, 1, tmplput_ROOM_LASTCHANGE, NULL, CTX_ROOMS);
-	RegisterNamespace("ROOM:INFO:COLLECTIONTYPE", 0, 1, tmplput_ROOM_COLLECTIONTYPE, NULL, CTX_ROOMS);
-	RegisterNamespace("ROOM:INFO:FLOOR:ID", 0, 0, tmplput_ROOM_FLOOR_ID, NULL, CTX_ROOMS);
-	RegisterNamespace("ROOM:INFO:FLOOR:NAME", 0, 1, tmplput_ROOM_FLOOR_NAME, NULL, CTX_ROOMS);
-	RegisterNamespace("ROOM:INFO:FLOOR:NROOMS", 0, 0, tmplput_ROOM_FLOOR_NROOMS, NULL, CTX_ROOMS);
-
-	RegisterConditional(HKEY("COND:ROOM:REST:ISSUBROOM"), 0, ConditionalRoomIsRESTSubRoom, CTX_ROOMS);
-
-	RegisterConditional(HKEY("COND:ROOM:INFO:IS_INBOX"), 0, ConditionalRoomIsInbox, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_KNOWN"), 0, ConditionalRoomHas_UA_KNOWN, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_GOTOALLOWED"), 0, ConditionalRoomHas_UA_GOTOALLOWED, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_HASNEWMSGS"), 0, ConditionalRoomHas_UA_HASNEWMSGS, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_ZAPPED"), 0, ConditionalRoomHas_UA_ZAPPED, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_POSTALLOWED"), 0, ConditionalRoomHas_UA_POSTALLOWED, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_ADMINALLOWED"), 0, ConditionalRoomHas_UA_ADMINALLOWED, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_DELETEALLOWED"), 0, ConditionalRoomHas_UA_DELETEALLOWED, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:ROOM:GROUPDAV_CONTENT"), 0, ConditionalRoomHasGroupdavContent, CTX_ROOMS);
 
 
+	RegisterConditional("COND:ROOM:REST:ISSUBROOM", 0, ConditionalRoomIsRESTSubRoom, CTX_ROOMS);
 
 	RegisterSortFunc(HKEY("byfloorroom"),
 			 NULL, 0,