cafe-grader-web

Commit r391:ea41c9c1ace4 public

parent | child
Description:
fix authen by pop3 bug
Commit status:
[Not Reviewed]
References:
algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r391:ea41c9c1ace4 - - 1 file changed: 1 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -56,24 +56,25
56 before_save :assign_default_site
56 before_save :assign_default_site
57 before_save :assign_default_contest
57 before_save :assign_default_contest
58
58
59 # this is for will_paginate
59 # this is for will_paginate
60 cattr_reader :per_page
60 cattr_reader :per_page
61 @@per_page = 50
61 @@per_page = 50
62
62
63 def self.authenticate(login, password)
63 def self.authenticate(login, password)
64 user = find_by_login(login)
64 user = find_by_login(login)
65 return user if user && user.authenticated?(password)
65 return user if user && user.authenticated?(password)
66 if user.authenticated_by_pop3?(password)
66 if user.authenticated_by_pop3?(password)
67 user.password = password
67 user.password = password
68 + return user
68 end
69 end
69 end
70 end
70
71
71 def authenticated?(password)
72 def authenticated?(password)
72 if self.activated
73 if self.activated
73 hashed_password == User.encrypt(password,self.salt)
74 hashed_password == User.encrypt(password,self.salt)
74 else
75 else
75 false
76 false
76 end
77 end
77 end
78 end
78
79
79 def authenticated_by_pop3?(password)
80 def authenticated_by_pop3?(password)
You need to be logged in to leave comments. Login now