From: Wilfried Goesgens <dothebart@citadel.org>
Date: Wed, 25 Jul 2012 15:19:35 +0000 (+0200)
Subject: Siteconfig: flip smtp relay access options so they are escalating from none to reject
X-Git-Tag: v8.20~284
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c925182ef893d957564ee4be08879cc88ee3361b

Siteconfig: flip smtp relay access options so they are escalating from none to reject
---

diff --git a/webcit/static/t/aide/siteconfig/tab_smtp.html b/webcit/static/t/aide/siteconfig/tab_smtp.html
index 152f2a597..4c747a660 100644
--- a/webcit/static/t/aide/siteconfig/tab_smtp.html
+++ b/webcit/static/t/aide/siteconfig/tab_smtp.html
@@ -23,14 +23,14 @@
 <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", "")> />
-  <?_("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_NOFILTER")>"  <?%("COND:SERVCFG", 1, "c_rfc822_strict_from", #"CFG_SMTP_FROM_NOFILTER",  "CHECKED", "")> />
  <?_("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", "")> />
  <?_("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", "")> />
  <?_("No, REJECT messages containing an invalid From: header")>