added from addr for user maint emails
This commit is contained in:
@@ -3,7 +3,7 @@ module Maintenance
|
|||||||
class LoginReminderMailer < ActionMailer::Base
|
class LoginReminderMailer < ActionMailer::Base
|
||||||
def notice(user)
|
def notice(user)
|
||||||
@user = 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
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ module Maintenance
|
|||||||
def reset_request(user, nonce)
|
def reset_request(user, nonce)
|
||||||
@user = user
|
@user = user
|
||||||
@nonce = nonce
|
@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
|
end
|
||||||
|
|
||||||
def confirmation(user, new_password)
|
def confirmation(user, new_password)
|
||||||
@user = user
|
@user = user
|
||||||
@new_password = new_password
|
@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
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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
|
|
||||||
Reference in New Issue
Block a user