diff options
| author | Mark Sapiro <mark@msapiro.net> | 2008-03-06 12:34:12 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2008-03-06 12:34:12 -0800 |
| commit | 7858eb837982174b11aec648f3ba4ca0f1ab6c6a (patch) | |
| tree | 783c50bfa2b4302bfc9625274b8cf2a62b915586 /Mailman/Handlers | |
| parent | dd3ada936da9f0f24f41f113902d35b20e895086 (diff) | |
| download | mailman2-7858eb837982174b11aec648f3ba4ca0f1ab6c6a.tar.gz mailman2-7858eb837982174b11aec648f3ba4ca0f1ab6c6a.tar.xz mailman2-7858eb837982174b11aec648f3ba4ca0f1ab6c6a.zip | |
CookHeaders.py - Changed the first URL in the RFC 2369 List-Unsubscribe:
header to go to the options login page instead of the
listinfo page.
options.py - Changed to only issue the "No address given" error if coming
from the page itself so we don't get the error when linking
from another page or the List-Unsubscribe: header.
- Changed to remember the user's language selection when
redisplaying the page after an error.
Diffstat (limited to 'Mailman/Handlers')
| -rw-r--r-- | Mailman/Handlers/CookHeaders.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py index ea51abf1..671922ab 100644 --- a/Mailman/Handlers/CookHeaders.py +++ b/Mailman/Handlers/CookHeaders.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2005 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 @@ -199,13 +199,14 @@ def process(mlist, msg, msgdata): requestaddr = mlist.GetRequestEmail() subfieldfmt = '<%s>, <mailto:%s?subject=%ssubscribe>' listinfo = mlist.GetScriptURL('listinfo', absolute=1) + useropts = mlist.GetScriptURL('options', absolute=1) headers = {} if msgdata.get('reduced_list_headers'): headers['X-List-Administrivia'] = 'yes' else: headers.update({ 'List-Help' : '<mailto:%s?subject=help>' % requestaddr, - 'List-Unsubscribe': subfieldfmt % (listinfo, requestaddr, 'un'), + 'List-Unsubscribe': subfieldfmt % (useropts, requestaddr, 'un'), 'List-Subscribe' : subfieldfmt % (listinfo, requestaddr, ''), }) # List-Post: is controlled by a separate attribute |