Make dmarc_quarantine_moderaction_action a list setting.

1 files changed, 19 insertions, 2 deletions

diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index 477304c6..7f1e12f3 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -159,7 +159,7 @@ class Privacy(GUIBase):
 
         adminurl = mlist.GetScriptURL('admin', absolute=1)
     
-        if mm_cfg.DMARC_QUARANTINE_MODERATION_ACTION:
+        if mlist.dmarc_quarantine_moderation_action:
             quarantine = _('/Quarantine')
         else:
             quarantine = ''
@@ -269,6 +269,23 @@ class Privacy(GUIBase):
              if the message is From: an affected domain and the setting is
              other than Accept.""")),
 
+            ('dmarc_quarantine_moderation_action', mm_cfg.Radio,
+             (_('No'), _('Yes')), 0,
+             _("""Shall the above dmarc_moderation_action apply to messages
+               From: domains with DMARC p=quarantine as well as p=reject"""),
+
+             _("""<ul><li><b>No</b> -- this applies dmarc_moderation_action to
+               only those posts From: a domain with DMARC p=reject.  This is
+               appropriate if you are concerned about bounced messages, but
+               want to apply dmarc_moderation_action to as few messages as
+               possible.
+               <p><li><b>Yes</b> -- this applies dmarc_moderation_action to
+               posts From: a domain with DMARC p=reject or p=quarantine.
+               </ul><p>If a message is From: a domain with DMARC p=quarantine
+               and dmarc_moderation_action is not applied (this set to No)
+               the message will likely not bounce, but will be delivered to
+               recipients' spam folders or other hard to find places.""")),
+
             ('dmarc_moderation_notice', mm_cfg.Text, (10, WIDTH), 1,
              _("""Text to include in any
              <a href="?VARHELP=privacy/sender/dmarc_moderation_action"
@@ -440,7 +457,7 @@ class Privacy(GUIBase):
              case, each rule is matched in turn, with processing stopped after
              the first match.
 
-             Note that headers are collected from all the attachments 
+             Note that headers are collected from all the attachments
              (except for the mailman administrivia message) and
              matched against the regular expressions. With this feature,
              you can effectively sort out messages with dangerous file