------------------------------------------------------------
revno: 1459
committer: Mark Sapiro <msap...@value.net>
branch nick: 2.1
timestamp: Wed 2014-04-16 12:06:44 -0700
message:
Reordered Munge/Wrap DMARC moderation policy options
so site admins can allow Wrap but not Munge.
modified:
Mailman/Gui/Privacy.py
Mailman/Handlers/Moderate.py
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'Mailman/Gui/Privacy.py'
--- Mailman/Gui/Privacy.py 2014-04-15 20:31:10 +0000
+++ Mailman/Gui/Privacy.py 2014-04-16 19:06:44 +0000
@@ -241,19 +241,19 @@
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."""),
+ <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>Munge From</b> -- applies the <a
- href="?VARHELP=general/from_is_list">from_is_list Munge From</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
=== modified file 'Mailman/Handlers/Moderate.py'
--- Mailman/Handlers/Moderate.py 2014-04-15 19:59:48 +0000
+++ Mailman/Handlers/Moderate.py 2014-04-16 19:06:44 +0000
@@ -56,11 +56,11 @@
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'] = 1
+ elif mlist.dmarc_moderation_action == 2:
msgdata['from_is_list'] = 2
- elif mlist.dmarc_moderation_action == 2:
- msgdata['from_is_list'] = 1
elif mlist.dmarc_moderation_action == 3:
# Reject
text = mlist.dmarc_moderation_notice
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
