diff options
Diffstat (limited to 'Mailman/Cgi/confirm.py')
| -rw-r--r-- | Mailman/Cgi/confirm.py | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py index f7314a9a6..f3b596e66 100644 --- a/Mailman/Cgi/confirm.py +++ b/Mailman/Cgi/confirm.py @@ -285,14 +285,6 @@ def subscription_confirm(mlist, doc, cookie, cgidata): try: # Some pending values may be overridden in the form. email of # course is hardcoded. ;) -## cgipasswd = cgidata.getvalue('password') -## cgiconfirm = cgidata.getvalue('pwconfirm') -## if cgipasswd <> cgiconfirm: -## setformpasswd = 0 -## pw = None -## else: -## setformpasswd = 1 -## pw = cgipasswd lang = cgidata.getvalue('language') if cgidata.has_key('digests'): try: @@ -302,7 +294,7 @@ def subscription_confirm(mlist, doc, cookie, cgidata): else: digest = None userdesc = UserDesc(fullname=cgidata.getvalue('realname', None), - password=pw, digest=digest, lang=lang) + digest=digest, lang=lang) op, addr, pw, digest, lang = mlist.ProcessConfirmation( cookie, userdesc) except Errors.MMNeedApproval: @@ -329,14 +321,6 @@ def subscription_confirm(mlist, doc, cookie, cgidata): optionsurl = mlist.GetOptionsURL(addr, absolute=1) doc.SetTitle(title) doc.AddItem(Header(3, Bold(FontAttr(title, size='+2')))) - if not setformpasswd: - doc.AddItem(_("""\ - The passwords you entered in the confirmation screen did not - match, so your original subscription password will be used - instead. Your password will have been generated by Mailman if - you left the password fields blank. In any event, your - membership password will be sent to you in a separate - acknowledgement email.<p>""")) doc.AddItem(_('''\ You have successfully confirmed your subscription request for "%(addr)s" to the %(listname)s mailing list. A separate |