Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-05-07 10:05:52 +02:00
Code Issues Packages Projects Releases Activity

Merged r9390 from trunk.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9400 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-04-14 04:52:49 +00:00
parent 1feb373c89
commit 8fefb7c05b
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/models/mail_handler.rb
View File

@@ -42,6 +42,12 @@ class MailHandler < ActionMailer::Base
super email
end
cattr_accessor :ignored_emails_headers
@@ignored_emails_headers = {
'X-Auto-Response-Suppress' => 'OOF',
'Auto-Submitted' => 'auto-replied'
}
# Processes incoming emails
# Returns the created object (eg. an issue, a message) or false
def receive(email)
@@ -54,12 +60,15 @@ class MailHandler < ActionMailer::Base
end
return false
end
# Ignore out-of-office emails
if email.header_string("X-Auto-Response-Suppress") == 'OOF'
if logger && logger.info
logger.info "MailHandler: ignoring out-of-office email"
# Ignore auto generated emails
self.class.ignored_emails_headers.each do |key, ignored_value|
value = email.header_string(key)
if value && value.to_s.downcase == ignored_value.downcase
if logger && logger.info
logger.info "MailHandler: ignoring email with #{key}:#{value} header"
end
return false
end
return false
end
@user = User.find_by_mail(sender_email) if sender_email.present?
if @user && !@user.active?