Revision: 8105
http://svn.sourceforge.net/mailman/?rev=8105&view=rev
Author: tkikuchi
Date: 2006-12-03 04:38:59 -0800 (Sun, 03 Dec 2006)
Log Message:
-----------
Support for VERP and personalization.
Modified Paths:
--------------
trunk/mailman/Mailman/Defaults.py.in
trunk/mailman/Mailman/Gui/NonDigest.py
trunk/mailman/Mailman/Queue/LMTPRunner.py
Modified: trunk/mailman/Mailman/Defaults.py.in
===================================================================
--- trunk/mailman/Mailman/Defaults.py.in 2006-12-03 08:06:45 UTC (rev
8104)
+++ trunk/mailman/Mailman/Defaults.py.in 2006-12-03 12:38:59 UTC (rev
8105)
@@ -602,6 +602,7 @@
#
# Note that your MTA /must/ be configured to deliver such an addressed message
# to mylist-bounces!
+VERP_DELIMITER = '+'
VERP_FORMAT = '%(bounces)s+%(mailbox)s=%(host)s'
# The second describes a regular expression to unambiguously decode such an
Modified: trunk/mailman/Mailman/Gui/NonDigest.py
===================================================================
--- trunk/mailman/Mailman/Gui/NonDigest.py 2006-12-03 08:06:45 UTC (rev
8104)
+++ trunk/mailman/Mailman/Gui/NonDigest.py 2006-12-03 12:38:59 UTC (rev
8105)
@@ -17,9 +17,10 @@
"""GUI component for managing the non-digest delivery options.
"""
-from Mailman import mm_cfg
from Mailman import Utils
+from Mailman import Defaults
from Mailman.i18n import _
+from Mailman.configuration import config
from Mailman.Gui.GUIBase import GUIBase
from Mailman.Gui.Digest import ALLOWEDS
@@ -36,19 +37,19 @@
def GetConfigInfo(self, mlist, category, subcat=None):
if category <> 'nondigest':
return None
- WIDTH = mm_cfg.TEXTFIELDWIDTH
+ WIDTH = config.TEXTFIELDWIDTH
info = [
_("Policies concerning immediately delivered list traffic."),
- ('nondigestable', mm_cfg.Toggle, (_('No'), _('Yes')), 1,
+ ('nondigestable', Defaults.Toggle, (_('No'), _('Yes')), 1,
_("""Can subscribers choose to receive mail immediately, rather
than in batched digests?""")),
]
- if mm_cfg.OWNERS_CAN_ENABLE_PERSONALIZATION:
+ if config.OWNERS_CAN_ENABLE_PERSONALIZATION:
info.extend([
- ('personalize', mm_cfg.Radio,
+ ('personalize', Defaults.Radio,
(_('No'), _('Yes'), _('Full Personalization')), 1,
_('''Should Mailman personalize each non-digest delivery?
@@ -105,7 +106,7 @@
# substitution variable, and we're transitioning from no
# personalization to personalization enabled.
headfoot = Utils.maketext('headfoot.html', mlist=mlist, raw=1)
- if mm_cfg.OWNERS_CAN_ENABLE_PERSONALIZATION:
+ if config.OWNERS_CAN_ENABLE_PERSONALIZATION:
extra = _("""\
When <a href="?VARHELP=nondigest/personalize">personalization</a> is enabled
for this list, additional substitution variables are allowed in your headers
@@ -124,19 +125,19 @@
else:
extra = ''
- info.extend([('msg_header', mm_cfg.Text, (10, WIDTH), 0,
+ info.extend([('msg_header', Defaults.Text, (10, WIDTH), 0,
_('Header added to mail sent to regular list members'),
_('''Text prepended to the top of every immediately-delivery
message. ''') + headfoot + extra),
- ('msg_footer', mm_cfg.Text, (10, WIDTH), 0,
+ ('msg_footer', Defaults.Text, (10, WIDTH), 0,
_('Footer added to mail sent to regular list members'),
_('''Text appended to the bottom of every immediately-delivery
message. ''') + headfoot + extra),
])
info.extend([
- ('scrub_nondigest', mm_cfg.Toggle, (_('No'), _('Yes')), 0,
+ ('scrub_nondigest', Defaults.Toggle, (_('No'), _('Yes')), 0,
_('Scrub attachments of regular delivery message?'),
_('''When you scrub attachments, they are stored in archive
area and links are made in the message so that the member can
Modified: trunk/mailman/Mailman/Queue/LMTPRunner.py
===================================================================
--- trunk/mailman/Mailman/Queue/LMTPRunner.py 2006-12-03 08:06:45 UTC (rev
8104)
+++ trunk/mailman/Mailman/Queue/LMTPRunner.py 2006-12-03 12:38:59 UTC (rev
8105)
@@ -77,6 +77,7 @@
def getlistq(address):
localpart, domain = address.split('@', 1)
+ localpart = localpart.split(config.VERP_DELIMITER, 1)[0]
l = localpart.split(DASH)
if l[-1] in subqnames:
listname = DASH.join(l[:-1])
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
