X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomtokens.c;h=57d21443ef342c3071900b984cf666ee4fa23056;hb=5d38a76f8f06640e3a3f097d584ac52336110f7c;hp=c7eec125728ff08f8070a4293c8282a6c2abf762;hpb=6aecb65445185e83dbaa23263cbe3e452f2a0183;p=citadel.git

diff --git a/webcit/roomtokens.c b/webcit/roomtokens.c
index c7eec1257..57d21443e 100644
--- a/webcit/roomtokens.c
+++ b/webcit/roomtokens.c
@@ -15,6 +15,8 @@
 #include "webcit.h"
 #include "webserver.h"
 
+CtxType CTX_ROOMS = CTX_NONE;
+CtxType CTX_FLOORS = CTX_NONE;
 
 /*
  * Embed the room banner
@@ -61,7 +63,7 @@ void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
 {
-	Floor *myFloor = (Floor *)CTX;
+	Floor *myFloor = (Floor *)CTX(CTX_FLOORS);
 
 	StrBufAppendPrintf(Target, "%d", myFloor->ID);
 }
@@ -69,14 +71,14 @@ void tmplput_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_FLOORID(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->floorid);
 }
 
 
 void tmplput_ROOM_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	const Floor *pFloor = Folder->Floor;
 
 	if (pFloor == NULL)
@@ -88,7 +90,7 @@ void tmplput_ROOM_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	const Floor *pFloor = Folder->Floor;
 
 	if (pFloor == NULL)
@@ -117,7 +119,7 @@ void tmplput_ThisRoomFloorName(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
 {
-	Floor *myFloor = (Floor *)CTX;
+	Floor *myFloor = (Floor *)CTX(CTX_FLOORS);
 
 	StrBufAppendTemplate(Target, TP, myFloor->Name, 0);
 }
@@ -125,7 +127,7 @@ void tmplput_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
 {
-	Floor *myFloor = (Floor *)CTX;
+	Floor *myFloor = (Floor *)CTX(CTX_FLOORS);
 
 	StrBufAppendPrintf(Target, "%d", myFloor->NRooms);
 }
@@ -133,7 +135,7 @@ void tmplput_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	const Floor *pFloor = Folder->Floor;
 
 	if (pFloor == NULL)
@@ -144,7 +146,7 @@ void tmplput_ROOM_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP)
 
 int ConditionalFloorHaveNRooms(StrBuf *Target, WCTemplputParams *TP)
 {
-	Floor *MyFloor = (Floor *)CTX;
+	Floor *MyFloor = (Floor *)CTX(CTX_FLOORS);
 	int HaveN;
 
 	HaveN = GetTemplateTokenNumber(Target, TP, 0, 0);
@@ -156,7 +158,7 @@ int ConditionalFloorHaveNRooms(StrBuf *Target, WCTemplputParams *TP)
 int ConditionalFloorIsRESTSubFloor(StrBuf *Target, WCTemplputParams *TP)
 {
 	wcsession  *WCC = WC;
-	Floor *MyFloor = (Floor *)CTX;
+	Floor *MyFloor = (Floor *)CTX(CTX_FLOORS);
 	/** if we have dav_depth the client just wants the subfloors */
 	if ((WCC->Hdr->HR.dav_depth == 1) && 
 	    (GetCount(WCC->Directory) == 0))
@@ -168,7 +170,7 @@ int ConditionalFloorIsRESTSubFloor(StrBuf *Target, WCTemplputParams *TP)
 int ConditionalFloorIsSUBROOM(StrBuf *Target, WCTemplputParams *TP)
 {
 	wcsession  *WCC = WC;
-	Floor *MyFloor = (Floor *)CTX;
+	Floor *MyFloor = (Floor *)CTX(CTX_FLOORS);
 
 	return WCC->CurRoom.floorid == MyFloor->ID;
 }
@@ -176,7 +178,7 @@ int ConditionalFloorIsSUBROOM(StrBuf *Target, WCTemplputParams *TP)
 
 int ConditionalFloorIsVirtual(StrBuf *Target, WCTemplputParams *TP)
 {
-	Floor *MyFloor = (Floor *)CTX;
+	Floor *MyFloor = (Floor *)CTX(CTX_FLOORS);
 
 	return MyFloor->ID == VIRTUAL_MY_FLOOR;
 }
@@ -202,7 +204,7 @@ void tmplput_ThisRoom(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 
 	StrBufAppendTemplate(Target, TP, Folder->name, 0);
 }
@@ -210,7 +212,7 @@ void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_BASENAME(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *room = (folder *)CTX;
+	folder *room = (folder *)CTX(CTX_ROOMS);
 
 	if (room->nRoomNameParts > 1)
 		StrBufAppendTemplate(Target, TP, 
@@ -222,7 +224,7 @@ void tmplput_ROOM_BASENAME(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_LEVEL_N_TIMES(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *room = (folder *)CTX;
+	folder *room = (folder *)CTX(CTX_ROOMS);
 	int i;
         const char *AppendMe;
         long AppendMeLen;
@@ -239,7 +241,7 @@ void tmplput_ROOM_LEVEL_N_TIMES(StrBuf *Target, WCTemplputParams *TP)
 
 int ConditionalRoomIsInbox(StrBuf *Target, WCTemplputParams *TP)
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	return Folder->is_inbox;
 }
 
@@ -295,7 +297,7 @@ int ConditionalRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_QRFLAGS(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->QRFlags);
 }
 
@@ -351,7 +353,7 @@ int ConditionalRoomHas_UAFlag(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_ACL(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 
 	StrBufAppendPrintf(Target, "%ld", Folder->RAFlags, 0);
 }
@@ -459,7 +461,7 @@ int ConditionalThisRoomOrder(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_LISTORDER(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->Order);
 }
 
@@ -516,7 +518,7 @@ void tmplput_ThisRoomInfoText(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_LASTCHANGE(StrBuf *Target, WCTemplputParams *TP) 
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->lastchange);
 }
 
@@ -556,7 +558,7 @@ void tmplput_ThisRoomX_FileString(StrBuf *Target, WCTemplputParams *TP)
 
 int ConditionalIsThisThatRoom(StrBuf *Target, WCTemplputParams *TP)
 {
-	folder *Folder = (folder *)CTX;
+	folder *Folder = (folder *)CTX(CTX_ROOMS);
 	wcsession *WCC = WC;
 
 	if (WCC == NULL)
@@ -570,6 +572,10 @@ void
 InitModule_ROOMTOKENS
 (void)
 {
+	/* we duplicate this, just to be shure its already done. */
+	RegisterCTX(CTX_ROOMS);
+	RegisterCTX(CTX_FLOORS);
+
 	RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, NULL, CTX_NONE);
 
 	RegisterNamespace("FLOOR:ID", 0, 0, tmplput_FLOOR_ID, NULL, CTX_FLOORS);