comparison roundup/cgi/actions.py @ 2294:f72d2fb8ef78 maint-0.7

merge from HEAD
author Richard Jones <richard@users.sourceforge.net>
date Thu, 13 May 2004 00:26:07 +0000
parents 9b34f41507ed
children c69b67905043
comparison
equal deleted inserted replaced
2292:f58a7d857fef 2294:f72d2fb8ef78
1 #$Id: actions.py,v 1.27 2004-05-06 03:18:03 richard Exp $ 1 #$Id: actions.py,v 1.27.2.1 2004-05-13 00:21:32 richard Exp $
2 2
3 import re, cgi, StringIO, urllib, Cookie, time, random 3 import re, cgi, StringIO, urllib, Cookie, time, random
4 4
5 from roundup import hyperdb, token, date, password, rcsv, exceptions 5 from roundup import hyperdb, token, date, password, rcsv, exceptions
6 from roundup.i18n import _ 6 from roundup.i18n import _
556 556
557 Presence of either "name" or "address" generates email. Presence of 557 Presence of either "name" or "address" generates email. Presence of
558 "otk" performs the reset. 558 "otk" performs the reset.
559 559
560 """ 560 """
561 otks = self.db.getOTKManager()
561 if self.form.has_key('otk'): 562 if self.form.has_key('otk'):
562 # pull the rego information out of the otk database 563 # pull the rego information out of the otk database
563 otk = self.form['otk'].value 564 otk = self.form['otk'].value
564 otks = self.db.getOTKManager()
565 uid = otks.get(otk, 'uid') 565 uid = otks.get(otk, 'uid')
566 if uid is None: 566 if uid is None:
567 self.client.error_message.append("""Invalid One Time Key! 567 self.client.error_message.append("""Invalid One Time Key!
568 (a Mozilla bug may cause this message to show up erroneously, 568 (a Mozilla bug may cause this message to show up erroneously,
569 please check your email)""") 569 please check your email)""")

Roundup Issue Tracker: http://roundup-tracker.org/