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 'capistrano'
               # To use debugger
               # gem 'debugger'
               gem "haml"
-            - gem "tmail"
+            + gem "mail"
               gem "rdiscount"
               gem "test-unit"
               gem 'will_paginate', '~> 3.0.0'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'git://github.com/sikachu/verification.git'

Gemfile.lock ¶ +1 -2

                     hike (~> 1.2)
                     rack (~> 1.0)
                     tilt (~> 1.1, != 1.3.0)
                   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)
                   tzinfo (0.3.33)
                   uglifier (1.3.0)
                     execjs (>= 0.3.0)
               DEPENDENCIES
                 coffee-rails (~> 3.2.1)
                 dynamic_form
                 haml
                 in_place_editing
+            +   mail
                 mysql2
                 prototype-rails
                 rails (= 3.2.8)
                 rdiscount
                 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)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :create_from_list,
                                                     :update,
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'mass_mailing' and return
                   end
-            -     subject = params[:subject]
-            -     if !subject or subject.blank?
+            +     mail_subject = params[:subject]
+            +     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]
-            -     if !body or body.blank?
-            -       flash[:notice] = 'You entered an empty mail body.'
-            -       redirect_to :action => 'mass_mailing' and return
-            -     end
+            +     admin_email = GraderConfiguration['system.admin_email']
                   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
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   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', {
-            -                   :contest_title_name => contest_title_name,
-            -                   :contest_name => contest_name })
-            -     body = t('contest.notification.email_body', {
-            -                :full_name => user.full_name,
-            -                :contest_title_name => contest_title_name,
-            -                :contest_name => contest.name,
-            -              })
+            +     mail_subject = t('contest.notification.email_subject', {
+            +                        :contest_title_name => contest_title_name,
+            +                        :contest_name => contest_name })
+            +     mail_body = t('contest.notification.email_body', {
+            +                     :full_name => user.full_name,
+            +                     :contest_title_name => contest_title_name,
+            +                     :contest_name => contest.name,
+            +                   })
-            -     logger.info body
-            -     send_mail(user.email, subject, body)
+            +     admin_email = GraderConfiguration['system.admin_email']
+            +
+            +     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)
                   if id!='none'
                     @contest = Contest.find(id)
                   else

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

-            - require 'tmail'
-              require 'net/smtp'
               class UsersController < ApplicationController
-            -   #include MailHelperMethods
+            -
                 before_filter :authenticate, :except => [:new,
                                                          :register,
                                                          :confirm,
                                                          :forget,
                                                          :retrieve_password]
                   contest_name = GraderConfiguration['contest.name']
                   admin_email = GraderConfiguration['system.admin_email']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                                            :activation => user.activation_key)
                   home_url = url_for(:controller => 'main', :action => 'index')
-            -     subject = "[#{contest_name}] Confirmation"
-            -     body = t('registration.email_body', {
-            -                :full_name => user.full_name,
-            -                :contest_name => contest_name,
-            -                :login => user.login,
-            -                :password => user.password,
-            -                :activation_url => activation_url,
-            -                :admin_email => admin_email
-            -              })
+            +     mail_subject = "[#{contest_name}] Confirmation"
+            +     mail_body = t('registration.email_body', {
+            +                     :full_name => user.full_name,
+            +                     :contest_name => contest_name,
+            +                     :login => user.login,
+            +                     :password => user.password,
+            +                     :activation_url => activation_url,
+            +                     :admin_email => admin_email
+            +                   })
-            -     logger.info body
+            +     logger.info mail_body
-            -     send_mail(user.email, subject, body)
+            +     Mail.deliver do
+            +       from admin_email
+            +       to user.email
+            +       subject mail_subject
+            +       body mail_body
+            +     end
                 end
                 def send_new_password_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   admin_email = GraderConfiguration['system.admin_email']
-            -     subject = "[#{contest_name}] Password recovery"
-            -     body = t('registration.password_retrieval.email_body', {
-            -                :full_name => user.full_name,
-            -                :contest_name => contest_name,
-            -                :login => user.login,
-            -                :password => user.password,
-            -                :admin_email => admin_email
-            -              })
+            +     mail_subject = "[#{contest_name}] Password recovery"
+            +     mail_body = t('registration.password_retrieval.email_body', {
+            +                     :full_name => user.full_name,
+            +                     :contest_name => contest_name,
+            +                     :login => user.login,
+            +                     :password => user.password,
+            +                     :admin_email => admin_email
+            +                   })
-            -     logger.info body
-            -     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
               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