From 6fbd9fcae218b675b298d7b4101e2f184e56818c Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 4 Aug 2011 16:11:37 +0100 Subject: Updated pop3 server to be configurable --- lib/mauve/notifiers/email.rb | 11 +++++++++-- lib/mauve/notifiers/templates/email.html.erb | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'lib/mauve/notifiers') diff --git a/lib/mauve/notifiers/email.rb b/lib/mauve/notifiers/email.rb index 03384f7..8f2d32b 100644 --- a/lib/mauve/notifiers/email.rb +++ b/lib/mauve/notifiers/email.rb @@ -24,7 +24,6 @@ module Mauve @password = nil @login_method = nil @from = "mauve@localhost" - @hostname = "localhost" @signature = "This is an automatic mailing, please do not reply." @subject_prefix = "" end @@ -73,7 +72,15 @@ module Mauve m.header.to = destination m.header.from = @from - m.header.date = alert.updated_at.to_time || MauveTime.now + m.header.date = case alert.update_type + when "cleared" + alert.cleared_at + when "acknowledged" + alert.acknowledged_at + else + alert.raised_at + end + m.header['Content-Type'] = "multipart/alternative" txt_template = File.join(File.dirname(__FILE__), "templates", "email.txt.erb") diff --git a/lib/mauve/notifiers/templates/email.html.erb b/lib/mauve/notifiers/templates/email.html.erb index 24b5e7b..fb33de6 100644 --- a/lib/mauve/notifiers/templates/email.html.erb +++ b/lib/mauve/notifiers/templates/email.html.erb @@ -1,7 +1,7 @@ -

<%= alert.update_type.upcase %>:<% +

<%= alert.update_type.upcase %>: <% case alert.update_type when "cleared" %><%= alert.cleared_at.to_s_relative %><% -- cgit v1.2.1