cafe-grader-web

Commit r348:fc78be8c614c public

parent | child
Description:
update mail functionality. Update syntax for mail gem (we might need more options for mail setting?)
Commit status:
[Not Reviewed]
References:
default
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

r348:fc78be8c614c - - 2 files changed: 14 inserted, 3 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -36,121 +36,121
36 36 if user.save
37 37 flash[:notice] = 'password changed'
38 38 else
39 39 flash[:notice] = 'Error: password changing failed'
40 40 end
41 41 redirect_to :action => 'index'
42 42 end
43 43
44 44 def new
45 45 @user = User.new
46 46 render :action => 'new', :layout => 'empty'
47 47 end
48 48
49 49 def register
50 50 if(params[:cancel])
51 51 redirect_to :controller => 'main', :action => 'login'
52 52 return
53 53 end
54 54 @user = User.new(params[:user])
55 55 @user.password_confirmation = @user.password = User.random_password
56 56 @user.activated = false
57 57 if (@user.valid?) and (@user.save)
58 58 if send_confirmation_email(@user)
59 59 render :action => 'new_splash', :layout => 'empty'
60 60 else
61 61 @admin_email = GraderConfiguration['system.admin_email']
62 62 render :action => 'email_error', :layout => 'empty'
63 63 end
64 64 else
65 65 @user.errors.add(:base,"Email cannot be blank") if @user.email==''
66 66 render :action => 'new', :layout => 'empty'
67 67 end
68 68 end
69 69
70 70 def confirm
71 71 login = params[:login]
72 72 key = params[:activation]
73 73 @user = User.find_by_login(login)
74 74 if (@user) and (@user.verify_activation_key(key))
75 75 if @user.valid? # check uniquenss of email
76 76 @user.activated = true
77 77 @user.save
78 78 @result = :successful
79 79 else
80 80 @result = :email_used
81 81 end
82 82 else
83 83 @result = :failed
84 84 end
85 85 render :action => 'confirm', :layout => 'empty'
86 86 end
87 87
88 88 def forget
89 89 render :action => 'forget', :layout => 'empty'
90 90 end
91 91
92 92 def retrieve_password
93 93 email = params[:email]
94 94 user = User.find_by_email(email)
95 95 if user
96 96 last_updated_time = user.updated_at || user.created_at || (Time.now.gmtime - 1.hour)
97 97 if last_updated_time > Time.now.gmtime - 5.minutes
98 98 flash[:notice] = 'The account has recently created or new password has recently been requested. Please wait for 5 minutes'
99 99 else
100 100 user.password = user.password_confirmation = User.random_password
101 101 user.save
102 102 send_new_password_email(user)
103 103 flash[:notice] = 'New password has been mailed to you.'
104 104 end
105 105 else
106 106 flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
107 107 end
108 108 redirect_to :action => 'forget'
109 109 end
110 110
111 111 protected
112 112
113 113 def verify_online_registration
114 114 if !GraderConfiguration['system.online_registration']
115 115 redirect_to :controller => 'main', :action => 'login'
116 116 end
117 117 end
118 118
119 119 def send_confirmation_email(user)
120 120 contest_name = GraderConfiguration['contest.name']
121 121 activation_url = url_for(:action => 'confirm',
122 122 :login => user.login,
123 123 :activation => user.activation_key)
124 124 home_url = url_for(:controller => 'main', :action => 'index')
125 125 mail_subject = "[#{contest_name}] Confirmation"
126 126 mail_body = t('registration.email_body', {
127 127 :full_name => user.full_name,
128 128 :contest_name => contest_name,
129 129 :login => user.login,
130 130 :password => user.password,
131 131 :activation_url => activation_url,
132 - :admin_email => admin_email
132 + :admin_email => GraderConfiguration['system.admin_email']
133 133 })
134 134
135 135 logger.info mail_body
136 136
137 137 send_mail(user.email, mail_subject, mail_body)
138 138 end
139 139
140 140 def send_new_password_email(user)
141 141 contest_name = GraderConfiguration['contest.name']
142 142 mail_subject = "[#{contest_name}] Password recovery"
143 143 mail_body = t('registration.password_retrieval.email_body', {
144 144 :full_name => user.full_name,
145 145 :contest_name => contest_name,
146 146 :login => user.login,
147 147 :password => user.password,
148 - :admin_email => admin_email
148 + :admin_email => GraderConfiguration['system.admin_email']
149 149 })
150 150
151 151 logger.info mail_body
152 152
153 153 send_mail(user.email, mail_subject, mail_body)
154 154 end
155 155
156 156 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,30 +1,41
1 1 module MailHelperMethods
2 2
3 3 def send_mail(mail_to, mail_subject, mail_body)
4 4 mail_from = GraderConfiguration['system.online_registration.from']
5 5 smtp_server = GraderConfiguration['system.online_registration.smtp']
6 6
7 7 if ['fake', 'debug'].include? smtp_server
8 8 puts "-------------------------
9 9 To: #{mail_to}
10 10 From: #{mail_from}
11 11 Subject: #{mail_subject}
12 12 #{mail_body}
13 13 --------------------------
14 14 "
15 15 return true
16 16 end
17 17
18 18 mail = Mail.new do
19 19 from mail_from
20 20 to mail_to
21 21 subject mail_subject
22 22 body mail_body
23 23 end
24 24
25 - mail.delivery_settings = { :address => smtp_server }
25 + mail_option = {
26 + :address => smtp_server,
27 + # :domain => nil,
28 + # :port => 25,
29 + # :user_name => nil,
30 + # :password => nil,
31 + # :authentication=>'plain',
32 + # :enable_starttls_auto => true
33 + }
34 +
35 + mail.delivery_method :smtp, mail_option
36 +
26 37 mail.deliver
27 38 end
28 39
29 40 end
30 41
You need to be logged in to leave comments. Login now