From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 25 Nov 2008 07:46:57 +0000 (-0700)
Subject: Add 'forceinline' option.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=49452bb7f54ea45d09954941e55cb1fcf36232e6;p=horde.git

Add 'forceinline' option.
---

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Driver.php b/framework/Mime/lib/Horde/Mime/Viewer/Driver.php
index 4d1b5f6bd..00de55bf3 100644
--- 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 8a905703a..f5966cb96 100644
--- 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 6404476f6..1f19d0d0d 100644
--- 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 59fe12559..acf3606c4 100644
--- 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 b0912e442..60777f527 100644
--- 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 a21d390d4..2e81e46b7 100644
--- 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 4fcdc241c..3d5e95a74 100644
--- 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 ae8fc0782..6379bd5dd 100644
--- 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 4293447ad..e934c73f8 100644
--- 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 1101c3eb5..851b440f3 100644
--- 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 deeb51184..68874e4fd 100644
--- 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 b4b43e006..7cc8d17e0 100644
--- 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 a38693b1f..9b2c1e0a5 100644
--- 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 2d10bd1f1..e8c060548 100644
--- 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 88a9eb7be..132dd21bd 100644
--- 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 c4cb7ffd8..aa2da6e4e 100644
--- 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 9b6ffd00c..dee648771 100644
--- 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 1bd329c11..8ce2b8354 100644
--- 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 6201d9ae8..5d20cc368 100644
--- 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 129c172f0..775032226 100644
--- 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 5d7779b7b..561ebd58c 100644
--- 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 db0b466f2..d8f0fe7db 100644
--- 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 f55308995..44da544a5 100644
--- 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 a042b773e..d12822763 100644
--- 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 101613cee..5ea64130d 100644
--- 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 d6e95e390..1b2837ed0 100644
--- 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 d87801351..c0e4f4115 100644
--- 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 adaf44742..3f71b7d19 100644
--- 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 d159822e3..af49dbb7d 100644
--- 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