diff options
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Cgi/admin.py | 5 | ||||
| -rw-r--r-- | Mailman/Cgi/handle_opts.py | 6 | ||||
| -rw-r--r-- | Mailman/Cgi/options.py | 11 |
3 files changed, 12 insertions, 10 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index 6f549c4f1..fe27c68b5 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -546,8 +546,9 @@ def FormatMembershipOptions(lst): all.sort() footer = "<p>" for member in all: - mtext = '<a href="%s">%s</a>' % (lst.GetAbsoluteOptionsURL(member), - member) + mtext = '<a href="%s">%s</a>' % ( + lst.GetAbsoluteOptionsURL(member, obscured=1), + lst.GetUserSubscribedAddress(member)) cells = [mtext + "<input type=hidden name=user value=%s>" % (member), Center(CheckBox(member + "_subscribed", "on", 1).Format())] for opt in ("hide", "nomail", "ack", "notmetoo"): diff --git a/Mailman/Cgi/handle_opts.py b/Mailman/Cgi/handle_opts.py index 4ef585ed9..8e6a50774 100644 --- a/Mailman/Cgi/handle_opts.py +++ b/Mailman/Cgi/handle_opts.py @@ -120,9 +120,9 @@ def main(): PrintResults("A reminder of your password " "has been emailed to you.<p>") except Errors.MMBadUserError: - PrintResults("Your password entry has not been found. The" - " list administrator is being notified.<p>") - + PrintResults("The password entry for `%s' has not " + 'been found. The list administrator is being ' + 'notified.<p>' % user) elif form.has_key("othersubs"): if not form.has_key('othersubspw'): diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index 56a680bb7..ace858b6d 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -75,12 +75,13 @@ def main(): print doc.Format() sys.exit(0) # find the case preserved email address (the one the user subscribed with) - cpuser = mlist.members.get(mlist.FindUser(user)) - # Re-obscure the user's address for the page banner if obscure_addresses - # set. + lcuser = mlist.FindUser(user) + cpuser = mlist.GetUserSubscribedAddress(lcuser) + if lcuser == cpuser: + cpuser = None if mlist.obscure_addresses: presentable_user = Utils.ObscureEmail(user, for_text=1) - if type(cpuser) == StringType: + if cpuser is not None: cpuser = Utils.ObscureEmail(cpuser, for_text=1) else: presentable_user = user @@ -136,7 +137,7 @@ def main(): ' To Me')) replacements['<mm-umbrella-notice>'] = ( mlist.FormatUmbrellaNotice(user, "password")) - if type(cpuser) == StringType: + if cpuser is not None: replacements['<mm-case-preserved-user>'] = ''' You are subscribed to this list with the case-preserved address <em>%s</em>.''' % cpuser |