aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Gui
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2015-01-23 17:35:45 -0800
committerMark Sapiro <mark@msapiro.net>2015-01-23 17:35:45 -0800
commit6d0614d1b0d227b867b47ad133f7c8d2943d52f1 (patch)
treedf9de2462661a7b60ec54d052deca57c2fa02d6e /Mailman/Gui
parent792407be592b8e7d523cb134a01b09101cbc2cad (diff)
downloadmailman2-6d0614d1b0d227b867b47ad133f7c8d2943d52f1.tar.gz
mailman2-6d0614d1b0d227b867b47ad133f7c8d2943d52f1.tar.xz
mailman2-6d0614d1b0d227b867b47ad133f7c8d2943d52f1.zip
Implemented dmarc_wrapped_message_text to optionally add an explanitory
text/plain part to a message wrapped via dmarc_moderation_action.
Diffstat (limited to 'Mailman/Gui')
-rw-r--r--Mailman/Gui/Privacy.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index 905532ae..e6a2fd82 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -301,6 +301,20 @@ class Privacy(GUIBase):
>rejection notice</a> to
be sent to anyone who posts to this list from a domain
with a DMARC Reject%(quarantine)s Policy.""")),
+
+ ('dmarc_wrapped_message_text', mm_cfg.Text, (10, WIDTH), 1,
+ _("""If dmarc_moderation_action applies and is Wrap Message,
+ and this text is provided, the text will be placed in a
+ separate text/plain MIME part preceding the original message
+ part in the wrapped message."""),
+
+ _("""A wrapped message will either be a multipart/mixed message
+ with up to four sub-parts; a text/plain part containing
+ msg_header, a text/plain part containing
+ dmarc_wrapped_message_text, a message/rfc822 part containing the
+ original message and a text/plain part containing msg_footer, or
+ a message/rfc822 message containing only the original message if
+ none of the other parts are applicable.""")),
('equivalent_domains', mm_cfg.Text, (10, WIDTH), 1,
_("""A 'two dimensional' list of email address domains which are