From 3bfda815384202bbb7f994373509cadccb023418 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 12 Nov 2008 14:45:16 -0700
Subject: [PATCH] Use canDisplayInline().

---
 imp/lib/Mime/Viewer/alternative.php | 11 +++--------
 imp/lib/Mime/Viewer/appledouble.php | 12 ++++--------
 imp/lib/Mime/Viewer/related.php     |  6 +-----
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/imp/lib/Mime/Viewer/alternative.php b/imp/lib/Mime/Viewer/alternative.php
index 2dd2d769a..bec5621d7 100644
--- a/imp/lib/Mime/Viewer/alternative.php
+++ b/imp/lib/Mime/Viewer/alternative.php
@@ -42,16 +42,11 @@ class IMP_Horde_Mime_Viewer_alternative extends Horde_Mime_Viewer_Driver
 
         /* Look for a displayable part. RFC 2046: show the LAST choice that
          * can be displayed inline. */
-        foreach ($subparts as $mime_id => $mime_type) {
+        foreach (array_keys($subparts) as $mime_id) {
             if (is_null($last_id) || (strpos($mime_id, $last_id) !== 0)) {
                 $last_id = null;
-                $viewer = Horde_Mime_Viewer::factory($mime_type);
-
-                if ($viewer->canRender('inline')) {
-                    $mime_part = $this->_params['contents']->getMIMEPart($mime_id, array('nocontents' => true, 'nodecode' => true));
-                    if ($mime_part->getDisposition() == 'inline') {
-                        $display_id = $last_id = $mime_id;
-                    }
+                if ($this->_params['contents']->canDisplayInline($mime_id)) {
+                    $display_id = $last_id = $mime_id;
                 }
             }
         }
diff --git a/imp/lib/Mime/Viewer/appledouble.php b/imp/lib/Mime/Viewer/appledouble.php
index 794bcd054..2a68a3f47 100644
--- a/imp/lib/Mime/Viewer/appledouble.php
+++ b/imp/lib/Mime/Viewer/appledouble.php
@@ -85,14 +85,10 @@ class IMP_Horde_Mime_Viewer_appledouble extends Horde_Mime_Viewer_Driver
         $ids = array($mime_id, $applefile_id);
 
         /* For inline viewing, attempt to display the data inline. */
-        if ($inline) {
-            $viewer = Horde_Mime_Viewer::factory($data_part->getType());
-            if (($viewer->canRender('inline') &&
-                 ($data_part->getDisposition() == 'inline')) ||
-                $viewer->canRender('info')) {
-                $can_display = true;
-                $status['text'][] = _("The contents of the Macintosh file are below.");
-            }
+        if ($inline &&
+            $this->_params['contents']->canDisplayInline($data_part, true)) {
+            $can_display = true;
+            $status['text'][] = _("The contents of the Macintosh file are below.");
         }
 
         if (!$can_display) {
diff --git a/imp/lib/Mime/Viewer/related.php b/imp/lib/Mime/Viewer/related.php
index d5217c909..4717008ba 100644
--- a/imp/lib/Mime/Viewer/related.php
+++ b/imp/lib/Mime/Viewer/related.php
@@ -91,11 +91,7 @@ class IMP_Horde_Mime_Viewer_related extends Horde_Mime_Viewer_Driver
         /* Only display if the start part (normally text/html) can be
          * displayed inline -OR- we are viewing this part as an attachment. */
         if (!$can_display) {
-            $viewer = Horde_Mime_Viewer::factory($subparts[$id]);
-            if ($viewer->canRender('inline')) {
-                $mime_part = $this->_mimepart->getPart($id);
-                $can_display = ($mime_part->getDisposition() == 'inline');
-            }
+            $can_display = $this->_params['contents']->canDisplayInline($id);
         }
 
         if ($can_display) {
-- 
2.11.0