Mercurial > p > roundup > code
comparison roundup/cgi/actions.py @ 2658:d3a8613fd8c3 maint-0.7
merge from HEAD
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Sat, 07 Aug 2004 22:19:14 +0000 |
| parents | 9e1c4c932323 |
| children | ace85b609a89 |
comparison
equal
deleted
inserted
replaced
| 2656:b386e8811932 | 2658:d3a8613fd8c3 |
|---|---|
| 1 #$Id: actions.py,v 1.27.2.4 2004-07-20 02:10:43 richard Exp $ | 1 #$Id: actions.py,v 1.27.2.5 2004-08-07 22:19:14 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 _ |
| 799 # make sure the user exists | 799 # make sure the user exists |
| 800 try: | 800 try: |
| 801 self.client.userid = self.db.user.lookup(self.client.user) | 801 self.client.userid = self.db.user.lookup(self.client.user) |
| 802 except KeyError: | 802 except KeyError: |
| 803 name = self.client.user | 803 name = self.client.user |
| 804 self.client.error_message.append(_('No such user "%(name)s"')%locals()) | 804 self.client.error_message.append(_('Ivalid login')) |
| 805 self.client.make_user_anonymous() | 805 self.client.make_user_anonymous() |
| 806 return | 806 return |
| 807 | 807 |
| 808 # verify the password | 808 # verify the password |
| 809 if not self.verifyPassword(self.client.userid, password): | 809 if not self.verifyPassword(self.client.userid, password): |
| 810 self.client.make_user_anonymous() | 810 self.client.make_user_anonymous() |
| 811 self.client.error_message.append(_('Incorrect password')) | 811 self.client.error_message.append(_('Invalid login')) |
| 812 return | 812 return |
| 813 | 813 |
| 814 # Determine whether the user has permission to log in. | 814 # Determine whether the user has permission to log in. |
| 815 # Base behaviour is to check the user has "Web Access". | 815 # Base behaviour is to check the user has "Web Access". |
| 816 if not self.hasPermission("Web Access"): | 816 if not self.hasPermission("Web Access"): |