Siteconfig: regroup settings

[citadel.git] / webcit / static / t / aide / siteconfig / tab_autopurger.html

diff --git a/webcit/static/t/aide/siteconfig/tab_autopurger.html b/webcit/static/t/aide/siteconfig/tab_autopurger.html
index 88e3b85ba79641613d676b745acf362f7c2a372e..90d5e8921ce2d8f00b3d16dc779faccf4d1321f1 100644 (file)
--- a/webcit/static/t/aide/siteconfig/tab_autopurger.html
+++ b/webcit/static/t/aide/siteconfig/tab_autopurger.html
@@ -64,36 +64,44 @@
 </td></tr>
 
 <tr><td><?_("Default message expire policy for public rooms")></td><td>
-<input type="radio" NAME="sitepolicy" VALUE="1" <?%("COND:SERVCFG", 1, "sitepolicy", 1, "CHECKED", "")>>
+<input type="radio" NAME="sitepolicy" VALUE="<?DEF:VAL(#"EXPIRE_MANUAL")>" <?%("COND:EXPIRE:MODE", 1, #"sitepolicy", #"EXPIRE_MANUAL", "CHECKED", "")>>
 <?_("Never automatically expire messages")>
 <br />
-<input type="radio" NAME="sitepolicy" VALUE="2" <?%("COND:SERVCFG", 1, "sitepolicy", 2, "CHECKED", "")>>
+<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="3" <?%("COND:SERVCFG", 1, "sitepolicy", 3, "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: ")>
-<input type="text" NAME="sitevalue" 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>
 
 <tr><td><?_("Default message expire policy for private mailboxes")></td><td>
-<input type="radio" NAME="mboxpolicy" VALUE="0" <?%("COND:SERVCFG", 1, "mboxpolicy", 0, "CHECKED", "")>>
+<input type="radio" NAME="mailboxespolicy" VALUE="<?DEF:VAL(#"EXPIRE_NEXTLEVEL")>" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_NEXTLEVEL", "CHECKED", "")>>
 <?_("Same policy as public rooms")>
 <br />
-<input type="radio" NAME="mboxpolicy" VALUE="1" <?%("COND:SERVCFG", 1, "mboxpolicy", 1, "CHECKED", "")>>
+<input type="radio" NAME="mailboxespolicy" VALUE="<?DEF:VAL(#"EXPIRE_MANUAL")>" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_MANUAL", "CHECKED", "")>>
 <?_("Never automatically expire messages")>
 <br />
-<input type="radio" NAME="mboxpolicy" VALUE="2" <?%("COND:SERVCFG", 1, "mboxpolicy", 2, "CHECKED", "")>>
+<input type="radio" NAME="mailboxespolicy" VALUE="<?DEF:VAL(#"EXPIRE_NUMMSGS")>" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_NUMMSGS", "CHECKED", "")>>
 <?_("Expire by message count")>
 <br />
-<input type="radio" NAME="mboxpolicy" VALUE="3" <?%("COND:SERVCFG", 1, "mboxpolicy", 3, "CHECKED", "")>>
+<input type="radio" NAME="mailboxespolicy" VALUE="<?DEF:VAL( #"EXPIRE_AGE")>" <?%("COND:SERVCFG", 1, #"mailboxespolicy", #"EXPIRE_AGE", "CHECKED", "")>>
 <?_("Expire by message age")>
 <br />
 <?_("Number of messages or days: ")>
-<input type="text" NAME="mboxvalue" MAXLENGTH="5" VALUE='<?SERV:CFG("mboxvalue")>'>
+<input type="text" NAME="mailboxespolicy_value" MAXLENGTH="5" VALUE='<?EXPIRE:VALUE(#"mailboxespolicy")>'>
 </td></tr>
+<tr><td colspan=2><hr></td></tr>
+
+<tr><td><?_("Default user purge time (days)")></td><td>
+<input type="text" name="c_userpurge" maxlength="5" value='<?SERV:CFG("c_userpurge")>'></td></tr>
+
+<tr><td><?_("Default room purge time (days)")></td><td>
+<input type="text" name="c_roompurge" maxlength="5" value='<?SERV:CFG("c_roompurge")>'></td></tr>
+
 
 <tr><td COLSPAN=2><hr /></td></tr>