diff options
| author | bwarsaw | 2002-03-26 21:10:02 +0000 |
|---|---|---|
| committer | bwarsaw | 2002-03-26 21:10:02 +0000 |
| commit | 8657c54ad947cb16bd97a52aec0fbfc85f8e333f (patch) | |
| tree | e2b6a490ce26a3b53af4c46f18950eb0114e0d85 /Mailman/MailList.py | |
| parent | d6ad510b8025760e1d1171d2df18513d76b264cf (diff) | |
| download | mailman-8657c54ad947cb16bd97a52aec0fbfc85f8e333f.tar.gz mailman-8657c54ad947cb16bd97a52aec0fbfc85f8e333f.tar.zst mailman-8657c54ad947cb16bd97a52aec0fbfc85f8e333f.zip | |
GetAdminEmail() eradication campaign.
GetBouncesEmail(): Return the list's -bounces address.
GetAdminEmail(): Obsolete, removed.
AddMember(), ChangeMemberAddress(), ConfirmUnsubscription(): Make the
notification email appear to come from the -bounces address. When the
sender is for human consumption, make it the -owner address (or in the
case of Cleanse.py for anonymous lists, the list posting address).
Diffstat (limited to 'Mailman/MailList.py')
| -rw-r--r-- | Mailman/MailList.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 08b370837..2dcd4c116 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -173,8 +173,8 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, return '%s-%s@%s' % (self.internal_name(), extra, self.host_name) # For backwards compatibility - def GetAdminEmail(self): - return self.getListAddress('admin') + def GetBouncesEmail(self): + return self.getListAddress('bounces') def GetOwnerEmail(self): return self.getListAddress('owner') @@ -728,7 +728,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, 'cookie' : cookie, 'requestaddr' : self.GetRequestEmail(), 'remote' : remote, - 'listadmin' : self.GetAdminEmail(), + 'listadmin' : self.GetOwnerEmail(), 'confirmurl' : confirmurl, }, lang=lang, mlist=self) msg = Message.UserNotification( @@ -808,7 +808,6 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, if ack: self.SendSubscribeAck(email, self.getMemberPassword(email), digest) if admin_notif: - adminaddr = self.GetAdminEmail() realname = self.real_name subject = _('%(realname)s subscription notification') text = Utils.maketext( @@ -917,7 +916,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, 'cookie' : cookie, 'requestaddr': self.GetRequestEmail(), 'remote' : '', - 'listadmin' : self.GetAdminEmail(), + 'listadmin' : self.GetOwnerEmail(), 'confirmurl' : confirmurl, }, lang=lang, mlist=self) # BAW: We don't pass the Subject: into the UserNotification @@ -1079,7 +1078,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin, 'cookie' : cookie, 'requestaddr' : self.GetRequestEmail(), 'remote' : remote, - 'listadmin' : self.GetAdminEmail(), + 'listadmin' : self.GetOwnerEmail(), 'confirmurl' : confirmurl, }, lang=lang, mlist=self) msg = Message.UserNotification( |