Remove alternative_display pref.

With the ability to view all parts, there is no reason to have a status
message listing other alternative parts.

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 43d4eac..d228137 100644 (file)
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -97,8 +97,7 @@ $prefGroups['viewing'] = array(
                        'html_image_replacement', 'html_image_addrbook',
                        'highlight_text', 'highlight_simple_markup',
                        'show_quoteblocks', 'dim_signature', 'emoticons',
-                       'attachment_display', 'mail_hdr', 'default_msg_charset',
-                       'alternative_display')
+                       'attachment_display', 'mail_hdr', 'default_msg_charset')
 );
 if (!empty($GLOBALS['conf']['maillog']['use_maillog'])) {
     $prefGroups['viewing']['members'] = array_merge($prefGroups['viewing']['members'], array('disposition_send_mdn'));
@@ -907,17 +906,6 @@ $_prefs['default_msg_charset'] = array(
     'desc' => _("The default charset for messages with no charset information:"),
     'help' => 'prefs-default_msg_charset');
 
-// how do we display alternative mime parts?
-$_prefs['alternative_display'] = array(
-    'value' => 'none',
-    'locked' => false,
-    'shared' => false,
-    'type' => 'enum',
-    'enum' => array('above'   => _("Above the message text"),
-                    'below' => _("Below the message text"),
-                    'none'   => _("Not at all")),
-    'desc' => _("Where do you want to display links to alternative formats of a message?"));
-
 $_prefs['disposition_send_mdn'] = array(
     'value' => 0,
     'locked' => false,

diff --git a/imp/docs/UPGRADING b/imp/docs/UPGRADING
index 57080ae..9178094 100644 (file)
--- a/imp/docs/UPGRADING
+++ b/imp/docs/UPGRADING
@@ -25,6 +25,7 @@ supported.
 
 * servers.php has changed
 * imp_hook_vinfo has changed
+* alternative_display pref is gone.
 
 
 Upgrading IMP From 4.1.x To 4.2.x

diff --git a/imp/lib/Mime/Viewer/alternative.php b/imp/lib/Mime/Viewer/alternative.php
index 5448a8c..c08ce43 100644 (file)
--- a/imp/lib/Mime/Viewer/alternative.php
+++ b/imp/lib/Mime/Viewer/alternative.php
@@ -69,23 +69,6 @@ class IMP_Horde_Mime_Viewer_alternative extends Horde_Mime_Viewer_Driver
 
         $render_data = $this->_params['contents']->renderMIMEPart($display_id, 'inline');
 
-        /* Make sure there is at least one summary before showing the
-         * alternative parts. */
-        $alt_display = $GLOBALS['prefs']->getValue('alternative_display');
-        if ($alt_display != 'none') {
-            // TODO
-            //$icon = Horde::img('mime/binary.png', _("Multipart/alternative"), null, $GLOBALS['registry']->getImageDir('horde'));
-            switch ($alt_display) {
-            case 'above':
-                //$text = $status_msg . $text;
-                break;
-
-            case 'below':
-                //$text .= $status_msg;
-                break;
-            }
-        }
-
         return array(
             'data' => $render_data['data'],
             'ids' => array_keys($subparts),