* require DEF:VAL and DEF:STR to have one token, as it should.

diff --git a/webcit/static/t/aide/siteconfig/tab_autopurger.html b/webcit/static/t/aide/siteconfig/tab_autopurger.html
index 063e54953b4e6f0d7bf6b07fa224e98c6b0c3336..b9fe40afe34ad4a20b677f413338fca980fdf324 100644 (file)
--- a/webcit/static/t/aide/siteconfig/tab_autopurger.html
+++ b/webcit/static/t/aide/siteconfig/tab_autopurger.html
@@ -69,7 +69,7 @@
 <br />
 <input type="radio" NAME="sitepolicy" VALUE="<?DEF:VAL(#"EXPIRE_NUMMSGS")>" <?%("COND:EXPIRE:MODE", 1, #"sitepolicy", #"EXPIRE_NUMMSGS", "CHECKED", "")>>
 <?_("Expire by message count")><br />
-<input type="radio" NAME="sitepolicy" VALUE="<?DEF:VAL( #"EXPIRE_AGE")>" <?%("COND:EXPIRE:MODE", 1, #"sitepolicy", #"EXPIRE_AGE", "CHECKED", "")>>
+<input type="radio" NAME="sitepolicy" VALUE="<?DEF:VAL(#"EXPIRE_AGE")>" <?%("COND:EXPIRE:MODE", 1, #"sitepolicy", #"EXPIRE_AGE", "CHECKED", "")>>
 <?_("Expire by message age")>
 <br />
 <?_("Number of messages or days: ")>

diff --git a/webcit/subst.c b/webcit/subst.c
index 24c660b75294e6a3b7acbfbe010fe8d9f5377c95..766790bb67147b3edca140b88fbbdfa51c5a024e 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -3060,8 +3060,8 @@ InitModule_SUBST
        RegisterControlNS(HKEY("ITERATE:KEY"), 0, 0, tmplput_ITERATE_KEY, CTX_ITERATE);
        RegisterControlNS(HKEY("ITERATE:N"), 0, 0, tmplput_ITERATE_LASTN, CTX_ITERATE);
        RegisterNamespace("CURRENTFILE", 0, 1, tmplput_CURRENT_FILE, NULL, CTX_NONE);
-       RegisterNamespace("DEF:STR", 0, 0, tmplput_DefStr, NULL, CTX_NONE);
-       RegisterNamespace("DEF:VAL", 0, 0, tmplput_DefVal, NULL, CTX_NONE);
+       RegisterNamespace("DEF:STR", 1, 1, tmplput_DefStr, NULL, CTX_NONE);
+       RegisterNamespace("DEF:VAL", 1, 1, tmplput_DefVal, NULL, CTX_NONE);