diff options
| author | Jim Popovitch <jimpop@gmail.com> | 2016-10-10 21:47:57 +0000 |
|---|---|---|
| committer | Jim Popovitch <jimpop@gmail.com> | 2016-10-10 21:47:57 +0000 |
| commit | fc432afa375f34b935ab692619c1ba8bfb0e191a (patch) | |
| tree | 9c399f7d02f38c0309cfb3cf7a2e08ced4d9cc9d | |
| parent | 962c9d48558a3545fa2e319fa3033ba3aaead2ec (diff) | |
| download | mailman2-fc432afa375f34b935ab692619c1ba8bfb0e191a.tar.gz mailman2-fc432afa375f34b935ab692619c1ba8bfb0e191a.tar.xz mailman2-fc432afa375f34b935ab692619c1ba8bfb0e191a.zip | |
Replaced UserNotification() with OwnerNotification() in two places,
removed envsender override when processing owner emails (envsender
was coded to use site-email, but to pass DMARC we need it to use
the virtual domain)
| -rw-r--r-- | Mailman/Bouncer.py | 6 | ||||
| -rw-r--r-- | Mailman/Handlers/Hold.py | 3 | ||||
| -rw-r--r-- | Mailman/Queue/MaildirRunner.py | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py index 47955fa3..573b46e4 100644 --- a/Mailman/Bouncer.py +++ b/Mailman/Bouncer.py @@ -224,7 +224,6 @@ class Bouncer: # it was of dubious value). However, we'll provide empty, strange, or # meaningless strings for the unused %()s fields so that the language # translators don't have to provide new templates. - owneraddr = self.GetOwnerEmail() text = Utils.maketext( 'bounce.txt', {'listname' : self.real_name, @@ -233,11 +232,10 @@ class Bouncer: 'did' : _('disabled'), 'but' : '', 'reenable' : '', - 'owneraddr': owneraddr, + 'owneraddr': self.GetOwnerEmail(), }, mlist=self) subject = _('Bounce action notification') - umsg = Message.UserNotification(owneraddr, owneraddr, subject, - lang=self.preferred_language) + umsg = Message.OwnerNotification(self, subject, tomoderators=0) # BAW: Be sure you set the type before trying to attach, or you'll get # a MultipartConversionError. umsg.set_type('multipart/mixed') diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py index 5452d06a..d0d22690 100644 --- a/Mailman/Handlers/Hold.py +++ b/Mailman/Handlers/Hold.py @@ -264,8 +264,7 @@ def hold_for_approval(mlist, msg, msgdata, exc): d['subject'] = usersubject # craft the admin notification message and deliver it subject = _('%(listname)s post from %(sender)s requires approval') - nmsg = Message.UserNotification(owneraddr, owneraddr, subject, - lang=lang) + nmsg = Message.OwnerNotification(mlist, subject, tomoderators=1) nmsg.set_type('multipart/mixed') text = MIMEText( Utils.maketext('postauth.txt', d, raw=1, mlist=mlist), diff --git a/Mailman/Queue/MaildirRunner.py b/Mailman/Queue/MaildirRunner.py index d9fe02cb..5959dcd6 100644 --- a/Mailman/Queue/MaildirRunner.py +++ b/Mailman/Queue/MaildirRunner.py @@ -172,7 +172,6 @@ class MaildirRunner(Runner): elif subq == 'owner': msgdata.update({ 'toowner': 1, - 'envsender': Utils.get_site_email(extra='bounces'), 'pipeline': mm_cfg.OWNER_PIPELINE, }) queue = get_switchboard(mm_cfg.INQUEUE_DIR) |