diff options
Diffstat (limited to '')
| -rw-r--r-- | Mailman/HTMLFormatter.py | 5 | ||||
| -rw-r--r-- | Mailman/MTA/Postfix.py | 35 | ||||
| -rw-r--r-- | Mailman/Utils.py | 4 | ||||
| -rw-r--r-- | Mailman/Version.py | 4 |
4 files changed, 35 insertions, 13 deletions
diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py index 5fcce75b..2a3e08db 100644 --- a/Mailman/HTMLFormatter.py +++ b/Mailman/HTMLFormatter.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2017 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 @@ -40,8 +40,7 @@ COMMASPACE = ', ' class HTMLFormatter: def GetMailmanFooter(self): - ownertext = COMMASPACE.join([Utils.ObscureEmail(a, 1) - for a in self.owner]) + ownertext = Utils.ObscureEmail(self.GetOwnerEmail(), 1) # Remove the .Format() when htmlformat conversion is done. realname = self.real_name hostname = self.host_name diff --git a/Mailman/MTA/Postfix.py b/Mailman/MTA/Postfix.py index d18d850b..aed36bc4 100644 --- a/Mailman/MTA/Postfix.py +++ b/Mailman/MTA/Postfix.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2016 by the Free Software Foundation, Inc. +# Copyright (C) 2001-2017 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 @@ -131,13 +131,21 @@ def _addvirtual(mlist, fp): # And the site list posting address. siteaddr = Utils.get_site_email(mlist.host_name) sitedest = Utils.ParseEmail(siteaddr)[0] + # And the site list -owner address. + siteowneraddr = Utils.get_site_email(mlist.host_name, extra='owner') + siteownerdest = Utils.ParseEmail(siteowneraddr)[0] if mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN: loopdest += '@' + mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN sitedest += '@' + mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN - # If the site list's host_name is a virtual domain, adding it to the - # SITE ADDRESSES will duplicate the list posting entry, so comment it. - if _isvirtual(MailList(mm_cfg.MAILMAN_SITE_LIST, lock=False)): + siteownerdest += '@' + mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN + # If the site list's host_name is a virtual domain, adding the list and + # owner addresses to the SITE ADDRESSES will duplicate the entries in the + # stanza for the list. Postfix doesn't like dups so we try to comment them + # here, but only for the actual site list domain. + if (MailList(mm_cfg.MAILMAN_SITE_LIST, lock=False).host_name.lower() == + hostname.lower()): siteaddr = '#' + siteaddr + siteowneraddr = '#' + siteowneraddr # Seek to the end of the text file, but if it's empty write the standard # disclaimer, and the loop catch address and site address. fp.seek(0, 2) @@ -156,11 +164,14 @@ def _addvirtual(mlist, fp): # LOOP ADDRESSES END # We also add the site list address in each virtual domain as that address -# is exposed on admin and listinfo overviews. +# is exposed on admin and listinfo overviews, and we add the site list-owner +# address as it is exposed in the list created email notice. + # SITE ADDRESSES START %s\t%s +%s\t%s # SITE ADDRESSES END -""" % (loopaddr, loopdest, siteaddr, sitedest) +""" % (loopaddr, loopdest, siteaddr, sitedest, siteowneraddr, siteownerdest) # The text file entries get a little extra info print >> fp, '# STANZA START:', listname print >> fp, '# CREATED:', time.ctime(time.time()) @@ -185,9 +196,20 @@ def _check_for_virtual_loopaddr(mlist, filename): loopdest = Utils.ParseEmail(loopaddr)[0] siteaddr = Utils.get_site_email(mlist.host_name) sitedest = Utils.ParseEmail(siteaddr)[0] + siteowneraddr = Utils.get_site_email(mlist.host_name, extra='owner') + siteownerdest = Utils.ParseEmail(siteowneraddr)[0] if mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN: loopdest += '@' + mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN sitedest += '@' + mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN + siteownerdest += '@' + mm_cfg.VIRTUAL_MAILMAN_LOCAL_DOMAIN + # If the site list's host_name is a virtual domain, adding the list and + # owner addresses to the SITE ADDRESSES will duplicate the entries in the + # stanza for the list. Postfix doesn't like dups so we try to comment them + # here, but only for the actual site list domain. + if (MailList(mm_cfg.MAILMAN_SITE_LIST, lock=False).host_name.lower() == + mlist.host_name.lower()): + siteaddr = '#' + siteaddr + siteowneraddr = '#' + siteowneraddr infp = open(filename) omask = os.umask(007) try: @@ -237,6 +259,7 @@ def _check_for_virtual_loopaddr(mlist, filename): if line.startswith('# SITE ADDRESSES END'): # It hasn't print >> outfp, '%s\t%s' % (siteaddr, sitedest) + print >> outfp, '%s\t%s' % (siteowneraddr, siteownerdest) outfp.write(line) break elif line.startswith(siteaddr) or line.startswith('#' + siteaddr): diff --git a/Mailman/Utils.py b/Mailman/Utils.py index 739def1d..75481563 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2017 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 @@ -1391,7 +1391,7 @@ fact is returned.""" del recentMemberPostings[addr] if not mlist.isMember(email): return False - return (len(recentMemberPostings.get(email, [])) >= + return (len(recentMemberPostings.get(email, [])) > mlist.member_verbosity_threshold ) diff --git a/Mailman/Version.py b/Mailman/Version.py index 22fa59be..48fea21d 100644 --- a/Mailman/Version.py +++ b/Mailman/Version.py @@ -16,7 +16,7 @@ # USA. # Mailman version -VERSION = '2.1.23' +VERSION = '2.1.24' # And as a hex number in the manner of PY_VERSION_HEX ALPHA = 0xa @@ -28,7 +28,7 @@ FINAL = 0xf MAJOR_REV = 2 MINOR_REV = 1 -MICRO_REV = 23 +MICRO_REV = 24 REL_LEVEL = FINAL # at most 15 beta releases! REL_SERIAL = 0 |