Merged r17862 from trunk to 4.0-stable (#30785).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17863 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 9298e1b12b4fdbb28fba16ef94f45db0606fa547..6586c52bb8160fd83514ff1e1ad520b10ebd5696 100755 (executable)
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -91,7 +91,7 @@ class MailHandler < ActionMailer::Base
     @handler_options = options
     sender_email = email.from.to_a.first.to_s.strip
     # Ignore emails received from the application emission address to avoid hell cycles
-    if sender_email.casecmp(Setting.mail_from.to_s.strip) == 0
+    if sender_email.casecmp(Setting.mail_from_address) == 0
       if logger
         logger.info  "MailHandler: ignoring email from Redmine emission address [#{sender_email}]"
       end

diff --git a/app/models/setting.rb b/app/models/setting.rb
index e59c48c86c802e811eb1d5bd9104e341032dd0e2..e6de85906f810a438d20fc04e78eec60903d37c4 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -228,6 +228,12 @@ class Setting < ActiveRecord::Base
     Object.const_defined?(:OpenID) && self[:openid].to_i > 0
   end
 
+  # Extracts an email address ("joe@example.com") from
+  # Setting.mail_from ("Joe Bloggs <joe@example.com>")
+  def self.mail_from_address
+    self.mail_from.to_s.gsub(/(?:.*<|>.*|\(.*\))/, '').strip
+  end
+
   # Checks if settings have changed since the values were read
   # and clears the cache hash if it's the case
   # Called once per request

diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb
index b65717dbe5cec0c1bf1b3a00ca46774513c3bebe..2e184f36bf75a7f9b4d85f6e4aa987339133a8c6 100644 (file)
--- a/test/unit/setting_test.rb
+++ b/test/unit/setting_test.rb
@@ -108,6 +108,23 @@ class SettingTest < ActiveSupport::TestCase
     end
   end
 
+  def test_mail_from_address
+    mail_from_strings = [
+      'joe@example.com',
+      '<joe@example.com>',
+      'Joe Bloggs <joe@example.com>',
+      'display_name@example.com <joe@example.com>',
+      'joe@example.com (Joe Bloggs)',
+      'joe@example.com (display_name@example.com)'
+    ]
+
+    mail_from_strings.each do |from_value|
+      with_settings :mail_from => from_value do
+        assert_equal 'joe@example.com', Setting.mail_from_address
+      end
+    end
+  end
+
   def test_setting_serialied_as_binary_should_be_loaded_as_utf8_encoded_strings
     yaml = <<-YAML
 ---