From: Art Cancro <ajc@citadel.org>
Date: Mon, 5 Jul 2010 21:15:09 +0000 (+0000)
Subject: * site/mailbox default expire values are now correctly populated
X-Git-Tag: v7.86~116
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=5d92400e45323578f0b4372795269142127382ab

* site/mailbox default expire values are now correctly populated
---

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index e024424ac..6a5eea83b 100644
--- 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 8f3b8d319..74b30a19a 100644
--- 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 b9fe40afe..d6ddd6d07 100644
--- 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>