From f0763fc617af7ca8386351c71058f4472443b87a Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Wed, 30 Jul 2008 08:58:02 -0700 Subject: Changed ListAdmin.py to make rejected post messages From: the -owner address instead of the -bounces address. --- Mailman/ListAdmin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py index ba486e09..191b76f8 100644 --- a/Mailman/ListAdmin.py +++ b/Mailman/ListAdmin.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2004 by the Free Software Foundation, Inc. +# Copyright (C) 1998-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 @@ -499,7 +499,7 @@ class ListAdmin: subject = _('Request to mailing list %(realname)s rejected') finally: i18n.set_translation(otrans) - msg = Message.UserNotification(recip, self.GetBouncesEmail(), + msg = Message.UserNotification(recip, self.GetOwnerEmail(), subject, text, lang) msg.send(self) -- cgit v1.2.3 From 39b6bc673e4cbcd1c71aefa3b7130960604c4749 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Wed, 30 Jul 2008 09:09:29 -0700 Subject: Fixed a bug in admin.py which would result in chunked pages of the membership list for members whose address begins with a non-alphanumeric character to not be visible or retrievable. --- Mailman/Cgi/admin.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index d1a255d3..a6251058 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2007 by the Free Software Foundation, Inc. +# Copyright (C) 1998-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 @@ -28,7 +28,6 @@ import sha import urllib import signal from types import * -from string import lowercase, digits from email.Utils import unquote, parseaddr, formataddr @@ -901,12 +900,10 @@ def membership_options(mlist, subcat, cgidata, doc, form): qsenviron = os.environ.get('QUERY_STRING') if qsenviron: qs = cgi.parse_qs(qsenviron) - bucket = qs.get('letter', 'a')[0].lower() - if bucket not in digits + lowercase: - bucket = None + bucket = qs.get('letter', '0')[0].lower() + keys = buckets.keys() + keys.sort() if not bucket or not buckets.has_key(bucket): - keys = buckets.keys() - keys.sort() bucket = keys[0] members = buckets[bucket] action = adminurl + '/members?letter=%s' % bucket @@ -942,9 +939,7 @@ def membership_options(mlist, subcat, cgidata, doc, form): # Add the alphabetical links if bucket: cells = [] - for letter in digits + lowercase: - if not buckets.get(letter): - continue + for letter in keys: url = adminurl + '/members?letter=%s' % letter if letter == bucket: show = Bold('[%s]' % letter.upper()).Format() -- cgit v1.2.3