github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Do not return mail password in EmailController

Browse Source
This commit is contained in:
Chris Hunt
2013-06-11 16:00:13 -07:00
parent acb2126220
commit a362d62b42
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/controllers/admin/email_controller.rb
View File

@ -3,18 +3,10 @@ require_dependency 'email/renderer'
class Admin::EmailController < Admin::AdminController
def index
# For now, just show the ActionMailer settings
mail_settings = { delivery_method: ActionMailer::Base.delivery_method }
mail_settings[:settings] = case mail_settings[:delivery_method]
when :smtp
ActionMailer::Base.smtp_settings.map {|k, v| {name: k, value: v}}
when :sendmail
ActionMailer::Base.sendmail_settings.map {|k, v| {name: k, value: v}}
end
render_json_dump(mail_settings)
render_json_dump({
delivery_method: delivery_method,
settings: delivery_settings
})
end
def test
@ -34,4 +26,19 @@ class Admin::EmailController < Admin::AdminController
render json: MultiJson.dump(html_content: renderer.html, text_content: renderer.text)
end
private
def delivery_settings
action_mailer_settings
.reject { |k, v| k == :password }
.map { |k, v| { name: k, value: v }}
end
def delivery_method
ActionMailer::Base.delivery_method
end
def action_mailer_settings
ActionMailer::Base.public_send "#{delivery_method}_settings"
end
end