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

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 24f97212c3abf30c57f4bb40a99ef99690498295..7271690cd5a15e6f2fa78a276b7699197c8c3f8a 100644 (file)
--- 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 ab6471e36a1742e048c545359b6d4e79d7a79d00..08ae60e139706cc57342e437c44a739356a1e949 100644 (file)
--- 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>