cafe-grader-web Commit - r331:4917c2675f37

cafe-grader-web

Commit `r331:4917c2675f37` public

parent | child

Description:

sends mails by mail gem

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r331:4917c2675f37 - Wed, 03 Oct 2012 17:58:32 - 4 files changed: 66 inserted, 47 deleted

Gemfile ¶ +1 -1

               # gem 'debugger'
               gem "haml"
-            - gem "tmail"
+            + gem "mail"
               gem "rdiscount"
               gem "test-unit"
               gem 'will_paginate', '~> 3.0.0'

Gemfile.lock ¶ +1 -2

                   test-unit (2.5.2)
                   thor (0.16.0)
                   tilt (1.3.3)
-            -     tmail (1.2.7.1)
                   treetop (1.4.10)
                     polyglot
                     polyglot (>= 0.3.1)
                 dynamic_form
                 haml
                 in_place_editing
+            +   mail
                 mysql2
                 prototype-rails
                 rails (= 3.2.8)
                 rspec-rails (~> 2.0)
                 sass-rails (~> 3.2.3)
                 test-unit
-            -   tmail
                 uglifier (>= 1.0.3)
                 verification!
                 will_paginate (~> 3.0.0)

app/controllers/user_admin_controller.rb ¶ +32 -20

               class UserAdminController < ApplicationController
-            -   #include MailHelperMethods
                 before_filter :admin_authorization
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                     redirect_to :action => 'mass_mailing' and return
                   end
-            -     subject = params[:subject]
+            +     mail_subject = params[:subject]
-            -     if !subject or subject.blank?
+            +     if !mail_subject or mail_subject.blank?
                     flash[:notice] = 'You entered an empty mail subject.'
                     redirect_to :action => 'mass_mailing' and return
                   end
+            +
+            +     mail_body = params[:email_body]
+            +     if !mail_body or mail_body.blank?
+            +       flash[:notice] = 'You entered an empty mail body.'
+            +       redirect_to :action => 'mass_mailing' and return
+            +     end
-            -     body = params[:email_body]
+            +     admin_email = GraderConfiguration['system.admin_email']
-            -     if !body or body.blank?
-            -       flash[:notice] = 'You entered an empty mail body.'
-            -       redirect_to :action => 'mass_mailing' and return
-            -     end
                   note = []
                   users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
-            -         send_mail(user.email, subject, body)
+            +         Mail.deliver do
+            +           from admin_email
+            +           to user.email
+            +           subject mail_subject
+            +           body mail_body
+            +         end
                       note << user.login
                     end
                   end
                 def send_contest_update_notification_email(user, contest)
                   contest_title_name = GraderConfiguration['contest.name']
                   contest_name = contest.name
-            -     subject = t('contest.notification.email_subject', {
+            +     mail_subject = t('contest.notification.email_subject', {
-            -                   :contest_title_name => contest_title_name,
+            +                        :contest_title_name => contest_title_name,
-            -                   :contest_name => contest_name })
+            +                        :contest_name => contest_name })
-            -     body = t('contest.notification.email_body', {
+            +     mail_body = t('contest.notification.email_body', {
-            -                :full_name => user.full_name,
+            +                     :full_name => user.full_name,
-            -                :contest_title_name => contest_title_name,
+            +                     :contest_title_name => contest_title_name,
-            -                :contest_name => contest.name,
+            +                     :contest_name => contest.name,
-            -              })
+            +                   })
-            -     logger.info body
+            +     admin_email = GraderConfiguration['system.admin_email']
-            -     send_mail(user.email, subject, body)
+            +     logger.info mail_body
+            +     Mail.deliver do
+            +       from admin_email
+            +       to user.email
+            +       subject mail_subject
+            +       body mail_body
+            +     end
                 end
                 def find_contest_and_user_from_contest_id(id)

app/controllers/users_controller.rb ¶ +32 -24

@@ -1,10 +1,7
1	- require 'tmail'
2	require 'net/smtp'	1	require 'net/smtp'
3		2
4	class UsersController < ApplicationController	3	class UsersController < ApplicationController
5		4
6	- #include MailHelperMethods
7	-
8	before_filter :authenticate, :except => [:new,	5	before_filter :authenticate, :except => [:new,
9	:register,	6	:register,
10	:confirm,	7	:confirm,
@@ -124,35 +121,46
124	:login => user.login,	121	:login => user.login,
125	:activation => user.activation_key)	122	:activation => user.activation_key)
126	home_url = url_for(:controller => 'main', :action => 'index')	123	home_url = url_for(:controller => 'main', :action => 'index')
127	- subject = "[#{contest_name}] Confirmation"	124	+ mail_subject = "[#{contest_name}] Confirmation"
128	- body = t('registration.email_body', {	125	+ mail_body = t('registration.email_body', {
129	- :full_name => user.full_name,	126	+ :full_name => user.full_name,
130	- :contest_name => contest_name,	127	+ :contest_name => contest_name,
131	- :login => user.login,	128	+ :login => user.login,
132	- :password => user.password,	129	+ :password => user.password,
133	- :activation_url => activation_url,	130	+ :activation_url => activation_url,
134	- :admin_email => admin_email	131	+ :admin_email => admin_email
135	- })	132	+ })
136		133
137	- logger.info body	134	+ logger.info mail_body
138		135
139	- send_mail(user.email, subject, body)	136	+ Mail.deliver do
		137	+ from admin_email
		138	+ to user.email
		139	+ subject mail_subject
		140	+ body mail_body
		141	+ end
140	end	142	end
141		143
142	def send_new_password_email(user)	144	def send_new_password_email(user)
143	contest_name = GraderConfiguration['contest.name']	145	contest_name = GraderConfiguration['contest.name']
144	admin_email = GraderConfiguration['system.admin_email']	146	admin_email = GraderConfiguration['system.admin_email']
145	- subject = "[#{contest_name}] Password recovery"	147	+ mail_subject = "[#{contest_name}] Password recovery"
146	- body = t('registration.password_retrieval.email_body', {	148	+ mail_body = t('registration.password_retrieval.email_body', {
147	- :full_name => user.full_name,	149	+ :full_name => user.full_name,
148	- :contest_name => contest_name,	150	+ :contest_name => contest_name,
149	- :login => user.login,	151	+ :login => user.login,
150	- :password => user.password,	152	+ :password => user.password,
151	- :admin_email => admin_email	153	+ :admin_email => admin_email
152	- })	154	+ })
153		155
154	- logger.info body	156	+ logger.info mail_body
155	- send_mail(user.email, subject, body)	157	+
		158	+ Mail.deliver do
		159	+ from admin_email
		160	+ to user.email
		161	+ subject mail_subject
		162	+ body mail_body
		163	+ end
156	end	164	end
157		165
158	end	166	end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r331:4917c2675f37 - Wed, 03 Oct 2012 17:58:32 - 4 files changed: 66 inserted, 47 deleted

Sign in to your account

Commit r331:4917c2675f37 public

Author

r331:4917c2675f37 - Wed, 03 Oct 2012 17:58:32 - 4 files changed: 66 inserted, 47 deleted

Commit `r331:4917c2675f37` public