From fa0b0e8852a31d6aa59651c7c92460c607a7337e Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sun, 18 Nov 2007 12:01:26 -0800 Subject: Gui/GuiBase.py - Deleted the _escape() method - not needed since 2.1.9 Gui/GuiBase.py Gui/Privacy.py Handlers/Moderate.py - Patched with a slightly modified version of sf patch 1220144 - allow specifying another list in accept_these_nonmembers. --- Mailman/Handlers/Moderate.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'Mailman/Handlers') diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py index 97d998b2..84ff14e5 100644 --- a/Mailman/Handlers/Moderate.py +++ b/Mailman/Handlers/Moderate.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2003 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2007 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 @@ -12,7 +12,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. """Posting moderation filter. """ @@ -28,6 +29,7 @@ from Mailman import Errors from Mailman.i18n import _ from Mailman.Handlers import Hold from Mailman.Logging.Syslog import syslog +from Mailman.MailList import MailList @@ -129,6 +131,15 @@ def matches_p(sender, nonmembers): continue if cre.search(sender): return 1 + elif are.startswith('@'): + # XXX Needs to be reviewed for list@domain names. + try: + mother = MailList(are[1:], lock=0) + if mother.isMember(sender): + return 1 + except Errors.MMUnknownListError: + syslog('error', 'filter references non-existent list %s', + are[1:]) return 0 -- cgit v1.2.3 From 7ace1799d7935bede9b4821d8f8f4a9ca243bf08 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sun, 18 Nov 2007 12:12:22 -0800 Subject: Scrubber.py - changed to use part.get_payload(), not part._payload. --- Mailman/Handlers/Scrubber.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Mailman/Handlers') diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py index 588dd9ac..1d5aed92 100644 --- a/Mailman/Handlers/Scrubber.py +++ b/Mailman/Handlers/Scrubber.py @@ -298,7 +298,7 @@ URL: %(url)s # If the message isn't a multipart, then we'll strip it out as an # attachment that would have to be separately downloaded. Pipermail # will transform the url into a hyperlink. - elif part._payload and not part.is_multipart(): + elif part.get_payload() and not part.is_multipart(): payload = part.get_payload(decode=True) ctype = part.get_type() # XXX Under email 2.5, it is possible that payload will be None. @@ -350,7 +350,7 @@ URL: %(url)s for part in msg.walk(): # TK: bug-id 1099138 and multipart # MAS test payload - if part may fail if there are no headers. - if not part._payload or part.is_multipart(): + if not part.get_payload() or part.is_multipart(): continue # All parts should be scrubbed to text/plain by now. partctype = part.get_content_type() -- cgit v1.2.3