Commit c0caf5f4 authored by Mark Sapiro's avatar Mark Sapiro

Redid DMARC Mitigations form for core changes and rerecorded some tapes.

parent fd7321a5
......@@ -369,14 +369,14 @@ class DMARCMitigationsForm(ListSettingsForm):
"""
DMARC Mitigations list settings.
"""
dmarc_moderation_action = forms.ChoiceField(
label=_('DMARC moderation action'),
dmarc_mitigate_action = forms.ChoiceField(
label=_('DMARC mitigation action'),
widget=forms.Select(),
required=False,
error_messages={
'required': _("Please choose a DMARC moderation action.")},
'required': _("Please choose a DMARC mitigation action.")},
choices=(
('none', _('No DMARC mitigations')),
('no_mitigation', _('No DMARC mitigations')),
('munge_from', _('Replace From: with list address')),
('wrap_message',
_('Wrap the message in an outer message From: the list.')),
......@@ -384,37 +384,25 @@ class DMARCMitigationsForm(ListSettingsForm):
('discard', _('Discard the message'))),
help_text=_(
'The action to apply to messages From: a domain publishing a '
'DMARC policy of reject and possibly quarantine or none. '
'When this is set to No DMARC mitigations, no mitigations will '
'be applied based on the DMARC policy of the From: domain, but '
'From is list actions will be applied.'))
dmarc_quarantine_moderation_action = forms.TypedChoiceField(
'DMARC policy of reject or quarantine or to all messages if '
'DMARC Mitigate unconditionally is True.'))
dmarc_mitigate_unconditionally = forms.TypedChoiceField(
coerce=lambda x: x == 'True',
choices=((True, _('Yes')), (False, _('No'))),
widget=forms.RadioSelect,
required=False,
label=_('Quarantine moderation action'),
label=_('DMARC Mitigate unconditionally'),
help_text=_(
'If DMARC moderation action is other than none, should it apply '
'to messages From: domains publishing DMARC p=quarantine as well '
'as to messages From: domains publishing DMARC p=reject?'))
dmarc_none_moderation_action = forms.TypedChoiceField(
coerce=lambda x: x == 'True',
choices=((True, _('Yes')), (False, _('No'))),
widget=forms.RadioSelect,
required=False,
label=_('None moderation action'),
help_text=_(
'If DMARC moderation action is other than none and quarantine '
'moderaction is Yes, should DMARC moderation action also apply '
'to messages From: domains publishing DMARC p=none?'))
'If DMARC moderation action is munge_from or wrap_message, '
'should it apply to all messages regardless of the DMARC policy '
'of the From: domain.'))
dmarc_moderation_notice = forms.CharField(
label=_('DMARC moderation notice'),
label=_('DMARC rejection notice'),
required=False,
widget=forms.Textarea(),
help_text=_(
'Text to include in any rejection notice to be sent when DMARC '
'moderation action of reject applies.'))
'mitigation action of reject applies.'))
dmarc_wrapped_message_text = forms.CharField(
label=_('DMARC wrapped message text'),
required=False,
......@@ -423,22 +411,6 @@ class DMARCMitigationsForm(ListSettingsForm):
'Text to be added as a separate text/plain MIME part preceding '
'the original message part in the wrapped message when DMARC '
'moderation action of wrap message applies.'))
from_is_list = forms.ChoiceField(
label=_('From is list'),
widget=forms.Select(),
required=False,
error_messages={
'required': _("Please choose a From is list action.")},
choices=(
('none', _('No action')),
('munge_from', _('Replace From: with list address')),
('wrap_message',
_('Wrap the message in an outer message From: the list.'))),
help_text=_(
'This action will be applied to all messages regardless of From: '
'domain if DMARC moderation action is none or is not applicable '
'because the From: domain does not publish an applicable '
'policy.'))
class AlterMessagesForm(ListSettingsForm):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment