cafe-grader-web

Commit r395:52cd3037bb5e public

parent | child
Description:
fix pop3 authen
Commit status:
[Not Reviewed]
References:
algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Show 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

r395:52cd3037bb5e - - 1 file changed: 2 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -18,98 +18,99
18 18 :order => 'created_at DESC'
19 19
20 20 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
21 21
22 22 belongs_to :site
23 23 belongs_to :country
24 24
25 25 has_and_belongs_to_many :contests, :uniq => true, :order => 'name'
26 26
27 27 scope :activated_users, :conditions => {:activated => true}
28 28
29 29 validates_presence_of :login
30 30 validates_uniqueness_of :login
31 31 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
32 32 validates_length_of :login, :within => 3..30
33 33
34 34 validates_presence_of :full_name
35 35 validates_length_of :full_name, :minimum => 1
36 36
37 37 validates_presence_of :password, :if => :password_required?
38 38 validates_length_of :password, :within => 4..20, :if => :password_required?
39 39 validates_confirmation_of :password, :if => :password_required?
40 40
41 41 validates_format_of :email,
42 42 :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
43 43 :if => :email_validation?
44 44 validate :uniqueness_of_email_from_activated_users,
45 45 :if => :email_validation?
46 46 validate :enough_time_interval_between_same_email_registrations,
47 47 :if => :email_validation?
48 48
49 49 # these are for ytopc
50 50 # disable for now
51 51 #validates_presence_of :province
52 52
53 53 attr_accessor :password
54 54
55 55 before_save :encrypt_new_password
56 56 before_save :assign_default_site
57 57 before_save :assign_default_contest
58 58
59 59 # this is for will_paginate
60 60 cattr_reader :per_page
61 61 @@per_page = 50
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 - if user.authenticated_by_pop3?(password)
66 + if user && user.authenticated_by_pop3?(password)
67 67 user.password = password
68 + user.save
68 69 return user
69 70 end
70 71 end
71 72
72 73 def authenticated?(password)
73 74 if self.activated
74 75 hashed_password == User.encrypt(password,self.salt)
75 76 else
76 77 false
77 78 end
78 79 end
79 80
80 81 def authenticated_by_pop3?(password)
81 82 Net::POP3.enable_ssl
82 83 pop = Net::POP3.new('pops.it.chula.ac.th')
83 84 authen = true
84 85 begin
85 86 pop.start(login, password) # (1)
86 87 pop.finish
87 88 return true
88 89 rescue
89 90 return false
90 91 end
91 92 end
92 93
93 94 def admin?
94 95 self.roles.detect {|r| r.name == 'admin' }
95 96 end
96 97
97 98 def email_for_editing
98 99 if self.email==nil
99 100 "(unknown)"
100 101 elsif self.email==''
101 102 "(blank)"
102 103 else
103 104 self.email
104 105 end
105 106 end
106 107
107 108 def email_for_editing=(e)
108 109 self.email=e
109 110 end
110 111
111 112 def alias_for_editing
112 113 if self.alias==nil
113 114 "(unknown)"
114 115 elsif self.alias==''
115 116 "(blank)"
You need to be logged in to leave comments. Login now