diff options
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/application_mailer.rb | 2 | ||||
| -rw-r--r-- | app/mailers/contact_mailer.rb | 2 | ||||
| -rw-r--r-- | app/mailers/outgoing_mailer.rb | 6 | ||||
| -rw-r--r-- | app/mailers/request_mailer.rb | 4 | ||||
| -rw-r--r-- | app/mailers/track_mailer.rb | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 3877c4a33..e4178081f 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -15,7 +15,7 @@ class ApplicationMailer < ActionMailer::Base self.raise_delivery_errors = true def blackhole_email - Configuration::blackhole_prefix+"@"+Configuration::incoming_email_domain + AlaveteliConfiguration::blackhole_prefix+"@"+AlaveteliConfiguration::incoming_email_domain end # URL generating functions are needed by all controllers (for redirects), diff --git a/app/mailers/contact_mailer.rb b/app/mailers/contact_mailer.rb index b990e38f4..383f1a6e6 100644 --- a/app/mailers/contact_mailer.rb +++ b/app/mailers/contact_mailer.rb @@ -39,7 +39,7 @@ class ContactMailer < ApplicationMailer mail(:from => contact_from_name_and_email, :to => recipient_user.name_and_email, - :bcc => Configuration::contact_email, + :bcc => AlaveteliConfiguration::contact_email, :subject => subject) end end diff --git a/app/mailers/outgoing_mailer.rb b/app/mailers/outgoing_mailer.rb index 14277ae8b..c602359de 100644 --- a/app/mailers/outgoing_mailer.rb +++ b/app/mailers/outgoing_mailer.rb @@ -15,7 +15,7 @@ class OutgoingMailer < ApplicationMailer # Email to public body requesting info def initial_request(info_request, outgoing_message) - @info_request, @outgoing_message, @contact_email = info_request, outgoing_message, Configuration::contact_email + @info_request, @outgoing_message, @contact_email = info_request, outgoing_message, AlaveteliConfiguration::contact_email @wrap_lines_as_paragraphs = true headers["message-id"] = OutgoingMailer.id_for_message(outgoing_message) @@ -26,7 +26,7 @@ class OutgoingMailer < ApplicationMailer # Later message to public body regarding existing request def followup(info_request, outgoing_message, incoming_message_followup) - @info_request, @outgoing_message, @incoming_message_followup, @contact_email = info_request, outgoing_message, incoming_message_followup, Configuration::contact_email + @info_request, @outgoing_message, @incoming_message_followup, @contact_email = info_request, outgoing_message, incoming_message_followup, AlaveteliConfiguration::contact_email @wrap_lines_as_paragraphs = true headers["message-id"] = OutgoingMailer.id_for_message(outgoing_message) @@ -88,7 +88,7 @@ class OutgoingMailer < ApplicationMailer message_id = "ogm-" + outgoing_message.id.to_s t = Time.now message_id += "+" + '%08x%05x-%04x' % [t.to_i, t.tv_usec, rand(0xffff)] - message_id += "@" + Configuration::incoming_email_domain + message_id += "@" + AlaveteliConfiguration::incoming_email_domain return "<" + message_id + ">" end diff --git a/app/mailers/request_mailer.rb b/app/mailers/request_mailer.rb index 0e3025c73..750f6f9b5 100644 --- a/app/mailers/request_mailer.rb +++ b/app/mailers/request_mailer.rb @@ -46,7 +46,7 @@ class RequestMailer < ApplicationMailer attachments.inline["original.eml"] = raw_email_data @info_request = info_request - @contact_email = Configuration::contact_email + @contact_email = AlaveteliConfiguration::contact_email mail(:to => email.from_addrs[0].to_s, :from => contact_from_name_and_email, @@ -337,7 +337,7 @@ class RequestMailer < ApplicationMailer # Send email alerts for new responses which haven't been classified. By default, # it goes out 3 days after last update of event, then after 10, then after 24. def self.alert_new_response_reminders - Configuration::new_response_reminder_after_days.each_with_index do |days, i| + AlaveteliConfiguration::new_response_reminder_after_days.each_with_index do |days, i| self.alert_new_response_reminders_internal(days, "new_response_reminder_#{i+1}") end end diff --git a/app/mailers/track_mailer.rb b/app/mailers/track_mailer.rb index 1ddce4a7e..263b406e9 100644 --- a/app/mailers/track_mailer.rb +++ b/app/mailers/track_mailer.rb @@ -26,7 +26,7 @@ class TrackMailer < ApplicationMailer end def contact_from_name_and_email - "#{Configuration::track_sender_name} <#{Configuration::track_sender_email}>" + "#{AlaveteliConfiguration::track_sender_name} <#{AlaveteliConfiguration::track_sender_email}>" end # Send email alerts for tracked things. Never more than one email |