Release version 997 generated by do-release.sh

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

diff --git a/webcit/static/t/aide/siteconfig/tab_smtp.html b/webcit/static/t/aide/siteconfig/tab_smtp.html
index a214ec9101f5f777fdba6956df42fa8036510093..01e7af36948520c490404cd98103177fd8c8bac0 100644 (file)
--- a/webcit/static/t/aide/siteconfig/tab_smtp.html
+++ b/webcit/static/t/aide/siteconfig/tab_smtp.html
@@ -3,7 +3,9 @@
 <hr>
 <table border="0">
 <tr><td><?_("SMTP MTA port (-1 to disable)")></td><td>
-<input type="text" NAME="c_smtp_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtp_port")>'></td></tr>
+<input type="text" NAME="c_smtp_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtp_port")>'>&nbsp;
+<?_("Offer STARTTLS")> <input type="checkbox" NAME="smtp_advertise_starttls" VALUE="yes" <?%("COND:SERVCFG", 1, "smtp_advertise_starttls", 1, "CHECKED", "")>>
+</td></tr>
 
 <tr><td><?_("SMTP MSA port (-1 to disable)")></td><td>
 <input type="text" NAME="c_msa_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_msa_port")>'></td></tr>
@@ -23,17 +25,17 @@
 <tr><td><?_("Correct forged From: lines during authenticated SMTP")></td><td>
 <ul>
 <li>
- <input type="radio" NAME="c_rfc822_strict_from" value="<?DEF:VAL(#"CFG_SMTP_FROM_FILTERALL")>" <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", #"CFG_SMTP_FROM_FILTERALL", "CHECKED", "")> />
-  <?_("Always replace / insert the users primary email address")>
-</li><li>
  <input type="radio" NAME="c_rfc822_strict_from" value="<?DEF:VAL(#"CFG_SMTP_FROM_NOFILTER")>"  <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", #"CFG_SMTP_FROM_NOFILTER",  "CHECKED", "")> />
- <?_("Don't check the From: header at all")>
+ <?_("No, allow any address in the From: header")>
 </li><li>
  <input type="radio" NAME="c_rfc822_strict_from" value="<?DEF:VAL(#"CFG_SMTP_FROM_CORRECT")>"   <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", #"CFG_SMTP_FROM_CORRECT",   "CHECKED", "")> />
- <?_("If the specified email is none of the users email-aliases, replace it with his primary mail address")>
+ <?_("Only change the From: header if the address is not valid for the user")>
+</li><li>
+ <input type="radio" NAME="c_rfc822_strict_from" value="<?DEF:VAL(#"CFG_SMTP_FROM_FILTERALL")>" <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", #"CFG_SMTP_FROM_FILTERALL", "CHECKED", "")> />
+  <?_("Yes, always place the user's primary email address in the From: header")>
 </li><li>
  <input type="radio" NAME="c_rfc822_strict_from" value="<?DEF:VAL(#"CFG_SMTP_FROM_REJECT")>"    <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", #"CFG_SMTP_FROM_REJECT",    "CHECKED", "")> />
- <?_("If the specified email is none of the users email-aliases or missing, refuse to relay the email")>
+ <?_("No, REJECT messages containing an invalid From: header")>
 </li>
 </ul>
 </td></tr>