Changeset 29384

Timestamp:

02/01/09 19:28:13 (4 years ago)

Author:

mrkn

Message:

modify forwarding algorithm

Files:

• lang/ruby/misc/imap_fetch_and_forward.rb (modified) (2 diffs)

lang/ruby/misc/imap_fetch_and_forward.rb

@@ -45 +45 @@
   end
 
-  def forward(envelope, body)
-    mail = TMail::Mail.new
-    mail.from = @from
-    mail.to = @to
-    mail.date = Time.now
-    mail.subject = %Q[Forward: #{envelope.subject}]
-    mail.mime_version = '1.0'
-    body = body.collect {|line| %Q[> #{line}] }.join
-    forwarding_body = <<"END_BODY"
-Following message was received via #{format_address(envelope.to[0])}:
-
-> From: #{format_address(envelope.from[0])}
-> Date: #{envelope.date.inspect}
-> Subject: #{envelope.subject}
->
-#{body}
-END_BODY
-    mail.body = NKF.nkf('-j', forwarding_body)
-    mail.set_content_type 'text', 'plain', 'charset' => 'iso-2022-jp'
-    sendmail(mail)
+  def forward(orig)
+    fm = orig.create_forward
+    fm.from = @from
+    fm.to = @to
+    fm.date = Time.now
+    fm.mime_version = '1.0'
+    sendmail(fm)
   end
 
@@ -99 +86 @@
 imap.examine(imap_folder)
 imap.search(%w[UNSEEN]).each {|mid|
-  envelope = imap.fetch(mid, 'ENVELOPE')[0].attr['ENVELOPE']
-  body = imap.fetch(mid, 'BODY[TEXT]')[0].attr['BODY[TEXT]']
-  forwarder.forward(envelope, body)
+  rfc822 = imap.fetch(mid, 'RFC822')[0].attr['RFC822']
+  m = TMail::Mail.parse rfc822
+  forwarder.forward(m)
   imap.store(mid, '+FLAGS', [:Seen])
 }