[mms] Remove the 'default_msg_charset' preference.

I haven't found a message that displays correctly when specifying a charset vs. the default '' value. And it turns out that I've actually been using '' as my value all along, so messages that display fine for me may not be displaying properly for others. We are already doing charset autodetection in Horde_Mime_Headers. And browsers do a reasonable job of trying to display the right charset when given a "default" charset like US-ASCII (vs. something like UTF-8) so there is no need fo this anymore. Conflicts: imp/package.xml
horde · Jun 10, 2014 · bab1e69 · bab1e69
1 parent 4722b82
commit bab1e69
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 36 deletions.
diff --git a/imp/config/prefs.php b/imp/config/prefs.php
@@ -980,8 +980,7 @@
         'filtering', 'strip_attachments', 'alternative_display',
         'image_replacement', 'image_replacement_manage', 'highlight_text',
         'highlight_simple_markup', 'show_quoteblocks', 'dim_signature',
-        'emoticons', 'parts_display', 'mail_hdr', 'default_msg_charset',
-        'send_mdn'
+        'emoticons', 'parts_display', 'mail_hdr', 'send_mdn'
     )
 );
 
@@ -1097,21 +1096,6 @@
     'desc' => _("Additional headers to display when viewing: <em>(enter each header on a new line)</em>")
 );
 
-$_prefs['default_msg_charset'] = array(
-    'value' => $GLOBALS['registry']->getEmailCharset()
-        ? $GLOBALS['registry']->getEmailCharset()
-        : ($GLOBALS['registry']->getLanguageCharset()
-            ? $GLOBALS['registry']->getLanguageCharset()
-            : ''),
-    'advanced' => true,
-    'type' => 'enum',
-    'enum' => array_merge(
-        array('' => _("Default (US-ASCII)")), $GLOBALS['registry']->nlsconfig->encodings_sort
-    ),
-    'desc' => _("The default charset for messages:"),
-    'help' => 'prefs-default_msg_charset'
-);
-
 $_prefs['send_mdn'] = array(
     'value' => 1,
     'advanced' => true,

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,7 @@
 v6.2.0-git
 ----------
 
+[mms] Remove the 'default_msg_charset' preference.
 [mms] Rewritten folder list code for dynamic view.
 [mms] Fix saving expanded state when expanding all mailboxes when all mailboxes
       are already cached in the browser.

diff --git a/imp/docs/UPGRADING b/imp/docs/UPGRADING
@@ -109,6 +109,7 @@ The following preferences have been added::
 
 The following preferences have been removed::
 
+   default_msg_charset
    mail_domain
    mimp_download_confirm
    mimp_inline_all

diff --git a/imp/lib/Application.php b/imp/lib/Application.php
@@ -138,19 +138,10 @@ protected function _authenticated()
      */
     protected function _init()
     {
-        global $prefs, $registry;
+        global $registry;
 
-        // Set default message character set.
-        if ($registry->getAuth()) {
-            if ($def_charset = $prefs->getValue('default_msg_charset')) {
-                Horde_Mime_Part::$defaultCharset = $def_charset;
-                Horde_Mime_Headers::$defaultCharset = $def_charset;
-            }
-
-            // Always use Windows-1252 in place of ISO-8859-1 for MIME
-            // decoding.
-            Horde_Mime::$decodeWindows1252 = true;
-        }
+        // Always use Windows-1252 in place of ISO-8859-1 for MIME decoding.
+        Horde_Mime::$decodeWindows1252 = true;
 
         if (($registry->initialApp == 'imp') &&
             !empty($this->initParams['impmode']) &&

diff --git a/imp/locale/en/help.xml b/imp/locale/en/help.xml
@@ -525,13 +525,6 @@
         </raw>
     </entry>
 
-    <entry id="prefs-default_msg_charset">
-        <title>Message: Preferences: Default Message Character Set</title>
-        <para>
-            Define the default character set to use for text message parts that do not contain explicit character set information. Per the MIME e-mail standard, messages send without character set information must be displayed using the basic 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select &quot;Default&quot; to use the MIME defaults.
-        </para>
-    </entry>
-
     <entry id="prefs-request_mdn">
         <title>Compose: Preferences: Request Read Receipts</title>
         <para>

diff --git a/imp/package.xml b/imp/package.xml
@@ -3643,6 +3643,7 @@
    <date>2014-06-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mms] Remove the &apos;default_msg_charset&apos; preference.
 * [mms] Rewritten folder list code for dynamic view.
 * [mms] Fix saving expanded state when expanding all mailboxes when all mailboxes are already cached in the browser.
    </notes>