From 60704c27beb4b32068359c2dcf3b2e53f98318dc Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 6 Sep 2011 18:24:46 -0400 Subject: [PATCH] added from addr for user maint emails --- app/mailers/maintenance/user/login_reminder_mailer.rb | 2 +- app/mailers/maintenance/user/password_reset_mailer.rb | 4 ++-- app/models/user_maintenance_mailer.rb | 10 ---------- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 app/models/user_maintenance_mailer.rb diff --git a/app/mailers/maintenance/user/login_reminder_mailer.rb b/app/mailers/maintenance/user/login_reminder_mailer.rb index 76beac06e..e8556d92b 100644 --- a/app/mailers/maintenance/user/login_reminder_mailer.rb +++ b/app/mailers/maintenance/user/login_reminder_mailer.rb @@ -3,7 +3,7 @@ module Maintenance class LoginReminderMailer < ActionMailer::Base def notice(user) @user = user - mail(:to => user.email, :subject => "#{Danbooru.config.app_name} login reminder") + mail(:to => user.email, :subject => "#{Danbooru.config.app_name} login reminder", :from => Danbooru.config.contact_email) end end end diff --git a/app/mailers/maintenance/user/password_reset_mailer.rb b/app/mailers/maintenance/user/password_reset_mailer.rb index 1e2964e2c..8ad1f6d0a 100644 --- a/app/mailers/maintenance/user/password_reset_mailer.rb +++ b/app/mailers/maintenance/user/password_reset_mailer.rb @@ -4,13 +4,13 @@ module Maintenance def reset_request(user, nonce) @user = user @nonce = nonce - mail(:to => @user.email, :subject => "#{Danbooru.config.app_name} password reset request") + mail(:to => @user.email, :subject => "#{Danbooru.config.app_name} password reset request", :from => Danbooru.config.contact_email) end def confirmation(user, new_password) @user = user @new_password = new_password - mail(:to => @user.email, :subject => "#{Danbooru.config.app_name} password reset confirmation") + mail(:to => @user.email, :subject => "#{Danbooru.config.app_name} password reset confirmation", :from => Danbooru.config.contact_email) end end end diff --git a/app/models/user_maintenance_mailer.rb b/app/models/user_maintenance_mailer.rb deleted file mode 100644 index 5882caab9..000000000 --- a/app/models/user_maintenance_mailer.rb +++ /dev/null @@ -1,10 +0,0 @@ -class UserMaintenanceMailer < ActionMailer::Base - default :from => Danbooru.config.contact_email - - - def reset_password(user, new_password) - @user = user - @new_password = new_password - mail(:to => user.email, :subject => "#{Danbooru.config.app_name} password reset") - end -end