diff options
| author | Yasuhito FUTATSUKI <futatuki@poem.co.jp> | 2020-06-01 15:50:14 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI <futatuki@poem.co.jp> | 2020-06-01 15:50:14 +0900 |
| commit | 6a23f43f94e1cbfbbd413d83f713584815938178 (patch) | |
| tree | f0f2fb5fcb4fbb121915eddb949f7536bc22d037 /Mailman/Cgi | |
| parent | e2bfc83935b64208b56194d82d04c61c25f8406d (diff) | |
| parent | bc7fdf4c5fb688ae62e48e614bc285bdcd805ffc (diff) | |
| download | mailman2-6a23f43f94e1cbfbbd413d83f713584815938178.tar.gz mailman2-6a23f43f94e1cbfbbd413d83f713584815938178.tar.xz mailman2-6a23f43f94e1cbfbbd413d83f713584815938178.zip | |
sync with lp:mailman/2.1 (just same)
Diffstat (limited to 'Mailman/Cgi')
| -rw-r--r-- | Mailman/Cgi/options.py | 5 | ||||
| -rw-r--r-- | Mailman/Cgi/private.py | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index 641ec134..1037f8f9 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -173,7 +173,7 @@ def main(): try: Utils.ValidateEmail(user) except Errors.EmailAddressError: - doc.addError(_('Illegal Email Address: %(safeuser)s')) + doc.addError(_('Illegal Email Address')) loginpage(mlist, doc, None, language) print doc.Format() return @@ -206,6 +206,7 @@ def main(): # Are we processing an unsubscription request from the login screen? msgc = _('If you are a list member, a confirmation email has been sent.') + msgb = _('You already have a subscription pending confirmation') msga = _("""If you are a list member, your unsubscription request has been forwarded to the list administrator for approval.""") if cgidata.has_key('login-unsub'): @@ -228,6 +229,8 @@ def main(): mlist.ConfirmUnsubscription(user, userlang, remote=ip) doc.addError(msgc, tag='') mlist.Save() + except Errors.MMAlreadyPending: + doc.addError(msgb) finally: mlist.Unlock() else: diff --git a/Mailman/Cgi/private.py b/Mailman/Cgi/private.py index 731e2d19..4b6f2501 100644 --- a/Mailman/Cgi/private.py +++ b/Mailman/Cgi/private.py @@ -162,13 +162,9 @@ def main(): if mlist.isMember(username): mlist.MailUserPassword(username) elif username: - # Not a member - if mlist.private_roster == 0: - # Public rosters - safeuser = Utils.websafe(username) - message = Bold(FontSize('+1', - _('No such member: %(safeuser)s.'))).Format() - else: + # Not a member. Don't report address in any case. It leads to + # Content injection. Just log if roster is not public. + if mlist.private_roster != 0: syslog('mischief', 'Reminder attempt of non-member w/ private rosters: %s', username) |