aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Commands
diff options
context:
space:
mode:
authormsapiro <>2005-12-03 01:04:39 +0000
committermsapiro <>2005-12-03 01:04:39 +0000
commit6dd2b7fdf06cb3a9e6bc461efe3ab17e73dbe939 (patch)
tree0339b5154c4fc965b6d5f9740954ec28dcf3cffb /Mailman/Commands
parente827c436aad1b9809e6b4b6b450f2040e29d1197 (diff)
downloadmailman2-6dd2b7fdf06cb3a9e6bc461efe3ab17e73dbe939.tar.gz
mailman2-6dd2b7fdf06cb3a9e6bc461efe3ab17e73dbe939.tar.xz
mailman2-6dd2b7fdf06cb3a9e6bc461efe3ab17e73dbe939.zip
Improving banned subscription logic to cover all subscribes, address changes and confirmations of same.
Diffstat (limited to 'Mailman/Commands')
-rw-r--r--Mailman/Commands/cmd_confirm.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/Mailman/Commands/cmd_confirm.py b/Mailman/Commands/cmd_confirm.py
index 6574355d..94075c30 100644
--- a/Mailman/Commands/cmd_confirm.py
+++ b/Mailman/Commands/cmd_confirm.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2005 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
@@ -63,6 +63,12 @@ Your request has been forwarded to the list moderator for approval."""))
res.results.append(_("""\
You are not currently a member. Have you already unsubscribed or changed
your email address?"""))
+ except Errors.MembershipIsBanned:
+ owneraddr = mlist.GetOwnerEmail()
+ res.results.append(_("""\
+You are currently banned from subscribing to this list. If you think this
+restriction is erroneous, please contact the list owners at
+%(owneraddr)s."""))
except Errors.HostileSubscriptionError:
res.results.append(_("""\
You were not invited to this mailing list. The invitation has been discarded,