Update of /cvsroot/mailman/mailman/Mailman/Handlers
In directory usw-pr-cvs1:/tmp/cvs-serv21298/Mailman/Handlers
Modified Files:
Acknowledge.py Cleanse.py Hold.py Moderate.py Replybot.py
SMTPDirect.py Sendmail.py
Log Message:
GetAdminEmail() eradication campaign.
process(), hold_for_approval(), do_discard(): 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).
Index: Acknowledge.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/Acknowledge.py,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -d -r2.11 -r2.12
*** Acknowledge.py 11 Feb 2002 23:27:37 -0000 2.11
--- Acknowledge.py 26 Mar 2002 21:03:32 -0000 2.12
***************
*** 63,67 ****
# queue.
subject = _('%(realname)s post acknowledgement')
! usermsg = Message.UserNotification(sender, mlist.GetAdminEmail(),
subject, text, lang)
usermsg.send(mlist)
--- 63,67 ----
# queue.
subject = _('%(realname)s post acknowledgement')
! usermsg = Message.UserNotification(sender, mlist.GetBouncesEmail(),
subject, text, lang)
usermsg.send(mlist)
Index: Cleanse.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/Cleanse.py,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** Cleanse.py 16 Mar 2002 06:57:37 -0000 2.4
--- Cleanse.py 26 Mar 2002 21:03:32 -0000 2.5
***************
*** 30,34 ****
del msg['reply-to']
del msg['sender']
! msg['From'] = mlist.GetAdminEmail()
msg['Reply-To'] = mlist.GetListEmail()
# Some headers can be used to fish for membership
--- 30,34 ----
del msg['reply-to']
del msg['sender']
! msg['From'] = mlist.GetListEmail()
msg['Reply-To'] = mlist.GetListEmail()
# Some headers can be used to fish for membership
Index: Hold.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/Hold.py,v
retrieving revision 2.24
retrieving revision 2.25
diff -C2 -d -r2.24 -r2.25
*** Hold.py 12 Mar 2002 07:40:06 -0000 2.24
--- Hold.py 26 Mar 2002 21:03:33 -0000 2.25
***************
*** 185,189 ****
sender = msg.get_sender()
owneraddr = mlist.GetOwnerEmail()
! adminaddr = mlist.GetAdminEmail()
requestaddr = mlist.GetRequestEmail()
# We need to send both the reason and the rejection notice through the
--- 185,189 ----
sender = msg.get_sender()
owneraddr = mlist.GetOwnerEmail()
! adminaddr = mlist.GetBouncesEmail()
requestaddr = mlist.GetRequestEmail()
# We need to send both the reason and the rejection notice through the
Index: Moderate.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/Moderate.py,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -d -r2.7 -r2.8
*** Moderate.py 7 Mar 2002 22:35:37 -0000 2.7
--- Moderate.py 26 Mar 2002 21:03:33 -0000 2.8
***************
*** 141,145 ****
mlist.GetScriptURL('admin', absolute=1)
nmsg = Message.UserNotification(mlist.GetOwnerEmail(),
! mlist.GetAdminEmail(),
_('Auto-discard notification'),
lang=mlist.preferred_language)
--- 141,145 ----
mlist.GetScriptURL('admin', absolute=1)
nmsg = Message.UserNotification(mlist.GetOwnerEmail(),
! mlist.GetBouncesEmail(),
_('Auto-discard notification'),
lang=mlist.preferred_language)
Index: Replybot.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/Replybot.py,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -d -r2.6 -r2.7
*** Replybot.py 23 Feb 2002 06:43:34 -0000 2.6
--- Replybot.py 26 Mar 2002 21:03:33 -0000 2.7
***************
*** 70,74 ****
'listurl' : mlist.GetScriptURL('listinfo'),
'requestemail': mlist.GetRequestEmail(),
! 'adminemail' : mlist.GetAdminEmail(),
'owneremail' : mlist.GetOwnerEmail(),
})
--- 70,74 ----
'listurl' : mlist.GetScriptURL('listinfo'),
'requestemail': mlist.GetRequestEmail(),
! 'adminemail' : mlist.GetBouncesEmail(),
'owneremail' : mlist.GetOwnerEmail(),
})
Index: SMTPDirect.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/SMTPDirect.py,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -d -r2.15 -r2.16
*** SMTPDirect.py 14 Mar 2002 22:38:20 -0000 2.15
--- SMTPDirect.py 26 Mar 2002 21:03:33 -0000 2.16
***************
*** 84,88 ****
# Calculate the non-VERP envelope sender.
if mlist:
! envsender = mlist.getListAddress('bounces')
else:
envsender = Utils.get_site_email(extra='bounces')
--- 84,88 ----
# Calculate the non-VERP envelope sender.
if mlist:
! envsender = mlist.GetBouncesEmail()
else:
envsender = Utils.get_site_email(extra='bounces')
Index: Sendmail.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/Sendmail.py,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** Sendmail.py 16 Mar 2002 06:57:37 -0000 2.4
--- Sendmail.py 26 Mar 2002 21:03:33 -0000 2.5
***************
*** 61,65 ****
return
# Use -f to set the envelope sender
! cmd = mm_cfg.SENDMAIL_CMD + ' -f ' + mlist.GetAdminEmail() + ' '
# make sure the command line is of a manageable size
recipchunks = []
--- 61,65 ----
return
# Use -f to set the envelope sender
! cmd = mm_cfg.SENDMAIL_CMD + ' -f ' + mlist.GetBouncesEmail() + ' '
# make sure the command line is of a manageable size
recipchunks = []
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins
