From 6052df14bab5fe82cd5ccf1979dbfc6d6ab3befa Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 4 Dec 2012 10:35:22 +0000 Subject: Add methods for finding out if there is an empty return path on a mail and getting the auto-submitted field. --- lib/mail_handler/backends/mail_backend.rb | 10 ++++++++++ lib/mail_handler/backends/tmail_backend.rb | 10 ++++++++++ 2 files changed, 20 insertions(+) (limited to 'lib/mail_handler/backends') diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb index 2b1cef0d4..b86f84cef 100644 --- a/lib/mail_handler/backends/mail_backend.rb +++ b/lib/mail_handler/backends/mail_backend.rb @@ -84,6 +84,16 @@ module MailHandler (envelope_to || [])).uniq end + def empty_return_path?(mail) + return false if mail['return-path'].nil? + return true if mail['return-path'].value.blank? + return false + end + + def get_auto_submitted(mail) + mail['auto-submitted'] ? mail['auto-submitted'].value : nil + end + # Format def address_from_name_and_email(name, email) if !MySociety::Validate.is_valid_email(email) diff --git a/lib/mail_handler/backends/tmail_backend.rb b/lib/mail_handler/backends/tmail_backend.rb index b8fdb2c88..e725f7e9f 100644 --- a/lib/mail_handler/backends/tmail_backend.rb +++ b/lib/mail_handler/backends/tmail_backend.rb @@ -65,6 +65,16 @@ module MailHandler (mail.envelope_to || [])).uniq end + def empty_return_path?(mail) + return false if mail['return-path'].nil? + return true if mail['return-path'].addr.to_s == '<>' + return false + end + + def get_auto_submitted(mail) + mail['auto-submitted'] ? mail['auto-submitted'].body : nil + end + def address_from_name_and_email(name, email) if !MySociety::Validate.is_valid_email(email) raise "invalid email " + email + " passed to address_from_name_and_email" -- cgit v1.2.3