FIX: cleanup aliases in email From and Reply-to fields to prevent Bad sender address syntax errors

This commit is contained in:
Neil Lalonde
2014-08-08 13:35:47 -04:00
parent 3b76fd82fd
commit 50ac4c6336
3 changed files with 23 additions and 3 deletions
+5
View File
@@ -21,4 +21,9 @@ module Email
email.downcase
end
def self.cleanup_alias(name)
# TODO: I'm sure there are more, but I can't find a list
name ? name.gsub(/[:<>]/, '') : name
end
end
+3 -3
View File
@@ -165,14 +165,14 @@ module Email
def alias_email(source)
return source if @opts[:from_alias].blank? && SiteSetting.email_site_title.blank?
if !@opts[:from_alias].blank?
"#{@opts[:from_alias]} <#{source}>"
"#{Email.cleanup_alias(@opts[:from_alias])} <#{source}>"
else
"#{SiteSetting.email_site_title} <#{source}>"
"#{Email.cleanup_alias(SiteSetting.email_site_title)} <#{source}>"
end
end
def site_alias_email(source)
"#{SiteSetting.email_site_title.presence || SiteSetting.title} <#{source}>"
"#{Email.cleanup_alias(SiteSetting.email_site_title.presence || SiteSetting.title)} <#{source}>"
end
end