Add 'forceinline' option.

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Driver.php b/framework/Mime/lib/Horde/Mime/Viewer/Driver.php
index 4d1b5f6..00de55b 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/Driver.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/Driver.php
@@ -41,6 +41,7 @@ class Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => false,
         'info' => false,
         'inline' => false
@@ -192,7 +193,10 @@ class Horde_Mime_Viewer_Driver
             return $this->_capability[$mode];
 
         case 'inline':
-            return $this->getConfigParam('inline') && $this->_capability['inline'];
+            return $this->getConfigParam('inline') &&
+                ($this->_capability['forceinline'] ||
+                 ($this->_capability['inline'] &&
+                  ($this->_mimepart->getDisposition() == 'inline')));
 
         default:
             return false;

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/audio.php b/framework/Mime/lib/Horde/Mime/Viewer/audio.php
index 8a90570..f5966cb 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/audio.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/audio.php
@@ -20,6 +20,7 @@ class Horde_Mime_Viewer_audio extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/css.php b/framework/Mime/lib/Horde/Mime/Viewer/css.php
index 6404476..1f19d0d 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/css.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/css.php
@@ -23,6 +23,7 @@ class Horde_Mime_Viewer_css extends Horde_Mime_Viewer_source
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/deb.php b/framework/Mime/lib/Horde/Mime/Viewer/deb.php
index 59fe125..acf3606 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/deb.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/deb.php
@@ -20,6 +20,7 @@ class Horde_Mime_Viewer_deb extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => true,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/enriched.php b/framework/Mime/lib/Horde/Mime/Viewer/enriched.php
index b0912e4..60777f5 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/enriched.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/enriched.php
@@ -32,6 +32,7 @@ class Horde_Mime_Viewer_enriched extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/enscript.php b/framework/Mime/lib/Horde/Mime/Viewer/enscript.php
index a21d390..2e81e46 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/enscript.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/enscript.php
@@ -23,6 +23,7 @@ class Horde_Mime_Viewer_enscript extends Horde_Mime_Viewer_source
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/html.php b/framework/Mime/lib/Horde/Mime/Viewer/html.php
index 4fcdc24..3d5e95a 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/html.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/html.php
@@ -22,6 +22,7 @@ class Horde_Mime_Viewer_html extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/images.php b/framework/Mime/lib/Horde/Mime/Viewer/images.php
index ae8fc07..6379bd5 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/images.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/images.php
@@ -19,6 +19,7 @@ class Horde_Mime_Viewer_images extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/msexcel.php b/framework/Mime/lib/Horde/Mime/Viewer/msexcel.php
index 4293447..e934c73 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/msexcel.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/msexcel.php
@@ -20,6 +20,7 @@ class Horde_Mime_Viewer_msexcel extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php b/framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php
index 1101c3e..851b440 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/mspowerpoint.php
@@ -20,6 +20,7 @@ class Horde_Mime_Viewer_mspowerpoint extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/msword.php b/framework/Mime/lib/Horde/Mime/Viewer/msword.php
index deeb511..68874e4 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/msword.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/msword.php
@@ -20,6 +20,7 @@ class Horde_Mime_Viewer_msword extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/ooo.php b/framework/Mime/lib/Horde/Mime/Viewer/ooo.php
index b4b43e0..7cc8d17 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/ooo.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/ooo.php
@@ -21,6 +21,7 @@ class Horde_Mime_Viewer_ooo extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/pdf.php b/framework/Mime/lib/Horde/Mime/Viewer/pdf.php
index a38693b..9b2c1e0 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/pdf.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/pdf.php
@@ -21,6 +21,7 @@ class Horde_Mime_Viewer_pdf extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/php.php b/framework/Mime/lib/Horde/Mime/Viewer/php.php
index 2d10bd1..e8c0605 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/php.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/php.php
@@ -20,6 +20,7 @@ class Horde_Mime_Viewer_php extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/plain.php b/framework/Mime/lib/Horde/Mime/Viewer/plain.php
index 88a9eb7..132dd21 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/plain.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/plain.php
@@ -21,6 +21,7 @@ class Horde_Mime_Viewer_plain extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rar.php b/framework/Mime/lib/Horde/Mime/Viewer/rar.php
index c4cb7ff..aa2da6e 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/rar.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/rar.php
@@ -21,6 +21,7 @@ class Horde_Mime_Viewer_rar extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => true,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rfc822.php b/framework/Mime/lib/Horde/Mime/Viewer/rfc822.php
index 9b6ffd0..dee6487 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/rfc822.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/rfc822.php
@@ -20,6 +20,7 @@ class Horde_Mime_Viewer_rfc822 extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => true,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/richtext.php b/framework/Mime/lib/Horde/Mime/Viewer/richtext.php
index 1bd329c..8ce2b83 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/richtext.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/richtext.php
@@ -41,6 +41,7 @@ class Horde_Mime_Viewer_richtext extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rpm.php b/framework/Mime/lib/Horde/Mime/Viewer/rpm.php
index 6201d9a..5d20cc3 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/rpm.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/rpm.php
@@ -20,6 +20,7 @@ class Horde_Mime_Viewer_rpm extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => true,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/rtf.php b/framework/Mime/lib/Horde/Mime/Viewer/rtf.php
index 129c172..7750322 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/rtf.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/rtf.php
@@ -21,6 +21,7 @@ class Horde_Mime_Viewer_rtf extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/simple.php b/framework/Mime/lib/Horde/Mime/Viewer/simple.php
index 5d7779b..561ebd5 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/simple.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/simple.php
@@ -20,6 +20,7 @@ class Horde_Mime_Viewer_simple extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/smil.php b/framework/Mime/lib/Horde/Mime/Viewer/smil.php
index db0b466..d8f0fe7 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/smil.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/smil.php
@@ -33,6 +33,7 @@ class Horde_Mime_Viewer_smil extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => true,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php b/framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php
index f553089..44da544 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/srchighlite.php
@@ -25,6 +25,7 @@ class Horde_Mime_Viewer_srchighlite extends Horde_Mime_Viewer_source
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/tgz.php b/framework/Mime/lib/Horde/Mime/Viewer/tgz.php
index a042b77..d128227 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/tgz.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/tgz.php
@@ -19,6 +19,7 @@ class Horde_Mime_Viewer_tgz extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => true,
         'full' => false,
         'info' => true,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/tnef.php b/framework/Mime/lib/Horde/Mime/Viewer/tnef.php
index 101613c..5ea6413 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/tnef.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/tnef.php
@@ -21,6 +21,7 @@ class Horde_Mime_Viewer_tnef extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => true,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/vcard.php b/framework/Mime/lib/Horde/Mime/Viewer/vcard.php
index d6e95e3..1b2837e 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/vcard.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/vcard.php
@@ -19,6 +19,7 @@ class Horde_Mime_Viewer_vcard extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/webcpp.php b/framework/Mime/lib/Horde/Mime/Viewer/webcpp.php
index d878013..c0e4f41 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/webcpp.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/webcpp.php
@@ -22,6 +22,7 @@ class Horde_Mime_Viewer_webcpp extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => true

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php b/framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php
index adaf447..3f71b7d 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/wordperfect.php
@@ -22,6 +22,7 @@ class Horde_Mime_Viewer_wordperfect extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => false,
         'full' => true,
         'info' => false,
         'inline' => false

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/zip.php b/framework/Mime/lib/Horde/Mime/Viewer/zip.php
index d159822..af49dbb 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/zip.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/zip.php
@@ -21,6 +21,7 @@ class Horde_Mime_Viewer_zip extends Horde_Mime_Viewer_Driver
      */
     protected $_capability = array(
         'embedded' => false,
+        'forceinline' => true,
         'full' => true,
         'info' => false,
         'inline' => true