TEMPLATING: add possibility to stack another context inbetween conditional tags

[citadel.git] / webcit / roomviews.c

diff --git a/webcit/roomviews.c b/webcit/roomviews.c
index af93ae98b3564767be572b87da0faa6ad95137e3..ac59c5b21b3660571cf11b8204d0ee90833af07c 100644 (file)
--- a/webcit/roomviews.c
+++ b/webcit/roomviews.c
@@ -22,7 +22,7 @@ ROOM_VIEWS allowed_default_views[VIEW_MAX] = {
        0, /* VIEW_CALBRIEF     Brief Calendar */
        0, /* VIEW_JOURNAL      Journal */
        0, /* VIEW_DRAFTS       Drafts */
-       0  /* VIEW_BLOG         Blog */
+       1  /* VIEW_BLOG         Blog */
 };
 
 /*
@@ -63,7 +63,7 @@ void initialize_viewdefs(void) {
 
 void tmplput_ROOM_COLLECTIONTYPE(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)CTX;
+       folder *Folder = (folder *)CTX(CTX_ROOMS);
        
        switch(Folder->view) {
        case VIEW_CALENDAR:
@@ -91,9 +91,9 @@ void tmplput_ROOM_COLLECTIONTYPE(StrBuf *Target, WCTemplputParams *TP)
 
 int ConditionalRoomHasGroupdavContent(StrBuf *Target, WCTemplputParams *TP)
 {
-       folder *Folder = (folder *)CTX;
+       folder *Folder = (folder *)CTX(CTX_ROOMS);
 
-       syslog(0, "-> %s: %ld\n", ChrPtr(Folder->name), Folder->view);
+       syslog(0, "-> %s: %d\n", ChrPtr(Folder->name), Folder->view);
 
        return ((Folder->view == VIEW_CALENDAR) || 
                (Folder->view == VIEW_TASKS) || 
@@ -228,12 +228,12 @@ int ConditionalThisRoomHaveView(StrBuf *Target, WCTemplputParams *TP)
 
 void tmplput_ROOM_VIEW(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)CTX;
+       folder *Folder = (folder *)CTX(CTX_ROOMS);
        StrBufAppendPrintf(Target, "%d", Folder->view);
 }
 void tmplput_ROOM_DEFVIEW(StrBuf *Target, WCTemplputParams *TP) 
 {
-       folder *Folder = (folder *)CTX;
+       folder *Folder = (folder *)CTX(CTX_ROOMS);
        StrBufAppendPrintf(Target, "%d", Folder->defview);
 }
 
@@ -249,22 +249,26 @@ void
 InitModule_ROOMVIEWS
 (void)
 {
+       /* we duplicate this, just to be shure its already done. */
+       RegisterCTX(CTX_ROOMS);
+       RegisterCTX(CTX_FLOORS);
+
        initialize_viewdefs();
 
        RegisterNamespace("THISROOM:VIEW_STRING", 0, 1, tmplput_CurrentRoomViewString, NULL, CTX_NONE);
        RegisterNamespace("ROOM:VIEW_STRING", 1, 2, tmplput_RoomViewString, NULL, CTX_NONE);
 
-       RegisterConditional(HKEY("COND:ALLOWED_DEFAULT_VIEW"), 0, ConditionalIsAllowedDefaultView, CTX_NONE);
-       RegisterConditional(HKEY("COND:THISROOM:DEFAULT_VIEW"), 0, ConditionalThisRoomDefView, CTX_NONE);
+       RegisterConditional("COND:ALLOWED_DEFAULT_VIEW", 0, ConditionalIsAllowedDefaultView, CTX_NONE);
+       RegisterConditional("COND:THISROOM:DEFAULT_VIEW", 0, ConditionalThisRoomDefView, CTX_NONE);
        RegisterNamespace("THISROOM:DEFAULT_VIEW", 0, 0, tmplput_CurrentRoomDefView, NULL, CTX_NONE);
        RegisterNamespace("ROOM:INFO:DEFVIEW", 0, 1, tmplput_ROOM_DEFVIEW, NULL, CTX_ROOMS);
 
-       RegisterConditional(HKEY("COND:ROOM:TYPE_IS"), 0, ConditionalIsRoomtype, CTX_NONE);
+       RegisterConditional("COND:ROOM:TYPE_IS", 0, ConditionalIsRoomtype, CTX_NONE);
 
-       RegisterConditional(HKEY("COND:THISROOM:HAVE_VIEW"), 0, ConditionalThisRoomHaveView, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:GROUPDAV_CONTENT"), 0, ConditionalRoomHasGroupdavContent, CTX_ROOMS);
+       RegisterConditional("COND:THISROOM:HAVE_VIEW", 0, ConditionalThisRoomHaveView, CTX_NONE);
+       RegisterConditional("COND:ROOM:DAV_CONTENT", 0, ConditionalRoomHasGroupdavContent, CTX_ROOMS);
 
-       RegisterConditional(HKEY("COND:THISROOM:CURR_VIEW"), 0, ConditionalThisRoomCurrView, CTX_NONE);
+       RegisterConditional("COND:THISROOM:CURR_VIEW", 0, ConditionalThisRoomCurrView, CTX_NONE);
        RegisterNamespace("ROOM:INFO:VIEW", 0, 1, tmplput_ROOM_VIEW, NULL, CTX_ROOMS);
 
        RegisterNamespace("ROOM:INFO:COLLECTIONTYPE", 0, 1, tmplput_ROOM_COLLECTIONTYPE, NULL, CTX_ROOMS);