Description:
fix authen by pop3 bug
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r391:ea41c9c1ace4 - - 1 file changed: 1 inserted, 0 deleted
@@ -62,12 +62,13 | |||
|
62 | 62 | |
|
63 | 63 | def self.authenticate(login, password) |
|
64 | 64 | user = find_by_login(login) |
|
65 | 65 | return user if user && user.authenticated?(password) |
|
66 | 66 | if user.authenticated_by_pop3?(password) |
|
67 | 67 | user.password = password |
|
68 | + return user | |
|
68 | 69 | end |
|
69 | 70 | end |
|
70 | 71 | |
|
71 | 72 | def authenticated?(password) |
|
72 | 73 | if self.activated |
|
73 | 74 | hashed_password == User.encrypt(password,self.salt) |
You need to be logged in to leave comments.
Login now