From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Wed, 6 Oct 2010 16:55:35 +0000 (-0400)
Subject: No longer require/use the charset parameter to Horde_Mime_Viewer objects,
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8246f677410112eb1f62a5105b1c3f521bf8dbed;p=horde.git

No longer require/use the charset parameter to Horde_Mime_Viewer objects,
force the use of UTF-8.
---

diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Base.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Base.php
index 92641a9da..c55ab7e43 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Base.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Base.php
@@ -34,9 +34,7 @@ class Horde_Mime_Viewer_Base
      *
      * @var array
      */
-    protected $_required = array(
-        'charset'
-    );
+    protected $_required = array();
 
     /**
      * This driver's display capabilities.
@@ -71,7 +69,6 @@ class Horde_Mime_Viewer_Base
      *                                    rendered.
      * @param array $conf                 Configuration:
      * <pre>
-     * 'charset' - (string) The local UI charset. [REQUIRED]
      * 'temp_file' - (callback) A callback function that returns a temporary
      *               filename.  Is passed one parameter: a prefix string.
      *                DEFAULT: Uses Horde_Util::getTempFile().
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Deb.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Deb.php
index c9eb7cea4..26ec3dcfa 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Deb.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Deb.php
@@ -90,7 +90,7 @@ class Horde_Mime_Viewer_Deb extends Horde_Mime_Viewer_Base
             '<span ' .
             ($monospace ? 'class="' . $monospace . '">' : 'style="font-family:monospace">') .
             htmlspecialchars($data) . '</span>',
-            'text/html; charset=' . $this->getConfigParam('charset')
+            'text/html; charset=UTF-8'
         );
     }
 
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Msexcel.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Msexcel.php
index 7bc225fe2..1cec627ed 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Msexcel.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Msexcel.php
@@ -71,7 +71,7 @@ class Horde_Mime_Viewer_Msexcel extends Horde_Mime_Viewer_Base
 
         return $this->_renderReturn(
             file_get_contents($tmp_out),
-            'text/html; charset=' . $this->getConfigParam('charset')
+            'text/html; charset=UTF-8'
         );
     }
 
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Mspowerpoint.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Mspowerpoint.php
index 336f95f53..029fa5871 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Mspowerpoint.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Mspowerpoint.php
@@ -74,7 +74,7 @@ class Horde_Mime_Viewer_Mspowerpoint extends Horde_Mime_Viewer_Base
 
         return $this->_renderReturn(
             $data,
-            'text/html; charset=' . $this->getConfigParam('charset')
+            'text/html; charset=UTF-8'
         );
     }
 
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rfc822.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rfc822.php
index dd670314b..4e96236c2 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rfc822.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rfc822.php
@@ -82,7 +82,7 @@ class Horde_Mime_Viewer_Rfc822 extends Horde_Mime_Viewer_Base
 
         return $this->_renderReturn(
             (empty($header_output) ? '' : ('<div class="fixed mimeHeaders">' . $this->_textFilter(implode("<br />\n", $header_output), 'emails') . '</div>')),
-            'text/html; charset=' . $this->getConfigParam('charset')
+            'text/html; charset=UTF-8'
         );
     }
 
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rpm.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rpm.php
index 296d32afc..d468b486e 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rpm.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rpm.php
@@ -91,7 +91,7 @@ class Horde_Mime_Viewer_Rpm extends Horde_Mime_Viewer_Base
             '<span ' .
             ($monospace ? 'class="' . $monospace . '">' : 'style="font-family:monospace">') .
             htmlspecialchars($data) . '</span>',
-            'text/html; charset=' . $this->getConfigParam('charset')
+            'text/html; charset=UTF-8'
         );
     }
 
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rtf.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rtf.php
index 4c2c341f4..f5d5e0cf6 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rtf.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rtf.php
@@ -76,7 +76,7 @@ class Horde_Mime_Viewer_Rtf extends Horde_Mime_Viewer_Base
 
         return $this->_renderReturn(
             $data,
-            'text/html; charset=' . $this->getConfigParam('charset')
+            'text/html; charset=UTF-8'
         );
     }
 
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Smil.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Smil.php
index a3943b3c3..2d1943b03 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Smil.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Smil.php
@@ -69,7 +69,7 @@ class Horde_Mime_Viewer_Smil extends Horde_Mime_Viewer_Base
 
         return $this->_renderReturn(
             $this->_content,
-            'text/html; charset=' . $this->getConfigParam('charset')
+            'text/html; charset=UTF-8'
         );
     }
 
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Wordperfect.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Wordperfect.php
index a7aee8660..ec172dd46 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Wordperfect.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Wordperfect.php
@@ -76,7 +76,7 @@ class Horde_Mime_Viewer_Wordperfect extends Horde_Mime_Viewer_Base
 
         return $this->_renderReturn(
             $data,
-            'text/html; charset=' . $this->getConfigParam('charset')
+            'text/html; charset=UTF-8'
         );
     }