diff options
author | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-11 00:06:46 +0300 |
---|---|---|
committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2022-07-16 05:22:51 +0300 |
commit | 6cea355636b7fd8a4d1570807f77762eaccb23e0 (patch) | |
tree | ab5709408588d1802c1e89099b15c27ba40c982f | |
parent | f76a8d7debadb47bc21aec4cac8a696a0265425f (diff) |
Fix escaping of names in the from header
-rw-r--r-- | app/mailers/notification_mailers/base.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/app/mailers/notification_mailers/base.rb b/app/mailers/notification_mailers/base.rb index 8aa3d28c6..e4f56eb4b 100644 --- a/app/mailers/notification_mailers/base.rb +++ b/app/mailers/notification_mailers/base.rb @@ -35,16 +35,13 @@ module NotificationMailers private def default_headers - headers = { - from: "\"#{AppConfig.settings.pod_name}\" <#{AppConfig.mail.sender_address}>", - host: "#{AppConfig.pod_uri.host}", + from_name = AppConfig.settings.pod_name + from_name += " (#{@sender.profile.full_name.empty? ? @sender.username : @sender.name})" if @sender.present? + + { + from: name_and_address(from_name, AppConfig.mail.sender_address), to: name_and_address(@recipient.name, @recipient.email) } - return headers if @sender.blank? - sender_in_header = @sender.profile.full_name.empty? ? @sender.username : @sender.name - headers[:from] = "\"#{AppConfig.settings.pod_name} (#{sender_in_header})\" <#{AppConfig.mail.sender_address}>" - - headers end def with_recipient_locale(&block) |