From d1e936a52d03f3c7551adda47e22cdcbd5abd352 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sat, 23 Feb 2008 13:16:35 -0800 Subject: MailList.py - Corrected some long standing incomplete logic in the ChangeMemberAddress() and ApprovedChangeMemberAddress() methods having to do with case-only changes and confirmations of changes already done another way. confirm.py - Caught a MMAlreadyAMember exception that can occur rarely with address changes. This adds a new i18n string, but it's rare enough that I'm not concerned about the translations. --- Mailman/Cgi/confirm.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Mailman/Cgi') diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py index 6f31b6eb..d0f5dea1 100644 --- a/Mailman/Cgi/confirm.py +++ b/Mailman/Cgi/confirm.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2005 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2008 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -529,6 +529,12 @@ def addrchange_confirm(mlist, doc, cookie): doc.addError(_("""%(newaddr)s is banned from subscribing to the %(realname)s list. If you think this restriction is erroneous, please contact the list owners at %(owneraddr)s.""")) + except Errors.MMAlreadyAMember: + realname = mlist.real_name + bad_confirmation(doc, _("""%(newaddr)s is already a member of + the %(realname)s list. It is possible that you are attempting + to confirm a request for an address that has already been + subscribed.""")) else: # The response listname = mlist.real_name -- cgit v1.2.3