From: Wilfried Göesgens <willi@citadel.org>
Date: Sun, 29 Aug 2010 16:56:16 +0000 (+0000)
Subject: * migrate the ZONESTR to strbuf context, so no more SVPUT here either.
X-Git-Tag: v8.01~826
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=836f6ad3a74336bbcff147f480e70509b58dd399

* migrate the ZONESTR to strbuf context, so no more SVPUT here either.
---

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 24f97212c..7271690cd 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -382,13 +382,6 @@ int ConditionalServCfgSubst(StrBuf *Target, WCTemplputParams *TP)
 	else return 0;
 }
 
-void CfgZoneTempl(StrBuf *TemplBuffer, WCTemplputParams *TP)
-{
-	StrBuf *Zone = (StrBuf*) CTX;
-
-	SVPutBuf("ZONENAME", Zone, 1);
-}
-
 void 
 InitModule_SITECONFIG
 (void)
@@ -398,7 +391,7 @@ InitModule_SITECONFIG
 	RegisterNamespace("SERV:CFG", 1, 2, tmplput_servcfg, NULL, CTX_NONE);
 	RegisterConditional(HKEY("COND:SERVCFG"), 3, ConditionalServCfg, CTX_NONE);
 	RegisterConditional(HKEY("COND:SERVCFG:SUBST"), 4, ConditionalServCfgSubst, CTX_NONE);
-	RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, CfgZoneTempl, NULL, CTX_PREF, CTX_NONE, IT_NOFLAG);
+	RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
 
 	REGISTERTokenParamDefine(roompolicy);
 	REGISTERTokenParamDefine(floorpolicy);
diff --git a/webcit/static/t/aide/siteconfig/tzsection.html b/webcit/static/t/aide/siteconfig/tzsection.html
index ab6471e36..08ae60e13 100644
--- a/webcit/static/t/aide/siteconfig/tzsection.html
+++ b/webcit/static/t/aide/siteconfig/tzsection.html
@@ -1 +1 @@
-<OPTION <?%("COND:SERVCFG:SUBST", 1, "c_default_cal_zone", "ZONENAME", 'selected="selected"', "")> VALUE='<?ZONENAME>'><?ZONENAME></OPTION>
+<OPTION <?%("COND:SERVCFG:SUBST", 1, "c_default_cal_zone", "CONTEXTSTR", 'selected="selected"', "")> VALUE='<?CONTEXTSTR>'><?CONTEXTSTR></OPTION>