* site/mailbox default expire values are now correctly populated

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index e024424ac2c20fc3b9ee9b9b28246bd3bc370b68..6a5eea83ba186cf3550e4b70b485c0c6527baa84 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -80,7 +80,7 @@ void tmplput_ExpireValue(StrBuf *Target, WCTemplputParams *TP)
        GPEXWhichPolicy which;
        wcsession *WCC = WC;
                
-       which = GetTemplateTokenNumber(Target, TP, 2, 0);
+       which = GetTemplateTokenNumber(Target, TP, 0, 0);
        if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
        StrBufAppendPrintf(Target, "%d", WCC->Policy[which].expire_value);
 }

diff --git a/webcit/static/bt.css b/webcit/static/bt.css
index 8f3b8d319ea328cb8df420e3c13dbc5d8aa21f67..74b30a19ae9a2281d3b2a06b962fe400bada590a 100644 (file)
--- a/webcit/static/bt.css
+++ b/webcit/static/bt.css
@@ -6,8 +6,8 @@
        width: 300px;
        color: #000;
        font:lighter 11px/1.3 sans-serif;
-       text-decoration:none;
-       text-align:left;
+       text-decoration: none;
+       text-align: left;
 }
 
 .tooltip span.top {

diff --git a/webcit/static/t/aide/siteconfig/tab_autopurger.html b/webcit/static/t/aide/siteconfig/tab_autopurger.html
index b9fe40afe34ad4a20b677f413338fca980fdf324..d6ddd6d07dfabbdb4456f467f4cd978c953e3c80 100644 (file)
--- a/webcit/static/t/aide/siteconfig/tab_autopurger.html
+++ b/webcit/static/t/aide/siteconfig/tab_autopurger.html
@@ -73,7 +73,7 @@
 <?_("Expire by message age")>
 <br />
 <?_("Number of messages or days: ")>
-<input type="text" NAME="sitepolicy_value" MAXLENGTH="5" VALUE='<?SERV:CFG("sitevalue")>'>
+<input type="text" NAME="sitepolicy_value" MAXLENGTH="5" VALUE='<?EXPIRE:VALUE(#"sitepolicy")>'>
 </td></tr>
 
 <tr><td COLSPAN=2><hr /></td></tr>