Bring in new dkim code

[citadel.git] / webcit / roomtokens.c

diff --git a/webcit/roomtokens.c b/webcit/roomtokens.c
index 72daf67406eaaa54cff87805b732f46252539a32..6999939ae400f4fd49550f5cfda97bc4e0e1b507 100644 (file)
--- a/webcit/roomtokens.c
+++ b/webcit/roomtokens.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 CtxType CTX_ROOMS = CTX_NONE;
 CtxType CTX_FLOORS = CTX_NONE;
@@ -494,6 +494,15 @@ 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)
 {
@@ -663,6 +672,7 @@ InitModule_ROOMTOKENS
        RegisterConditional("COND:ROOM:EDITACCESS", 0, ConditionalHaveRoomeditRights, 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("COND:THISROOM:HAVE_INFOTEXT", 0, ConditionalThisRoomXHaveInfoText, CTX_NONE);