X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Froomtokens.c;h=31b9eb94bff622837bc56e972df158fdb606de41;hb=c6aec42f213ec284e34648f3d69bcf927dccddb1;hp=52d0ad4a7001301cf0f56b56ee045c569bf49ab2;hpb=ec636368885b210420016b3f544edcbab9189880;p=citadel.git

diff --git a/webcit/roomtokens.c b/webcit/roomtokens.c
index 52d0ad4a7..31b9eb94b 100644
--- a/webcit/roomtokens.c
+++ b/webcit/roomtokens.c
@@ -1,3 +1,4 @@
+
 /*
  * Lots of different room-related operations.
  *
@@ -5,22 +6,18 @@
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
- * by 
- * 
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * 
- * 
- * 
  */
 
 #include "webcit.h"
 #include "webserver.h"
 
+CtxType CTX_ROOMS = CTX_NONE;
+CtxType CTX_FLOORS = CTX_NONE;
 
 /*
  * Embed the room banner
@@ -28,20 +25,17 @@
  * got			The information returned from a GOTO server command
  * navbar_style 	Determines which navigation buttons to display
  */
-void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_roombanner(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
-	
+
 	/* Refresh current room states.  Doesn't work? gotoroom(NULL); */
 
 	wc_printf("<div id=\"banner\">\n");
 
 	/* The browser needs some information for its own use */
 	wc_printf("<script type=\"text/javascript\">	\n"
-		  "	room_is_trash = %d;		\n"
-		  "</script>\n",
-		  ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0)
-	);
+		  "	room_is_trash = %d;		\n" "</script>\n", ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0)
+	    );
 
 	/*
 	 * If the user happens to select the "make this my start page" link,
@@ -65,24 +59,21 @@ void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
  *******************************************************************************/
 
 
-void tmplput_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
-{
-	Floor *myFloor = (Floor *)CTX;
+void tmplput_FLOOR_ID(StrBuf * Target, WCTemplputParams * TP) {
+	Floor *myFloor = (Floor *) CTX(CTX_FLOORS);
 
 	StrBufAppendPrintf(Target, "%d", myFloor->ID);
 }
 
 
-void tmplput_ROOM_FLOORID(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)CTX;
+void tmplput_ROOM_FLOORID(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->floorid);
 }
 
 
-void tmplput_ROOM_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)CTX;
+void tmplput_ROOM_FLOOR_ID(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 	const Floor *pFloor = Folder->Floor;
 
 	if (pFloor == NULL)
@@ -92,9 +83,8 @@ void tmplput_ROOM_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void tmplput_ROOM_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)CTX;
+void tmplput_ROOM_FLOOR_NAME(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 	const Floor *pFloor = Folder->Floor;
 
 	if (pFloor == NULL)
@@ -104,8 +94,7 @@ void tmplput_ROOM_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void tmplput_ThisRoomFloorName(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoomFloorName(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 	folder *Folder = &WCC->CurRoom;
 	const Floor *pFloor;
@@ -121,25 +110,22 @@ void tmplput_ThisRoomFloorName(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void tmplput_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-	Floor *myFloor = (Floor *)CTX;
+void tmplput_FLOOR_NAME(StrBuf * Target, WCTemplputParams * TP) {
+	Floor *myFloor = (Floor *) CTX(CTX_FLOORS);
 
 	StrBufAppendTemplate(Target, TP, myFloor->Name, 0);
 }
 
 
-void tmplput_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
-{
-	Floor *myFloor = (Floor *)CTX;
+void tmplput_FLOOR_NROOMS(StrBuf * Target, WCTemplputParams * TP) {
+	Floor *myFloor = (Floor *) CTX(CTX_FLOORS);
 
 	StrBufAppendPrintf(Target, "%d", myFloor->NRooms);
 }
 
 
-void tmplput_ROOM_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)CTX;
+void tmplput_ROOM_FLOOR_NROOMS(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 	const Floor *pFloor = Folder->Floor;
 
 	if (pFloor == NULL)
@@ -148,9 +134,8 @@ void tmplput_ROOM_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-int ConditionalFloorHaveNRooms(StrBuf *Target, WCTemplputParams *TP)
-{
-	Floor *MyFloor = (Floor *)CTX;
+int ConditionalFloorHaveNRooms(StrBuf * Target, WCTemplputParams * TP) {
+	Floor *MyFloor = (Floor *) CTX(CTX_FLOORS);
 	int HaveN;
 
 	HaveN = GetTemplateTokenNumber(Target, TP, 0, 0);
@@ -159,30 +144,27 @@ int ConditionalFloorHaveNRooms(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-int ConditionalFloorIsRESTSubFloor(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession  *WCC = WC;
-	Floor *MyFloor = (Floor *)CTX;
+int ConditionalFloorIsRESTSubFloor(StrBuf * Target, WCTemplputParams * TP) {
+	wcsession *WCC = WC;
+	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))
+	if ((WCC->Hdr->HR.dav_depth == 1) && (GetCount(WCC->Directory) == 0))
 		return 1;
 	return WCC->CurrentFloor == MyFloor;
 }
 
 
-int ConditionalFloorIsSUBROOM(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession  *WCC = WC;
-	Floor *MyFloor = (Floor *)CTX;
+int ConditionalFloorIsSUBROOM(StrBuf * Target, WCTemplputParams * TP) {
+	wcsession *WCC = WC;
+	Floor *MyFloor = (Floor *) CTX(CTX_FLOORS);
 
 	return WCC->CurRoom.floorid == MyFloor->ID;
 }
 
 
-int ConditionalFloorIsVirtual(StrBuf *Target, WCTemplputParams *TP)
-{
-	Floor *MyFloor = (Floor *)CTX;
+int ConditionalFloorIsVirtual(StrBuf * Target, WCTemplputParams * TP) {
+	Floor *MyFloor = (Floor *) CTX(CTX_FLOORS);
 
 	return MyFloor->ID == VIRTUAL_MY_FLOOR;
 }
@@ -191,66 +173,43 @@ int ConditionalFloorIsVirtual(StrBuf *Target, WCTemplputParams *TP)
 /*******************************************************************************
  ********************** ROOM Tokens ********************************************
  *******************************************************************************/
-/**** Name ******/
-
-
-void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
-{
-	StrBufAppendTemplate(Target, TP, WC->CurRoom.name, 0);
-}
 
+/**** Name ******/
 
-void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_ThisRoom(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
 	if (WCC != NULL) {
-		StrBufAppendTemplate(Target, TP, 
-		     WCC->CurRoom.name, 
-		     0
-		);
+		StrBufAppendTemplate(Target, TP, WCC->CurRoom.name, 0);
 	}
 }
 
 
-void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)CTX;
+void tmplput_ROOM_NAME(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 
-	if (Folder == NULL)
-	{
-		wcsession *WCC = WC;
-
-		if (WCC == NULL)
-			return;
-		Folder = &WCC->CurRoom;
-	}
 	StrBufAppendTemplate(Target, TP, Folder->name, 0);
 }
 
 
-void tmplput_ROOM_BASENAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *room = (folder *)CTX;
+void tmplput_ROOM_BASENAME(StrBuf * Target, WCTemplputParams * TP) {
+	folder *room = (folder *) CTX(CTX_ROOMS);
 
 	if (room->nRoomNameParts > 1)
-		StrBufAppendTemplate(Target, TP, 
-				      room->RoomNameParts[room->nRoomNameParts - 1], 0);
-	else 
+		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 *)CTX;
+void tmplput_ROOM_LEVEL_N_TIMES(StrBuf * Target, WCTemplputParams * TP) {
+	folder *room = (folder *) CTX(CTX_ROOMS);
 	int i;
-        const char *AppendMe;
-        long AppendMeLen;
+	const char *AppendMe;
+	long AppendMeLen;
 
 
-	if (room->nRoomNameParts > 1)
-	{
+	if (room->nRoomNameParts > 1) {
 		GetTemplateTokenString(Target, TP, 0, &AppendMe, &AppendMeLen);
 		for (i = 0; i < room->nRoomNameParts; i++)
 			StrBufAppendBufPlain(Target, AppendMe, AppendMeLen, 0);
@@ -258,95 +217,99 @@ void tmplput_ROOM_LEVEL_N_TIMES(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-int ConditionalRoomIsInbox(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)CTX;
+int ConditionalRoomIsInbox(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 	return Folder->is_inbox;
 }
 
+int ConditionalRoomIsType(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
+
+	if (Folder == NULL)
+		return 0;
+
+	if ((TP->Tokens->nParameters < 3)) {
+		return ((Folder->view < VIEW_BBS) || (Folder->view > VIEW_MAX));
+	}
+
+	return Folder->view == GetTemplateTokenNumber(Target, TP, 2, VIEW_BBS);
+}
+
+
 
 /****** Properties ******/
-int ConditionalRoom_MayEdit(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalRoom_MayEdit(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
-	LoadRoomXA ();
+	LoadRoomXA();
 
 	return WCC->CurRoom.XALoaded == 1;
 }
 
-int ConditionalThisRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalThisRoomHas_QRFlag(StrBuf * Target, WCTemplputParams * TP) {
 	long QR_CheckFlag;
 	wcsession *WCC = WC;
-	
+
 	QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
 	if (QR_CheckFlag == 0)
 		LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
 				 "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
-	
+
 	if (WCC == NULL)
 		return 0;
 
-	if ((TP->Tokens->Params[2]->MaskBy == eOR) ||
-	    (TP->Tokens->Params[2]->MaskBy == eNO))
+	if ((TP->Tokens->Params[2]->MaskBy == eOR) || (TP->Tokens->Params[2]->MaskBy == eNO))
 		return (WCC->CurRoom.QRFlags & QR_CheckFlag) != 0;
 	else
 		return (WCC->CurRoom.QRFlags & QR_CheckFlag) == QR_CheckFlag;
 }
 
 
-int ConditionalRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalRoomHas_QRFlag(StrBuf * Target, WCTemplputParams * TP) {
 	long QR_CheckFlag;
-	folder *Folder = (folder *)(TP->Context);
+	folder *Folder = (folder *) (TP->Context);
 
 	QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
 	if (QR_CheckFlag == 0)
 		LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
 				 "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
 
-	if ((TP->Tokens->Params[2]->MaskBy == eOR) ||
-	    (TP->Tokens->Params[2]->MaskBy == eNO))
+	if ((TP->Tokens->Params[2]->MaskBy == eOR) || (TP->Tokens->Params[2]->MaskBy == eNO))
 		return (Folder->QRFlags & QR_CheckFlag) != 0;
 	else
 		return (Folder->QRFlags & QR_CheckFlag) == QR_CheckFlag;
 }
 
 
-void tmplput_ROOM_QRFLAGS(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)CTX;
+void tmplput_ROOM_QRFLAGS(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->QRFlags);
 }
 
 
-int ConditionalThisRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalThisRoomHas_QRFlag2(StrBuf * Target, WCTemplputParams * TP) {
 	long QR2_CheckFlag;
 	wcsession *WCC = WC;
-	
+
 	QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
 	if (QR2_CheckFlag == 0)
 		LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
 				 "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
 
-	
+
 	if (WCC == NULL)
 		return 0;
 
-	if ((TP->Tokens->Params[2]->MaskBy == eOR) ||
-	    (TP->Tokens->Params[2]->MaskBy == eNO))
+	if ((TP->Tokens->Params[2]->MaskBy == eOR) || (TP->Tokens->Params[2]->MaskBy == eNO))
 		return (WCC->CurRoom.QRFlags2 & QR2_CheckFlag) != 0;
 	else
 		return (WCC->CurRoom.QRFlags2 & QR2_CheckFlag) == QR2_CheckFlag;
 }
 
 
-int ConditionalRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalRoomHas_QRFlag2(StrBuf * Target, WCTemplputParams * TP) {
 	long QR2_CheckFlag;
-	folder *Folder = (folder *)(TP->Context);
+	folder *Folder = (folder *) (TP->Context);
 
 	QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
 	if (QR2_CheckFlag == 0)
@@ -356,11 +319,10 @@ int ConditionalRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-int ConditionalRoomHas_UAFlag(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)(TP->Context);
+int ConditionalRoomHas_UAFlag(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) (TP->Context);
 	long UA_CheckFlag;
-		
+
 	UA_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
 	if (UA_CheckFlag == 0)
 		LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
@@ -370,23 +332,20 @@ int ConditionalRoomHas_UAFlag(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void tmplput_ROOM_ACL(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)CTX;
+void tmplput_ROOM_ACL(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 
 	StrBufAppendPrintf(Target, "%ld", Folder->RAFlags, 0);
 }
 
 
-void tmplput_ROOM_RAFLAGS(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)(TP->Context);
+void tmplput_ROOM_RAFLAGS(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) (TP->Context);
 	StrBufAppendPrintf(Target, "%d", Folder->RAFlags);
 }
 
 
-void tmplput_ThisRoomAide(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoomAide(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
 	LoadRoomAide();
@@ -395,41 +354,33 @@ void tmplput_ThisRoomAide(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-int ConditionalRoomAide(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalRoomAide(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
-	return (WCC != NULL)? 
-		((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) : 0;
+	return (WCC != NULL) ? ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) : 0;
 }
 
 
-int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalRoomAcessDelete(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
-	return (WCC == NULL)? 0 : 
-		( ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
-		   (WCC->CurRoom.is_inbox) || 
-		   (WCC->CurRoom.QRFlags2 & QR2_COLLABDEL) );
+	return (WCC == NULL) ? 0 :
+	    (((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) || (WCC->CurRoom.is_inbox) || (WCC->CurRoom.QRFlags2 & QR2_COLLABDEL));
 }
 
 
-int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalHaveRoomeditRights(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
-	return (	(WCC != NULL)
-			&& (WCC->logged_in)
-			&& (
-				(WCC->axlevel >= 6)
-				|| ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0)
-				|| (WCC->CurRoom.is_inbox)
-			)
-		);
+	return ((WCC != NULL)
+		&& (WCC->logged_in)
+		&& ((WCC->axlevel >= 6)
+		    || ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0)
+		    || (WCC->CurRoom.is_inbox)
+		)
+	    );
 }
 
 
-void tmplput_ThisRoomPass(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoomPass(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
 	LoadRoomXA();
@@ -437,24 +388,21 @@ void tmplput_ThisRoomPass(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void tmplput_ThisRoom_nNewMessages(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoom_nNewMessages(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
 	StrBufAppendPrintf(Target, "%d", WCC->CurRoom.nNewMessages);
 }
 
 
-void tmplput_ThisRoom_nTotalMessages(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoom_nTotalMessages(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
 	StrBufAppendPrintf(Target, "%d", WCC->CurRoom.nTotalMessages);
 }
 
 
-void tmplput_ThisRoomOrder(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoomOrder(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
 	LoadRoomXA();
@@ -463,8 +411,7 @@ void tmplput_ThisRoomOrder(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-int ConditionalThisRoomOrder(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalThisRoomOrder(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 	long CheckThis;
 
@@ -478,17 +425,15 @@ int ConditionalThisRoomOrder(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void tmplput_ROOM_LISTORDER(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)CTX;
+void tmplput_ROOM_LISTORDER(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->Order);
 }
 
 
-int ConditionalThisRoomXHavePic(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalThisRoomXHavePic(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
-	
+
 	if (WCC == NULL)
 		return 0;
 
@@ -496,21 +441,27 @@ int ConditionalThisRoomXHavePic(StrBuf *Target, WCTemplputParams *TP)
 	return WCC->CurRoom.XHaveRoomPic == 1;
 }
 
+int ConditionalThisRoomIsEdit(StrBuf * Target, WCTemplputParams * TP) {
+	wcsession *WCC = WC;
+
+	if (WCC == NULL)
+		return 0;
+	return ((WCC->CurRoom.nRoomNameParts > 1) &&
+		(strcmp(ChrPtr(WCC->CurRoom.RoomNameParts[WCC->CurRoom.nRoomNameParts]), "edit") == 0));
+}
 
-int ConditionalThisRoomXHaveInfoText(StrBuf *Target, WCTemplputParams *TP)
-{
+int ConditionalThisRoomXHaveInfoText(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
-	
+
 	if (WCC == NULL)
 		return 0;
 
 	LoadXRoomInfoText();
-	return (StrLength(WCC->CurRoom.XInfoText)>0);
+	return (StrLength(WCC->CurRoom.XInfoText) > 0);
 }
 
 
-void tmplput_ThisRoomInfoText(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoomInfoText(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 	long nchars = 0;
 
@@ -535,15 +486,13 @@ void tmplput_ThisRoomInfoText(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void tmplput_ROOM_LASTCHANGE(StrBuf *Target, WCTemplputParams *TP) 
-{
-	folder *Folder = (folder *)CTX;
+void tmplput_ROOM_LASTCHANGE(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 	StrBufAppendPrintf(Target, "%d", Folder->lastchange);
 }
 
 
-void tmplput_ThisRoomDirectory(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoomDirectory(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
 	LoadRoomXA();
@@ -552,8 +501,7 @@ void tmplput_ThisRoomDirectory(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void tmplput_ThisRoomXNFiles(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoomXNFiles(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
 	LoadXRoomXCountFiles();
@@ -562,8 +510,7 @@ void tmplput_ThisRoomXNFiles(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void tmplput_ThisRoomX_FileString(StrBuf *Target, WCTemplputParams *TP) 
-{
+void tmplput_ThisRoomX_FileString(StrBuf * Target, WCTemplputParams * TP) {
 	wcsession *WCC = WC;
 
 	LoadXRoomXCountFiles();
@@ -575,9 +522,8 @@ void tmplput_ThisRoomX_FileString(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-int ConditionalIsThisThatRoom(StrBuf *Target, WCTemplputParams *TP)
-{
-	folder *Folder = (folder *)CTX;
+int ConditionalIsThisThatRoom(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
 	wcsession *WCC = WC;
 
 	if (WCC == NULL)
@@ -586,11 +532,23 @@ int ConditionalIsThisThatRoom(StrBuf *Target, WCTemplputParams *TP)
 	return Folder == WCC->ThisRoom;
 }
 
+int ConditionalRoomIsName(StrBuf * Target, WCTemplputParams * TP) {
+	folder *Folder = (folder *) CTX(CTX_ROOMS);
+	const char *CheckRoomName = NULL;
+	long CheckRoomNameLen;
+
+	GetTemplateTokenString(Target, TP, 3, &CheckRoomName, &CheckRoomNameLen);
+	if (CheckRoomName == NULL)
+		return 0;
+	return strcmp(ChrPtr(Folder->name), CheckRoomName) == 0;
+}
+
+
+void InitModule_ROOMTOKENS(void) {
+	/* we duplicate this, just to be shure its already done. */
+	RegisterCTX(CTX_ROOMS);
+	RegisterCTX(CTX_FLOORS);
 
-void 
-InitModule_ROOMTOKENS
-(void)
-{
 	RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, NULL, CTX_NONE);
 
 	RegisterNamespace("FLOOR:ID", 0, 0, tmplput_FLOOR_ID, NULL, CTX_FLOORS);
@@ -604,37 +562,39 @@ InitModule_ROOMTOKENS
 	RegisterNamespace("FLOOR:NROOMS", 0, 0, tmplput_FLOOR_NROOMS, NULL, CTX_FLOORS);
 	RegisterNamespace("ROOM:INFO:FLOOR:NROOMS", 0, 0, tmplput_ROOM_FLOOR_NROOMS, NULL, CTX_ROOMS);
 
-	RegisterConditional(HKEY("COND:FLOOR:ISSUBROOM"), 0, ConditionalFloorIsSUBROOM, CTX_FLOORS);
-	RegisterConditional(HKEY("COND:FLOOR:NROOMS"), 1, ConditionalFloorHaveNRooms, CTX_FLOORS);
-	RegisterConditional(HKEY("COND:ROOM:REST:ISSUBFLOOR"), 0, ConditionalFloorIsRESTSubFloor, CTX_FLOORS);
-	RegisterConditional(HKEY("COND:FLOOR:ISVIRTUAL"), 0, ConditionalFloorIsVirtual, CTX_FLOORS);
+	RegisterConditional("COND:FLOOR:ISSUBROOM", 0, ConditionalFloorIsSUBROOM, CTX_FLOORS);
+	RegisterConditional("COND:FLOOR:NROOMS", 1, ConditionalFloorHaveNRooms, CTX_FLOORS);
+	RegisterConditional("COND:ROOM:REST:ISSUBFLOOR", 0, ConditionalFloorIsRESTSubFloor, CTX_FLOORS);
+	RegisterConditional("COND:FLOOR:ISVIRTUAL", 0, ConditionalFloorIsVirtual, CTX_FLOORS);
 
 	/**** Room... ******/
-        /**** Name ******/
-	RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, NULL, CTX_NONE);
-	RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE);
+
+	/**** Name ******/
+	RegisterNamespace("THISROOM:NAME", 0, 1, tmplput_ThisRoom, NULL, CTX_NONE);
+
 	RegisterNamespace("ROOM:INFO:NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS);
-	RegisterNamespace("ROOM:INFO:PRINT_NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_NONE);
 	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);
-	RegisterConditional(HKEY("COND:ROOM:INFO:IS_INBOX"), 0, ConditionalRoomIsInbox, CTX_ROOMS);
+	RegisterConditional("COND:ROOM:INFO:IS_INBOX", 0, ConditionalRoomIsInbox, CTX_ROOMS);
+	RegisterConditional("COND:ROOM:INFO:TYPE_IS", 0, ConditionalRoomIsType, CTX_ROOMS);
+	RegisterConditional("COND:ROOM:INFO:NAME_IS", 1, ConditionalRoomIsName, CTX_ROOMS);
 
 	/****** Properties ******/
 	RegisterNamespace("ROOM:INFO:QRFLAGS", 0, 1, tmplput_ROOM_QRFLAGS, NULL, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:THISROOM:FLAG:QR"), 0, ConditionalThisRoomHas_QRFlag, CTX_NONE);
-	RegisterConditional(HKEY("COND:THISROOM:EDIT"), 0, ConditionalRoom_MayEdit, CTX_NONE);
-	RegisterConditional(HKEY("COND:ROOM:FLAG:QR"), 0, ConditionalRoomHas_QRFlag, CTX_ROOMS);
+	RegisterConditional("COND:THISROOM:FLAG:QR", 0, ConditionalThisRoomHas_QRFlag, CTX_NONE);
+	RegisterConditional("COND:THISROOM:EDIT", 0, ConditionalRoom_MayEdit, CTX_NONE);
+	RegisterConditional("COND:ROOM:FLAG:QR", 0, ConditionalRoomHas_QRFlag, CTX_ROOMS);
 
-	RegisterConditional(HKEY("COND:THISROOM:FLAG:QR2"), 0, ConditionalThisRoomHas_QRFlag2, CTX_NONE);
-	RegisterConditional(HKEY("COND:ROOM:FLAG:QR2"), 0, ConditionalRoomHas_QRFlag2, CTX_ROOMS);
+	RegisterConditional("COND:THISROOM:FLAG:QR2", 0, ConditionalThisRoomHas_QRFlag2, CTX_NONE);
+	RegisterConditional("COND:ROOM:FLAG:QR2", 0, ConditionalRoomHas_QRFlag2, CTX_ROOMS);
 
-	RegisterConditional(HKEY("COND:ROOM:FLAG:UA"), 0, ConditionalRoomHas_UAFlag, CTX_ROOMS);
+	RegisterConditional("COND:ROOM:FLAG:UA", 0, ConditionalRoomHas_UAFlag, 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("THISROOM:ORDER", 0, 0, tmplput_ThisRoomOrder, NULL, CTX_NONE);
-	RegisterConditional(HKEY("COND:THISROOM:ORDER"), 0, ConditionalThisRoomOrder, CTX_NONE);
+	RegisterConditional("COND:THISROOM:ORDER", 0, ConditionalThisRoomOrder, CTX_NONE);
 
 	RegisterNamespace("ROOM:INFO:LASTCHANGE", 0, 1, tmplput_ROOM_LASTCHANGE, NULL, CTX_ROOMS);
 
@@ -643,19 +603,20 @@ InitModule_ROOMTOKENS
 
 	RegisterNamespace("THISROOM:PASS", 0, 1, tmplput_ThisRoomPass, NULL, CTX_NONE);
 	RegisterNamespace("THISROOM:AIDE", 0, 1, tmplput_ThisRoomAide, NULL, CTX_NONE);
-	RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
-	RegisterConditional(HKEY("COND:ACCESS:DELETE"), 2, ConditionalRoomAcessDelete, CTX_NONE);
-	RegisterConditional(HKEY("COND:ROOM:EDITACCESS"), 0, ConditionalHaveRoomeditRights, CTX_NONE);
+	RegisterConditional("COND:ROOMAIDE", 2, ConditionalRoomAide, CTX_NONE);
+	RegisterConditional("COND:ACCESS:DELETE", 2, ConditionalRoomAcessDelete, CTX_NONE);
+	RegisterConditional("COND:ROOM:EDITACCESS", 0, ConditionalHaveRoomeditRights, CTX_NONE);
 
-	RegisterConditional(HKEY("COND:THISROOM:HAVE_PIC"), 0, ConditionalThisRoomXHavePic, CTX_NONE);
+	RegisterConditional("COND:THISROOM:HAVE_PIC", 0, ConditionalThisRoomXHavePic, CTX_NONE);
+	RegisterConditional("COND:THISROOM:IS_EDIT", 0, ConditionalThisRoomIsEdit, CTX_NONE);
 
 	RegisterNamespace("THISROOM:INFOTEXT", 1, 2, tmplput_ThisRoomInfoText, NULL, CTX_NONE);
-	RegisterConditional(HKEY("COND:THISROOM:HAVE_INFOTEXT"), 0, ConditionalThisRoomXHaveInfoText, CTX_NONE);
+	RegisterConditional("COND:THISROOM:HAVE_INFOTEXT", 0, ConditionalThisRoomXHaveInfoText, CTX_NONE);
 
 	RegisterNamespace("THISROOM:FILES:N", 0, 1, tmplput_ThisRoomXNFiles, NULL, CTX_NONE);
 	RegisterNamespace("THISROOM:FILES:STR", 0, 1, tmplput_ThisRoomX_FileString, NULL, CTX_NONE);
 	RegisterNamespace("THISROOM:DIRECTORY", 0, 1, tmplput_ThisRoomDirectory, NULL, CTX_NONE);
 
 	RegisterNamespace("ROOM:INFO:ACL", 0, 1, tmplput_ROOM_ACL, NULL, CTX_ROOMS);
-	RegisterConditional(HKEY("COND:THIS:THAT:ROOM"), 0, ConditionalIsThisThatRoom, CTX_ROOMS);
+	RegisterConditional("COND:THIS:THAT:ROOM", 0, ConditionalIsThisThatRoom, CTX_ROOMS);
 }