Bug #8858: Auto-determine charset for text attachments

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index a5b7c05..e84db88 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -2,6 +2,7 @@
 v5.0-git
 --------
 
+[mms] Auto-determine charset for text attachments (Bug #8858).
 [mms] Remove IE 6 (and below) and Safari 2 (and below) support for DIMP.
 [mms] Add chance to switch between forward options on compose page when using
       auto-forward (DIMP).

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index e29b188..5749d60 100644 (file)
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -1759,7 +1759,16 @@ class IMP_Compose
 
         $part = new Horde_Mime_Part();
         $part->setType($type);
-        $part->setCharset(Horde_Nls::getCharset());
+        if ($part->getPrimaryType() == 'text') {
+            if ($analyzetype = Horde_Mime_Magic::analyzeFile($tempfile, empty($conf['mime']['magic_db']) ? null : $conf['mime']['magic_db'], array('nostrip' => true))) {
+                $analyzetype = Horde_Mime::decodeParam('Content-Type', $analyzetype);
+                $part->setCharset(isset($analyzetype['params']['charset']) ? $analyzetype['params']['charset'] : Horde_Nls::getCharset());
+            } else {
+                $part->setCharset(Horde_Nls::getCharset());
+            }
+        } else {
+            $part->setHeaderCharset(Horde_Nls::getCharset());
+        }
         $part->setName($filename);
         $part->setBytes($_FILES[$name]['size']);
         $part->setDisposition('attachment');