Rework templating context access so contexts can be accessed through several layers

[citadel.git] / webcit / siteconfig.c

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index a16d9cfe83a44007a7252f7c22b046e2438a529c..5bd9fffcb23146ee15f0dbdc4d3601b3c68b39bd 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -375,7 +375,7 @@ int ConditionalServCfgCTXStrBuf(StrBuf *Target, WCTemplputParams *TP)
        wcsession *WCC = WC;
        void *vBuf;
        StrBuf *Buf;
-       StrBuf *ZoneToCheck = (StrBuf*) CTX;
+       StrBuf *ZoneToCheck = (StrBuf*) CTX(CTX_STRBUF);
 
        if ((WCC->is_aide) || (ZoneToCheck == NULL)) {
                if (WCC->ServCfg == NULL)
@@ -407,13 +407,13 @@ void DeleteLogStatusStruct(void *v)
 
 void tmplput_servcfg_LogName(StrBuf *Target, WCTemplputParams *TP)
 {
-        LogStatusStruct *Stat = (LogStatusStruct*) CTX;
+        LogStatusStruct *Stat = (LogStatusStruct*) CTX(CTX_SRVLOG);
        StrBufAppendTemplate(Target, TP, Stat->Name, 1);
 }
 
 int ConditionalServCfgThisLogEnabled(StrBuf *Target, WCTemplputParams *TP)
 {
-        LogStatusStruct *Stat = (LogStatusStruct*) CTX;
+        LogStatusStruct *Stat = (LogStatusStruct*) CTX(CTX_SRVLOG);
        return Stat->Enable;
 }