mail_notify.rb in parlement-0.11

- old
+ new

@@ -10,16 +10,16 @@
 		subject elt.subject
 
 		ml = mailing_list(elt.parent)
 
 		recipients ml.subject.to_s \
-			+ " <#{ml.id}@#{ActionMailer::Base.server_settings[:domain]}>"
+			+ " <#{ml.id}@#{ActionMailer::Base.smtp_settings[:domain]}>"
 
 		from ((elt.person and elt.person.name) ? elt.person.name : ANONYMOUS_POSTER) \
 			+ " <" \
 			+ ((elt.person and elt.person.email) \
-				? elt.person.email : "#{ANONYMOUS_POSTER}@#{ActionMailer::Base.server_settings[:domain]}") \
+				? elt.person.email : "#{ANONYMOUS_POSTER}@#{ActionMailer::Base.smtp_settings[:domain]}") \
 			+ ">"
 
 		# Try to render the element as html
 		body :elt => elt
 
@@ -47,11 +47,12 @@
 		}
 
 		# This is the essential of a mailing list, you reply to the mailing list,
 		# where every body sends their mail.
 		# This very mail can be a mailing list all by itself...
-		@headers['Reply-to'] = "#{ml.id}@#{ActionMailer::Base.server_settings[:domain]}"
+		@headers['Reply-to'] = "#{ml.id}@#{ActionMailer::Base.smtp_settings[:domain]}"
+		#puts "#{ml.id}@#{ActionMailer::Base.smtp_settings[:domain]}"
 
 		@headers['In-Reply-To'] = elt.parent.mail.message \
 			if elt.parent and elt.parent.mail and elt.parent.mail.message
 
 		@sent_on = elt.created_on
@@ -62,10 +63,10 @@
 			@headers['references'] = ''
 			@headers['references'] << parentMsg.mail_parents if parentMsg.mail_parents
 			@headers['references'] << parentMsg.message if parentMsg.message
 		end
 
-		@headers['X-Mailer'] = "#{ActionMailer::Base.server_settings[:domain]} v#{PARLEMENT_VERSION}"
+		@headers['X-Mailer'] = "#{ActionMailer::Base.smtp_settings[:domain]} v#{PARLEMENT_VERSION}"
 
 		logger.info "Mail created"
 	end
 
 	private