jro_apps/redmine Commit - r9656:1d0fb85179e7

Merged r9796 from trunk....

Jean-Philippe Lang -

r9656:1d0fb85179e7

parent child

Context file:

r9656:1d0fb85179e7

Collapse all files

test/fixtures/mail_handler/subject_as_iso-8859-1.eml created 644 +11 0

@@ -0,0 +1,11
	1	Content-Type: application/ms-tnef; name="winmail.dat"
	2	Content-Transfer-Encoding: binary
	3	From: John Smith <JSmith@somenet.foo>
	4	To: "redmine@somenet.foo" <redmine@somenet.foo>
	5	Subject: =?iso-8859-1?Q?Testmail_from_Webmail:_=E4_=F6_=FC...?=
	6	Date: Fri, 1 Jun 2012 14:39:38 +0200
	7	Message-ID: <87C31D42249DD0489D1A1444E3232DD7019D6183@foo.bar>
	8	Accept-Language: de-CH, en-US
	9	Content-Language: de-CH
	10
	11	Fixture

app/models/mail_handler.rb +19 -2

                 issue = Issue.new(:author => user, :project => project)
                 issue.safe_attributes = issue_attributes_from_keywords(issue)
                 issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)}
-                issue.subject = email.subject.to_s.chomp[0,255]
+                issue.subject = cleaned_up_subject
                 if issue.subject.blank?
                   issue.subject = '(no subject)'
                 end
                   end
                   if !message.locked?
-                    reply = Message.new(:subject => email.subject.gsub(%r{^.*msg\d+\]}, '').strip,
+                    reply = Message.new(:subject => cleaned_up_subject.gsub(%r{^.*msg\d+\]}, '').strip,
                                         :content => cleaned_up_text_body)
                     reply.author = user
                     reply.board = message.board
                 cleanup_body(plain_text_body)
               end
+              def cleaned_up_subject
+                subject = email.subject.to_s
+                unless subject.respond_to?(:encoding)
+                  # try to reencode to utf8 manually with ruby1.8
+                  begin
+                    if h = email.header[:subject]
+                      if m = h.value.match(/^=\?([^\?]+)\?/)
+                        subject = Redmine::CodesetUtil.to_utf8(subject, m[1])
+                      end
+                    end
+                  rescue
+                    # nop
+                  end
+                end
+                subject.strip[0,255]
+              end
               def self.full_sanitizer
                 @full_sanitizer ||= HTML::FullSanitizer.new
               end

test/unit/mail_handler_test.rb +9 0

@@ -347,6 +347,15 class MailHandlerTest < ActiveSupport::TestCase
347	assert_equal 'caaf384198bcbc9563ab5c058acd73cd', attachment.digest	347	assert_equal 'caaf384198bcbc9563ab5c058acd73cd', attachment.digest
348	end	348	end
349		349
		350	def test_add_issue_with_iso_8859_1_subject
		351	issue = submit_email(
		352	'subject_as_iso-8859-1.eml',
		353	:issue => {:project => 'ecookbook'}
		354	)
		355	assert_kind_of Issue, issue
		356	assert_equal 'Testmail from Webmail: ä ö ü...', issue.subject
		357	end
		358
350	def test_should_ignore_emails_from_locked_users	359	def test_should_ignore_emails_from_locked_users
351	User.find(2).lock!	360	User.find(2).lock!
352		361

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages