jro_apps/redmine Commit - r9447:1ab261dda6df

0

app/models/attachment.rb +9 -4

@@ -101,10 +101,15 class Attachment < ActiveRecord::Base
101	logger.info("Saving attachment '#{self.diskfile}' (#{@temp_file.size} bytes)")	101	logger.info("Saving attachment '#{self.diskfile}' (#{@temp_file.size} bytes)")
102	md5 = Digest::MD5.new	102	md5 = Digest::MD5.new
103	File.open(diskfile, "wb") do \|f\|	103	File.open(diskfile, "wb") do \|f\|
104	buffer = ""	104	if @temp_file.respond_to?(:read)
105	while (buffer = @temp_file.read(8192))	105	buffer = ""
106	f.write(buffer)	106	while (buffer = @temp_file.read(8192))
107	~~md5~~.~~upda~~te(buffer)	107	f.write(buffer)
		108	md5.update(buffer)
		109	end
		110	else
		111	f.write(@temp_file)
		112	md5.update(@temp_file)
108	end	113	end
109	end	114	end
110	self.digest = md5.hexdigest	115	self.digest = md5.hexdigest

0

app/models/mail_handler.rb +32 -28

             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-            require 'vendor/tmail'
+            class MailHandler < ActionMailer::Base
-            class MailHandler
               include ActionView::Helpers::SanitizeHelper
               include Redmine::I18n
                 @@handler_options[:no_permission_check] = (@@handler_options[:no_permission_check].to_s == '1' ? true : false)
-                mail = TMail::Mail.parse(email)
+                email.force_encoding('ASCII-8BIT') if email.respond_to?(:force_encoding)
-                mail.base64_decode
+                super(email)
-                new.receive(mail)
               end
               def logger
                 end
                 # Ignore auto generated emails
                 self.class.ignored_emails_headers.each do |key, ignored_value|
-                  value = email.header_string(key)
+                  value = email.header[key]
                   if value && value.to_s.downcase == ignored_value.downcase
                     if logger && logger.info
                       logger.info "MailHandler: ignoring email with #{key}:#{value} header"
               private
-              MESSAGE_ID_RE = %r{^<redmine\.([a-z0-9_]+)\-(\d+)\.\d+@}
+              MESSAGE_ID_RE = %r{^<?redmine\.([a-z0-9_]+)\-(\d+)\.\d+@}
               ISSUE_REPLY_SUBJECT_RE = %r{\[[^\]]*#(\d+)\]}
               MESSAGE_REPLY_SUBJECT_RE = %r{\[[^\]]*msg(\d+)\]}
                 if email.attachments && email.attachments.any?
                   email.attachments.each do |attachment|
                     obj.attachments << Attachment.create(:container => obj,
-                                      :file => attachment,
+                                      :file => attachment.decoded,
+                                      :filename => attachment.filename,
                                       :author => user,
-                                      :content_type => attachment.content_type)
+                                      :content_type => attachment.mime_type)
                   end
                 end
               end
                 keys.reject! {|k| k.blank?}
                 keys.collect! {|k| Regexp.escape(k)}
                 format ||= '.+'
-                text.gsub!(/^(#{keys.join('|')})[ \t]*:[ \t]*(#{format})\s*$/i, '')
+                keyword = nil
-                $2 && $2.strip
+                regexp = /^(#{keys.join('|')})[ \t]*:[ \t]*(#{format})\s*$/i
+                if m = text.match(regexp)
+                  keyword = m[2].strip
+                  text.gsub!(regexp, '')
+                end
+                keyword
               end
               def target_project
               # If not found (eg. HTML-only email), returns the body with tags removed
               def plain_text_body
                 return @plain_text_body unless @plain_text_body.nil?
-                parts = @email.parts.collect {|c| (c.respond_to?(:parts) && !c.parts.empty?) ? c.parts : c}.flatten
-                if parts.empty?
+                part = email.text_part || email.html_part || email
-                  parts << @email
+                @plain_text_body = Redmine::CodesetUtil.to_utf8(part.body.decoded, part.charset)
-                end
-                plain_text_part = parts.detect {|p| p.content_type == 'text/plain'}
+                if @plain_text_body.respond_to?(:force_encoding)
-                if plain_text_part.nil?
+                 # @plain_text_body = @plain_text_body.force_encoding(@email.charset).encode("UTF-8")
-                  # no text/plain part found, assuming html-only email
-                  # strip html tags and remove doctype directive
-                  @plain_text_body = strip_tags(@email.body.to_s)
-                  @plain_text_body.gsub! %r{^<!DOCTYPE .*$}, ''
-                else
-                  @plain_text_body = plain_text_part.body.to_s
                 end
-                @plain_text_body.strip!
+                # strip html tags and remove doctype directive
+                @plain_text_body = strip_tags(@plain_text_body.strip)
+                @plain_text_body.sub! %r{^<!DOCTYPE .*$}, ''
                 @plain_text_body
               end
               # Creates a User for the +email+ sender
               # Returns the user or nil if it could not be created
               def create_user_from_email
-                addr = email.from_addrs.to_a.first
+                from = email.header['from'].to_s
-                if addr && !addr.spec.blank?
+                addr, name = from, nil
-                  user = self.class.new_user_from_attributes(addr.spec, TMail::Unquoter.unquote_and_convert_to(addr.name, 'utf-8'))
+                if m = from.match(/^"?(.+?)"?\s+<(.+@.+)>$/)
+                  addr, name = m[2], m[1]
+                end
+                if addr.present?
+                  user = self.class.new_user_from_attributes(addr, name)
                   if user.save
                     user
                   else

0

lib/vendor/tmail-1.2.7/tmail.rb removed 0 -6

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/Makefile removed 0 -18

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/address.rb removed 0 -392

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/attachments.rb removed 0 -65

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/base64.rb removed 0 -46

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/compat.rb removed 0 -41

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/config.rb removed 0 -67

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/core_extensions.rb removed 0 -63

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/encode.rb removed 0 -590

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (590 lines changed) Show them Hide them

0

lib/vendor/tmail-1.2.7/tmail/header.rb removed 0 -962

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (962 lines changed) Show them Hide them

0

lib/vendor/tmail-1.2.7/tmail/index.rb removed 0 -9

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/interface.rb removed 0 -1162

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (1162 lines changed) Show them Hide them

0

lib/vendor/tmail-1.2.7/tmail/loader.rb removed 0 -3

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/mail.rb removed 0 -578

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (578 lines changed) Show them Hide them

0

lib/vendor/tmail-1.2.7/tmail/mailbox.rb removed 0 -496

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/main.rb removed 0 -6

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/mbox.rb removed 0 -3

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/net.rb removed 0 -250

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/obsolete.rb removed 0 -132

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/parser.rb removed 0 -1060

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (1060 lines changed) Show them Hide them

0

lib/vendor/tmail-1.2.7/tmail/parser.y removed 0 -416

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/port.rb removed 0 -379

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/quoting.rb removed 0 -164

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/require_arch.rb removed 0 -58

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/scanner.rb removed 0 -49

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/scanner_r.rb removed 0 -262

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/stringio.rb removed 0 -280

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/utils.rb removed 0 -362

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/COPYING removed 0 -504

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (504 lines changed) Show them Hide them

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/README removed 0 -12

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet.rb removed 0 -67

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/big5freq.rb removed 0 -927

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (927 lines changed) Show them Hide them

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/big5prober.rb removed 0 -42

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/chardistribution.rb removed 0 -238

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/charsetgroupprober.rb removed 0 -112

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/charsetprober.rb removed 0 -75

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/codingstatemachine.rb removed 0 -64

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/constants.rb removed 0 -42

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/escprober.rb removed 0 -89

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/escsm.rb removed 0 -244

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/eucjpprober.rb removed 0 -88

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euckrfreq.rb removed 0 -596

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (596 lines changed) Show them Hide them

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euckrprober.rb removed 0 -42

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euctwfreq.rb removed 0 -430

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/euctwprober.rb removed 0 -42

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/gb2312freq.rb removed 0 -474

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/gb2312prober.rb removed 0 -42

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/hebrewprober.rb removed 0 -289

1

NO CONTENT: file was removed

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/jisfreq.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/jpcntx.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langbulgarianmodel.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langcyrillicmodel.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langgreekmodel.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langhebrewmodel.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langhungarianmodel.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/langthaimodel.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/latin1prober.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/mbcharsetprober.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/mbcsgroupprober.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/mbcssm.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/sbcharsetprober.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/sbcsgroupprober.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/sjisprober.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/universaldetector.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/vendor/rchardet-1.3/lib/rchardet/utf8prober.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail-1.2.7/tmail/version.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

0

lib/vendor/tmail.rb removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

	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

The requested changes are too big and content was truncated. Show full diff