X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FI18N.pm;h=af5ece01293c3ca99860841ee169fd0b59a02016;hp=c013c219e65d30100d6f523f734a31a4dd34cfe3;hb=d39d52aac8f38ea9115628039f0df5aa3ac826de;hpb=945721f48f74d5cfffef7c7cf3a3d6bc2521f5dd

diff --git a/rt/lib/RT/I18N.pm b/rt/lib/RT/I18N.pm
index c013c219e..af5ece012 100644
--- a/rt/lib/RT/I18N.pm
+++ b/rt/lib/RT/I18N.pm
@@ -1,8 +1,14 @@
-# BEGIN LICENSE BLOCK
+# {{{ BEGIN BPS TAGGED BLOCK
 # 
-# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+# COPYRIGHT:
+#  
+# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+#                                          <jesse@bestpractical.com>
 # 
-# (Except where explictly superceded by other copyright notices)
+# (Except where explicitly superseded by other copyright notices)
+# 
+# 
+# LICENSE:
 # 
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
@@ -14,13 +20,29 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
-# Unless otherwise specified, all modifications, corrections or
-# extensions to this work which alter its source code become the
-# property of Best Practical Solutions, LLC when submitted for
-# inclusion in the work.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# 
+# 
+# CONTRIBUTION SUBMISSION POLICY:
 # 
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
 # 
-# END LICENSE BLOCK
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+# 
+# }}} END BPS TAGGED BLOCK
 =head1 NAME
 
 RT::I18N - a base class for localization of RT
@@ -164,10 +186,14 @@ sub SetMIMEEntityToEncoding {
 
     my $charset = _FindOrGuessCharset($entity) or return;
     # one and only normalization
-    $charset = 'utf-8' if $charset eq 'utf8';
-    $enc     = 'utf-8' if $enc     eq 'utf8';
+    $charset = 'utf-8' if $charset =~ /^utf-?8$/i;
+    $enc     = 'utf-8' if $enc     =~ /^utf-?8$/i;
 
-    SetMIMEHeadToEncoding($entity->head, $charset => $enc, $preserve_words);
+    SetMIMEHeadToEncoding(
+	$entity->head,
+	_FindOrGuessCharset($entity, 1) => $enc,
+	$preserve_words
+    );
 
     my $head = $entity->head;
 
@@ -302,24 +328,26 @@ sub DecodeMIMEWordsToEncoding {
 
 # {{{ _FindOrGuessCharset
 
-=head2 _FindOrGuessCharset MIME::Entity
+=head2 _FindOrGuessCharset MIME::Entity, $head_only
+
+When handed a MIME::Entity will first attempt to read what charset the message is encoded in. Failing that, will use Encode::Guess to try to figure it out
 
-When handed a MIME::Entity will first attempt to read what charset the message is encoded in. Failing that, 
-will use Encode::Guess to try to figure it out
+If $head_only is true, only guesses charset for head parts.  This is because header's encoding (e.g. filename="...") may be different from that of body's.
 
 =cut
 
 sub _FindOrGuessCharset {
     my $entity = shift;
+    my $head_only = shift;
     my $head = $entity->head;
 
     if ($head->mime_attr("content-type.charset")) {
 	return $head->mime_attr("content-type.charset");
     }
 
-    if ( $head->mime_type =~ m{^text/}) {
+    if ( !$head_only and $head->mime_type =~ m{^text/}) {
 	my $body = $entity->bodyhandle or return;
-	return _GuessCharset( $head->as_string . $body->as_string );
+	return _GuessCharset( $body->as_string );
     }
     else {
 	# potentially binary data -- don't guess the body