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

               source 'https://rubygems.org'
               gem 'rails', '3.2.8'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               gem 'mysql2'
               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do
                 gem 'sass-rails',   '~> 3.2.3'
                 gem 'coffee-rails', '~> 3.2.1'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
                 gem 'uglifier', '>= 1.0.3'
               end
               gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               # gem 'bcrypt-ruby', '~> 3.0.0'
               # To use Jbuilder templates for JSON
               # gem 'jbuilder'
               # Use unicorn as the app server
               # gem 'unicorn'
               # Deploy with Capistrano
               # 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'
               group :test, :development do
                 gem "rspec-rails", "~> 2.0"
               end

Gemfile.lock ¶ +1 -2

                     sprockets (~> 2.1.3)
                   activemodel (3.2.8)
                     activesupport (= 3.2.8)
                     builder (~> 3.0.0)
                   activerecord (3.2.8)
                     activemodel (= 3.2.8)
                     activesupport (= 3.2.8)
                     arel (~> 3.0.2)
                     tzinfo (~> 0.3.29)
                   activeresource (3.2.8)
                     activemodel (= 3.2.8)
                     activesupport (= 3.2.8)
                   activesupport (3.2.8)
                     i18n (~> 0.6)
                     multi_json (~> 1.0)
                   arel (3.0.2)
                   builder (3.0.3)
                   coffee-rails (3.2.2)
                     coffee-script (>= 2.2.0)
                     railties (~> 3.2.0)
                   coffee-script (2.2.0)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.3.3)
                   diff-lcs (1.1.3)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (1.4.0)
                     multi_json (~> 1.0)
                   haml (3.1.7)
                   hike (1.2.1)
                   i18n (0.6.1)
                   in_place_editing (1.2.0)
                   journey (1.0.4)
                   json (1.7.5)
                   mail (2.4.4)
                     i18n (>= 0.4.0)
                     mime-types (~> 1.16)
                     treetop (~> 1.4.8)
                   mime-types (1.19)
                   multi_json (1.3.6)
                   mysql2 (0.3.11)
                   polyglot (0.3.3)
                   prototype-rails (3.2.1)
                     rails (~> 3.2)
                   rack (1.4.1)
                   rack-cache (1.2)
                     rack (>= 0.4)
                   rack-ssl (1.3.2)
                     rack
                   rack-test (0.6.2)
                     rack (>= 1.0)
                   rails (3.2.8)
                     actionmailer (= 3.2.8)
                     actionpack (= 3.2.8)
                     activerecord (= 3.2.8)
                     activeresource (= 3.2.8)
                     activesupport (= 3.2.8)
                     bundler (~> 1.0)
                     railties (= 3.2.8)
                   railties (3.2.8)
                     actionpack (= 3.2.8)
                     activesupport (= 3.2.8)
                     rack-ssl (~> 1.3.2)
                     rake (>= 0.8.7)
                     rdoc (~> 3.4)
                     thor (>= 0.14.6, < 2.0)
                   rake (0.9.2.2)
                   rdiscount (1.6.8)
                   rdoc (3.12)
                     json (~> 1.4)
                   rspec (2.11.0)
                     rspec-core (~> 2.11.0)
                     rspec-expectations (~> 2.11.0)
                     rspec-mocks (~> 2.11.0)
                   rspec-core (2.11.1)
                   rspec-expectations (2.11.3)
                     diff-lcs (~> 1.1.3)
                   rspec-mocks (2.11.3)
                   rspec-rails (2.11.0)
                     actionpack (>= 3.0)
                     activesupport (>= 3.0)
                     railties (>= 3.0)
                     rspec (~> 2.11.0)
                   sass (3.2.1)
                   sass-rails (3.2.5)
                     railties (~> 3.2.0)
                     sass (>= 3.1.10)
                     tilt (~> 1.3)
                   sprockets (2.1.3)
                     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)
                     multi_json (~> 1.0, >= 1.0.2)
                   will_paginate (3.0.3)
               PLATFORMS
                 ruby
               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,
                                                     :manage_contest,
                                                     :bulk_mail
                                                   ],
                        :redirect_to => { :action => :list }
                 def index
                   list
                   render :action => 'list'
                 end
                 def list
                   @user_count = User.count
                   if params[:page] == 'all'
                     @users = User.all
                     @paginated = false
                   else
                     @users = User.paginate :page => params[:page]
                     @paginated = true
                   end
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end
                 def active
                   sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(params[:user])
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   lines.split("\n").each do |line|
                     items = line.chomp.split(',')
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
                       added_random_password = false
                       if items.length>=3
                         password = items[2].chomp(" ")
                         user_alias = (items.length>=4) ? items[3] : login
                       else
                         password = random_password
                         user_alias = (items.length>=4) ? items[3] : login
                         added_random_password = true
                       end
                       user = User.new({:login => login,
                                         :full_name => full_name,
                                         :password => password,
                                         :password_confirmation => password,
                                         :alias => user_alias})
                       user.activated = true
                       user.save
                       if added_random_password
                         note << "'#{login}' (+)"
                       else
                         note << login
                       end
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully created.  ' +
                   if not ['add','remove','assign'].include? operation
                     flash[:notice] = 'You did not choose the operation to perform.'
                     redirect_to :action => 'contest_management' and return
                   end
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'contest_management' and return
                   end
                   note = []
                   users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
                       if operation=='add'
                         if ! user.contests.include? contest
                           user.contests << contest
                         end
                       elsif operation=='remove'
                         user.contests.delete(contest)
                       else
                         user.contests = [contest]
                       end
                       if params[:reset_timer]
                         user.contest_stat.forced_logout = true
                         user.contest_stat.reset_timer_and_save
                       end
                       if params[:notification_emails]
                         send_contest_update_notification_email(user, contest)
                       end
                       note << user.login
                       users << user
                     end
                   end
                   if params[:reset_timer]
                     logout_users(users)
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
                 # admin management
                 def admin
                   @admins = User.find(:all).find_all {|user| user.admin? }
                 end
                 def grant_admin
                   login = params[:login]
                   user = User.find_by_login(login)
                   if user!=nil
                     admin_role = Role.find_by_name('admin')
                     user.roles << admin_role
                   else
                     flash[:notice] = 'Unknown user'
                   end
                   flash[:notice] = 'User added as admins'
                   redirect_to :action => 'admin'
                 end
                 def revoke_admin
                   user = User.find(params[:id])
                   if user==nil
                     flash[:notice] = 'Unknown user'
                     redirect_to :action => 'admin' and return
                   elsif user.login == 'root'
                     flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
                     redirect_to :action => 'admin' and return
                   end
                   admin_role = Role.find_by_name('admin')
                   user.roles.delete(admin_role)
                   flash[:notice] = 'User permission revoked'
                   redirect_to :action => 'admin'
                 end
                 # mass mailing
                 def mass_mailing
                 end
                 def bulk_mail
                   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]
+            +     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
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'mass_mailing'
                 end
                 protected
                 def random_password(length=5)
                   chars = 'abcdefghijkmnopqrstuvwxyz23456789'
                   newpass = ""
                   length.times { newpass << chars[rand(chars.size-1)] }
                   return newpass
                 end
                 def import_from_file(f)
                   data_hash = YAML.load(f)
                   @import_log = ""
                   country_data = data_hash[:countries]
                   site_data = data_hash[:sites]
                   user_data = data_hash[:users]
                   # import country
                   countries = {}
                   country_data.each_pair do |id,country|
                     c = Country.find_by_name(country[:name])
                     if c!=nil
                       countries[id] = c
                       @import_log << "Found #{country[:name]}\n"
                     else
                       countries[id] = Country.new(:name => country[:name])
                       countries[id].save
                       @import_log << "Created #{country[:name]}\n"
                     end
                   end
                   # import sites
                   sites = {}
                   site_data.each_pair do |id,site|
                     s = Site.find_by_name(site[:name])
                     if s!=nil
                       @import_log << "Found #{site[:name]}\n"
                     else
                       s = Site.new(:name => site[:name])
                       @import_log << "Created #{site[:name]}\n"
                     end
                     s.password = site[:password]
                     s.country = countries[site[:country_id]]
                     s.save
                     sites[id] = s
                   end
                   # import users
                   user_data.each_pair do |id,user|
                     u = User.find_by_login(user[:login])
                     if u!=nil
                       @import_log << "Found #{user[:login]}\n"
                     else
                       u = User.new(:login => user[:login])
                       @import_log << "Created #{user[:login]}\n"
                     end
                     u.full_name = user[:name]
                     u.password = user[:password]
                     u.country = countries[user[:country_id]]
                     u.site = sites[user[:site_id]]
                     u.activated = true
                     u.email = "empty-#{u.login}@none.com"
                     if not u.save
                       @import_log << "Errors\n"
                       u.errors.each { |attr,msg|  @import_log << "#{attr} - #{msg}\n" }
                     end
                   end
                 end
                 def logout_users(users)
                   users.each do |user|
                     contest_stat = user.contest_stat(true)
                     if contest_stat and !contest_stat.forced_logout
                       contest_stat.forced_logout = true
                       contest_stat.save
                     end
                   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)
                   if id!='none'
                     @contest = Contest.find(id)
                   else
                     @contest = nil
                   end
                   if @contest
                     @users = @contest.users
                   else
                     @users = User.find_users_with_no_contest
                   end
                   return [@contest, @users]
                 end
               end

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]
                 before_filter :verify_online_registration, :only => [:new,
                                                                      :register,
                                                                      :forget,
                                                                      :retrieve_password]
                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                 #in_place_edit_for :user, :alias_for_editing
                 #in_place_edit_for :user, :email_for_editing
                 def index
                   if !GraderConfiguration['system.user_setting_enabled']
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @user = User.find(session[:user_id])
                   end
                 end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
                 def new
                   @user = User.new
                   render :action => 'new', :layout => 'empty'
                 end
                 def register
                   if(params[:cancel])
                     redirect_to :controller => 'main', :action => 'login'
                     return
                   end
                   @user = User.new(params[:user])
                   @user.password_confirmation = @user.password = User.random_password
                   @user.activated = false
                   if (@user.valid?) and (@user.save)
                     if send_confirmation_email(@user)
                       render :action => 'new_splash', :layout => 'empty'
                     else
                       @admin_email = GraderConfiguration['system.admin_email']
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add_to_base("Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                 end
                 def confirm
                   login = params[:login]
                   key = params[:activation]
                   @user = User.find_by_login(login)
                   if (@user) and (@user.verify_activation_key(key))
                     if @user.valid?  # check uniquenss of email
                       @user.activated = true
                       @user.save
                       @result = :successful
                     else
                       @result = :email_used
                     end
                   else
                     @result = :failed
                   end
                   render :action => 'confirm', :layout => 'empty'
                 end
                 def forget
                   render :action => 'forget', :layout => 'empty'
                 end
                 def retrieve_password
                   email = params[:email]
                   user = User.find_by_email(email)
                   if user
                     last_updated_time = user.updated_at || user.created_at || (Time.now.gmtime - 1.hour)
                     if last_updated_time > Time.now.gmtime - 5.minutes
                       flash[:notice] = 'The account has recently created or new password has recently been requested.  Please wait for 5 minutes'
                     else
                       user.password = user.password_confirmation = User.random_password
                       user.save
                       send_new_password_email(user)
                       flash[:notice] = 'New password has been mailed to you.'
                     end
                   else
                     flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
                   end
                   redirect_to :action => 'forget'
                 end
                 protected
                 def verify_online_registration
                   if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
                   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"
+            +     mail_subject = "[#{contest_name}] Confirmation"
-            -     body = t('registration.email_body', {
+            +     mail_body = t('registration.email_body', {
-            -                :full_name => user.full_name,
+            +                     :full_name => user.full_name,
-            -                :contest_name => contest_name,
+            +                     :contest_name => contest_name,
-            -                :login => user.login,
+            +                     :login => user.login,
-            -                :password => user.password,
+            +                     :password => user.password,
-            -                :activation_url => activation_url,
+            +                     :activation_url => activation_url,
-            -                :admin_email => admin_email
+            +                     :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"
+            +     mail_subject = "[#{contest_name}] Password recovery"
-            -     body = t('registration.password_retrieval.email_body', {
+            +     mail_body = t('registration.password_retrieval.email_body', {
-            -                :full_name => user.full_name,
+            +                     :full_name => user.full_name,
-            -                :contest_name => contest_name,
+            +                     :contest_name => contest_name,
-            -                :login => user.login,
+            +                     :login => user.login,
-            -                :password => user.password,
+            +                     :password => user.password,
-            -                :admin_email => admin_email
+            +                     :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
               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