summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2001-07-19 01:45:24 +0000
committerbwarsaw2001-07-19 01:45:24 +0000
commit429107ec0b6c5f3d7f379de3dfeeba1031652fc5 (patch)
tree4ccb5698a1562088e5d2fb2d354a827f0c83c353
parent5e4dcec7406cd091fdd94e0d2d105c6be76a8b6b (diff)
downloadmailman-429107ec0b6c5f3d7f379de3dfeeba1031652fc5.tar.gz
mailman-429107ec0b6c5f3d7f379de3dfeeba1031652fc5.tar.zst
mailman-429107ec0b6c5f3d7f379de3dfeeba1031652fc5.zip
main(): Extract the cgi data using keep_blank_values=1 so we'll know
when the admin is trying to login with an empty password field. When WebAuthenticate() fails, check the `adminpw' cgi key to determine whether this was a login attempt, or the first visit of this link. show_requests(): SUBSCRIPTION pending records now include the supplied user real name (i.e. fullname), so use this when unpacking the tuple.
Diffstat (limited to '')
-rw-r--r--Mailman/Cgi/admindb.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py
index 68a2dbab7..fb0d9a446 100644
--- a/Mailman/Cgi/admindb.py
+++ b/Mailman/Cgi/admindb.py
@@ -65,13 +65,13 @@ def main():
i18n.set_language(mlist.preferred_language)
# Make sure the user is authorized to see this page.
- cgidata = cgi.FieldStorage()
+ cgidata = cgi.FieldStorage(keep_blank_values=1)
if not mlist.WebAuthenticate((mm_cfg.AuthListAdmin,
mm_cfg.AuthListModerator,
mm_cfg.AuthSiteAdmin),
cgidata.getvalue('adminpw', '')):
- if cgidata.has_key('admlogin'):
+ if cgidata.has_key('adminpw'):
# This is a re-authorization attempt
msg = Bold(FontSize('+1', _('Authorization failed.'))).Format()
else:
@@ -175,8 +175,8 @@ def show_requests(mlist, doc):
Center(Bold(_('Reason for refusal')))
])
for id in subpendings:
- time, addr, passwd, digest, lang = mlist.GetRecord(id)
- table.AddRow([addr,
+ time, addr, fullname, passwd, digest, lang = mlist.GetRecord(id)
+ table.AddRow(['%s<br><em>%s</em>' % (addr, fullname),
RadioButtonArray(id, (_('Defer'),
_('Approve'),
_('Reject'),