nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

another chance at fixing emails

Browse source
This commit is contained in:
Maxwell Salzberg 2011-11-02 11:21:16 -07:00
parent e505163334
commit 3e20dcd3ba
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/messagebus/mailer.rb
View file

@ -22,15 +22,20 @@ module Messagebus
string.split('<')[0] string.split('<')[0]
end end
def from_header_parse(message)
message['from'].to_s || AppConfig[:smtp_sender_address]
end
private private
def deliver(message) def deliver(message)
# here we want = {:fromEmail => message['from'].to_s} # here we want = {:fromEmail => message['from'].to_s}
#this is required due to weird bug in action mailer #this is required due to weird bug in action mailer
from_header = message['from'].to_s from_header = from_header_parse(message)
@client.send_common_info = {:fromEmail => from_header, :customHeaders => {"sender"=> from_header}} @client.send_common_info = {:fromEmail => from_header, :customHeaders => {"sender"=> from_header}}
message.to.each do |addressee| message.to.each do |addressee|
m = {:toEmail => addressee, :subject => message.subject, :fromName => message_parse(from_header)} m = {:toEmail => addressee, :fromEmail => from_header, :subject => message.subject, :fromName => message_parse(from_header)}
@things = [] @things = []
if message.multipart? if message.multipart?