Update of /cvsroot/mailman/mailman/Mailman
In directory usw-pr-cvs1:/tmp/cvs-serv17888/Mailman
Modified Files:
MailCommandHandler.py
Log Message:
GetAdminEmail() eradication campaign.
ParseMailCommand(), ProcessSubscribeCmd(), AddApprovalMsg(),
ProcessHelpCmd(): For human consumption, we should point people at the
-owner address as the contact address, but when sending the message
out, it should come from the -bounces address for bounce processing.
Index: MailCommandHandler.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/MailCommandHandler.py,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -d -r2.33 -r2.34
*** MailCommandHandler.py 15 Mar 2002 17:34:29 -0000 2.33
--- MailCommandHandler.py 26 Mar 2002 20:54:16 -0000 2.34
***************
*** 273,277 ****
self.__dispatch[cmd](args, line, msg)
except:
! admin = self.GetAdminEmail()
sfp = StringIO()
traceback.print_exc(file=sfp)
--- 273,277 ----
self.__dispatch[cmd](args, line, msg)
except:
! admin = self.GetOwnerEmail()
sfp = StringIO()
traceback.print_exc(file=sfp)
***************
*** 289,296 ****
'Unexpected Mailman error:\n%s', tbmsg)
# and send the traceback to the user
! lang = msgdata.get('lang',
! self.getMemberLanguage(admin))
responsemsg = Message.UserNotification(
! admin, admin, _('Unexpected Mailman error'),
_('''\
An unexpected Mailman error has occurred in
--- 289,296 ----
'Unexpected Mailman error:\n%s', tbmsg)
# and send the traceback to the user
! lang = msgdata.get('lang', self.preferred_language)
responsemsg = Message.UserNotification(
! admin, self.GetBouncesEmail(),
! _('Unexpected Mailman error'),
_('''\
An unexpected Mailman error has occurred in
***************
*** 303,307 ****
# send the response
if not self.__noresponse:
! adminaddr = self.GetAdminEmail()
requestaddr = self.GetRequestEmail()
if self.__errors > 0:
--- 303,307 ----
# send the response
if not self.__noresponse:
! adminaddr = self.GetOwnerEmail()
requestaddr = self.GetRequestEmail()
if self.__errors > 0:
***************
*** 687,691 ****
self.__noresponse = 1
except Errors.MMNeedApproval:
! adminemail = self.GetAdminEmail()
self.AddToResponse(_("""\
Your subscription request has been forwarded to the list administrator
--- 687,691 ----
self.__noresponse = 1
except Errors.MMNeedApproval:
! adminemail = self.GetOwnerEmail()
self.AddToResponse(_("""\
Your subscription request has been forwarded to the list administrator
***************
*** 767,771 ****
{'requestaddr': self.GetRequestEmail(),
'cmd' : cmd,
! 'adminaddr' : self.GetAdminEmail(),
}, mlist=self)
self.AddError(text, trunc=0)
--- 767,771 ----
{'requestaddr': self.GetRequestEmail(),
'cmd' : cmd,
! 'adminaddr' : self.GetOwnerEmail(),
}, mlist=self)
self.AddError(text, trunc=0)
***************
*** 778,782 ****
'listinfo_url': self.GetScriptURL('listinfo', absolute=1),
'requestaddr' : self.GetRequestEmail(),
! 'adminaddr' : self.GetAdminEmail(),
}, mlist=self)
self.AddToResponse(text, trunc=0)
--- 778,782 ----
'listinfo_url': self.GetScriptURL('listinfo', absolute=1),
'requestaddr' : self.GetRequestEmail(),
! 'adminaddr' : self.GetOwnerEmail(),
}, mlist=self)
self.AddToResponse(text, trunc=0)
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins
