diff options
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Handlers/Acknowledge.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/Cleanse.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/Hold.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/Moderate.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/Replybot.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/SMTPDirect.py | 2 | ||||
| -rw-r--r-- | Mailman/Handlers/Sendmail.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/Mailman/Handlers/Acknowledge.py b/Mailman/Handlers/Acknowledge.py index a3e4869e4..6e7476803 100644 --- a/Mailman/Handlers/Acknowledge.py +++ b/Mailman/Handlers/Acknowledge.py @@ -62,6 +62,6 @@ def process(mlist, msg, msgdata): # necessary for general delivery. Then enqueue it to the outgoing # queue. subject = _('%(realname)s post acknowledgement') - usermsg = Message.UserNotification(sender, mlist.GetAdminEmail(), + usermsg = Message.UserNotification(sender, mlist.GetBouncesEmail(), subject, text, lang) usermsg.send(mlist) diff --git a/Mailman/Handlers/Cleanse.py b/Mailman/Handlers/Cleanse.py index 1c17ebdd5..143f95007 100644 --- a/Mailman/Handlers/Cleanse.py +++ b/Mailman/Handlers/Cleanse.py @@ -29,7 +29,7 @@ def process(mlist, msg, msgdata): del msg['from'] del msg['reply-to'] del msg['sender'] - msg['From'] = mlist.GetAdminEmail() + msg['From'] = mlist.GetListEmail() msg['Reply-To'] = mlist.GetListEmail() # Some headers can be used to fish for membership del msg['return-receipt-to'] diff --git a/Mailman/Handlers/Hold.py b/Mailman/Handlers/Hold.py index 5ca1fb4eb..7e37622f9 100644 --- a/Mailman/Handlers/Hold.py +++ b/Mailman/Handlers/Hold.py @@ -184,7 +184,7 @@ def hold_for_approval(mlist, msg, msgdata, exc): listname = mlist.real_name sender = msg.get_sender() owneraddr = mlist.GetOwnerEmail() - adminaddr = mlist.GetAdminEmail() + adminaddr = mlist.GetBouncesEmail() requestaddr = mlist.GetRequestEmail() # We need to send both the reason and the rejection notice through the # translator again, because of the games we play above diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py index 9275052f8..a41aafc19 100644 --- a/Mailman/Handlers/Moderate.py +++ b/Mailman/Handlers/Moderate.py @@ -140,7 +140,7 @@ def do_discard(mlist, msg): varhelp = '%s/?VARHELP=privacy/sender/discard_these_nonmembers' % \ mlist.GetScriptURL('admin', absolute=1) nmsg = Message.UserNotification(mlist.GetOwnerEmail(), - mlist.GetAdminEmail(), + mlist.GetBouncesEmail(), _('Auto-discard notification'), lang=mlist.preferred_language) nmsg.set_type('multipart/mixed') diff --git a/Mailman/Handlers/Replybot.py b/Mailman/Handlers/Replybot.py index 7d8362819..5f6d34808 100644 --- a/Mailman/Handlers/Replybot.py +++ b/Mailman/Handlers/Replybot.py @@ -69,7 +69,7 @@ def process(mlist, msg, msgdata): d = SafeDict({'listname' : realname, 'listurl' : mlist.GetScriptURL('listinfo'), 'requestemail': mlist.GetRequestEmail(), - 'adminemail' : mlist.GetAdminEmail(), + 'adminemail' : mlist.GetBouncesEmail(), 'owneremail' : mlist.GetOwnerEmail(), }) # Just because we're using a SafeDict doesn't mean we can't get all sorts diff --git a/Mailman/Handlers/SMTPDirect.py b/Mailman/Handlers/SMTPDirect.py index a7811c46f..bf436cfe5 100644 --- a/Mailman/Handlers/SMTPDirect.py +++ b/Mailman/Handlers/SMTPDirect.py @@ -83,7 +83,7 @@ def process(mlist, msg, msgdata): return # Calculate the non-VERP envelope sender. if mlist: - envsender = mlist.getListAddress('bounces') + envsender = mlist.GetBouncesEmail() else: envsender = Utils.get_site_email(extra='bounces') # Time to split up the recipient list. If we're personalizing or VERPing diff --git a/Mailman/Handlers/Sendmail.py b/Mailman/Handlers/Sendmail.py index 3c8c94b65..356bd65cb 100644 --- a/Mailman/Handlers/Sendmail.py +++ b/Mailman/Handlers/Sendmail.py @@ -60,7 +60,7 @@ def process(mlist, msg, msgdata): # Nobody to deliver to! return # Use -f to set the envelope sender - cmd = mm_cfg.SENDMAIL_CMD + ' -f ' + mlist.GetAdminEmail() + ' ' + cmd = mm_cfg.SENDMAIL_CMD + ' -f ' + mlist.GetBouncesEmail() + ' ' # make sure the command line is of a manageable size recipchunks = [] currentchunk = [] |