From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 10 Aug 2010 20:29:55 +0000 (-0600)
Subject: Don't show compressed contents info in full mode.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=740ab415f38b1e39742f9e032aebf2b0bf0f91e8;p=horde.git

Don't show compressed contents info in full mode.

This is informational data only.  Full mode is meant for a viewable
representation of the data itself, not information about the data.
---

diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Deb.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Deb.php
index 154d08688..c9eb7cea4 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Deb.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Deb.php
@@ -21,7 +21,7 @@ class Horde_Mime_Viewer_Deb extends Horde_Mime_Viewer_Base
      * @var array
      */
     protected $_capability = array(
-        'full' => true,
+        'full' => false,
         'info' => true,
         'inline' => false,
         'raw' => false
@@ -62,16 +62,6 @@ class Horde_Mime_Viewer_Deb extends Horde_Mime_Viewer_Base
     }
 
     /**
-     * Return the full rendered version of the Horde_Mime_Part object.
-     *
-     * @return array  See parent::render().
-     */
-    protected function _render()
-    {
-        return $this->_renderFullReturn($this->_renderInfo());
-    }
-
-    /**
      * Return the rendered information about the Horde_Mime_Part object.
      *
      * @return array  See parent::render().
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rar.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rar.php
index 2e84aff68..474bf6f4a 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rar.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rar.php
@@ -22,7 +22,7 @@ class Horde_Mime_Viewer_Rar extends Horde_Mime_Viewer_Base
      * @var array
      */
     protected $_capability = array(
-        'full' => true,
+        'full' => false,
         'info' => true,
         'inline' => false,
         'raw' => false
@@ -57,16 +57,6 @@ class Horde_Mime_Viewer_Rar extends Horde_Mime_Viewer_Base
     }
 
     /**
-     * Return the full rendered version of the Horde_Mime_Part object.
-     *
-     * @return array  See parent::render().
-     */
-    protected function _render()
-    {
-        return $this->_renderFullReturn($this->_renderInfo());
-    }
-
-    /**
      * Return the rendered information about the Horde_Mime_Part object.
      *
      * @return array  See parent::render().
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rpm.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rpm.php
index 3427ada69..296d32afc 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rpm.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Rpm.php
@@ -21,7 +21,7 @@ class Horde_Mime_Viewer_Rpm extends Horde_Mime_Viewer_Base
      * @var array
      */
     protected $_capability = array(
-        'full' => true,
+        'full' => false,
         'info' => true,
         'inline' => false,
         'raw' => false
@@ -62,16 +62,6 @@ class Horde_Mime_Viewer_Rpm extends Horde_Mime_Viewer_Base
     }
 
     /**
-     * Return the full rendered version of the Horde_Mime_Part object.
-     *
-     * @return array  See parent::render().
-     */
-    protected function _render()
-    {
-        return $this->_renderFullReturn($this->_renderInfo());
-    }
-
-    /**
      * Return the rendered information about the Horde_Mime_Part object.
      *
      * @return array  See parent::render().
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Tgz.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Tgz.php
index e7a4a56eb..ed91cc027 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Tgz.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Tgz.php
@@ -22,7 +22,7 @@ class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Base
      * @var array
      */
     protected $_capability = array(
-        'full' => true,
+        'full' => false,
         'info' => true,
         'inline' => false,
         'raw' => false
@@ -59,17 +59,6 @@ class Horde_Mime_Viewer_Tgz extends Horde_Mime_Viewer_Base
     }
 
     /**
-     * Return the full rendered version of the Horde_Mime_Part object.
-     *
-     * @return array  See parent::render().
-     * @throws Horde_Exception
-     */
-    protected function _render()
-    {
-        return $this->_renderFullReturn($this->_renderInfo());
-    }
-
-    /**
      * Return the rendered information about the Horde_Mime_Part object.
      *
      * @return array  See parent::render().
diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Zip.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Zip.php
index b7c9a874f..9d1ba0e0c 100644
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Zip.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Zip.php
@@ -22,7 +22,7 @@ class Horde_Mime_Viewer_Zip extends Horde_Mime_Viewer_Base
      * @var array
      */
     protected $_capability = array(
-        'full' => true,
+        'full' => false,
         'info' => true,
         'inline' => false,
         'raw' => false
@@ -66,17 +66,6 @@ class Horde_Mime_Viewer_Zip extends Horde_Mime_Viewer_Base
     }
 
     /**
-     * Return the full rendered version of the Horde_Mime_Part object.
-     *
-     * @return array  See parent::render().
-     * @throws Horde_Exception
-     */
-    protected function _render()
-    {
-        return $this->_renderFullReturn($this->_toHTML());
-    }
-
-    /**
      * Return the rendered information about the Horde_Mime_Part object.
      *
      * @return array  See parent::render().
@@ -84,17 +73,6 @@ class Horde_Mime_Viewer_Zip extends Horde_Mime_Viewer_Base
      */
     protected function _renderInfo()
     {
-        return $this->_toHTML();
-    }
-
-    /**
-     * Converts the ZIP file to an HTML display.
-     *
-     * @return array  See parent::render().
-     * @throws Horde_Exception
-     */
-    protected function _toHTML()
-    {
         $charset = $this->getConfigParam('charset');
         $contents = $this->_mimepart->getContents();
 
diff --git a/imp/lib/Mime/Viewer/Zip.php b/imp/lib/Mime/Viewer/Zip.php
index 1e5e10588..c71d63e12 100644
--- a/imp/lib/Mime/Viewer/Zip.php
+++ b/imp/lib/Mime/Viewer/Zip.php
@@ -30,8 +30,7 @@ class IMP_Mime_Viewer_Zip extends Horde_Mime_Viewer_Zip
     protected function _render()
     {
         if (!($zip_atc = Horde_Util::getFormData('zip_attachment'))) {
-            $this->_callback = array($this, '_IMPcallback');
-            return parent::_render();
+            return array();
         }
 
         /* Send the requested file. Its position in the zip archive is located
@@ -82,7 +81,7 @@ class IMP_Mime_Viewer_Zip extends Horde_Mime_Viewer_Zip
     }
 
     /**
-     * The function to use as a callback to _toHTML().
+     * The function to use as a callback to _renderInfo().
      *
      * @param integer $key  The position of the file in the zip archive.
      * @param array $val    The information array for the archived file.