diff options
| author | Mark Sapiro <msapiro@value.net> | 2014-04-16 12:06:44 -0700 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2014-04-16 12:06:44 -0700 |
| commit | 96dd7c7b5133e629ff9bdf62ff189202cc637b05 (patch) | |
| tree | cfe22c3195834b52e89d974fd93c0652deb56efc | |
| parent | 5d91aaf0aa141300bad65443e3a007fdd2396c19 (diff) | |
| download | mailman2-96dd7c7b5133e629ff9bdf62ff189202cc637b05.tar.gz mailman2-96dd7c7b5133e629ff9bdf62ff189202cc637b05.tar.xz mailman2-96dd7c7b5133e629ff9bdf62ff189202cc637b05.zip | |
Reordered Munge/Wrap DMARC moderation policy options
so site admins can allow Wrap but not Munge.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Gui/Privacy.py | 10 | ||||
| -rw-r--r-- | Mailman/Handlers/Moderate.py | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py index bd992df9..0b8fcb81 100644 --- a/Mailman/Gui/Privacy.py +++ b/Mailman/Gui/Privacy.py @@ -241,19 +241,19 @@ class Privacy(GUIBase): be sent to moderated members who post to this list.""")), ('dmarc_moderation_action', mm_cfg.Radio, - (_('Accept'), _('Wrap Message'), _('Munge From'), _('Reject'), + (_('Accept'), _('Munge From'), _('Wrap Message'), _('Reject'), _('Discard')), 0, _("""Action to take when anyone posts to the list from a domain with a DMARC Reject%(quarantine)s Policy."""), - _("""<ul><li><b>Wrap Message</b> -- applies the <a - href="?VARHELP=general/from_is_list">from_is_list Wrap - Message</a> transformation to these messages. - <p><li><b>Munge From</b> -- applies the <a href="?VARHELP=general/from_is_list">from_is_list Munge From</a> transformation to these messages. + _("""<ul><li><b>Wrap Message</b> -- applies the <a + href="?VARHELP=general/from_is_list">from_is_list Wrap + Message</a> transformation to these messages. + <p><li><b>Reject</b> -- this automatically rejects the message by sending a bounce notice to the post's author. The text of the bounce notice can be <a diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py index d901eb59..56acb4e4 100644 --- a/Mailman/Handlers/Moderate.py +++ b/Mailman/Handlers/Moderate.py @@ -56,11 +56,11 @@ def process(mlist, msg, msgdata): if addr: if Utils.IsDMARCProhibited(addr): # Note that for dmarc_moderation_action, 0 = Accept, - # 1 = Wrap, 2 = Munge, 3 = Reject, 4 = Discard + # 1 = Munge, 2 = Wrap, 3 = Reject, 4 = Discard if mlist.dmarc_moderation_action == 1: - msgdata['from_is_list'] = 2 - elif mlist.dmarc_moderation_action == 2: msgdata['from_is_list'] = 1 + elif mlist.dmarc_moderation_action == 2: + msgdata['from_is_list'] = 2 elif mlist.dmarc_moderation_action == 3: # Reject text = mlist.dmarc_moderation_notice |