From 2c18dffdfccbe62a40350b568597e1a90bbe998a Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 7 May 2010 13:25:08 -0600
Subject: [PATCH] Fix passphrase dialog display in DIMP preview pane

---
 imp/lib/Ajax/Imple/PassphraseDialog.php |  2 +-
 imp/lib/Views/ShowMessage.php           | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/imp/lib/Ajax/Imple/PassphraseDialog.php b/imp/lib/Ajax/Imple/PassphraseDialog.php
index b81903ec6..e85021d67 100644
--- a/imp/lib/Ajax/Imple/PassphraseDialog.php
+++ b/imp/lib/Ajax/Imple/PassphraseDialog.php
@@ -98,7 +98,7 @@ class IMP_Ajax_Imple_PassphraseDialog extends Horde_Ajax_Imple_Base
             $js = '$("' . $this->_domid . '").observe("click", function(e) { ' . $js . 'e.stop(); })';
         }
 
-        Horde::addInlineScript(array($js), 'dom');
+        Horde::addInlineScript(array($js));
     }
 
     /**
diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php
index 39e761f4e..7bf07edc3 100644
--- a/imp/lib/Views/ShowMessage.php
+++ b/imp/lib/Views/ShowMessage.php
@@ -309,13 +309,18 @@ class IMP_Views_ShowMessage
                     $result['js'] = array_merge($result['js'], $res[1]);
                 }
             } catch (Horde_Exception_HookNotSet $e) {}
-        } elseif (!$preview) {
+
+            /* Need to grab cached inline scripts. */
+            Horde::startBuffer();
+            Horde::outputInlineScript(true);
+            if ($js_inline = Horde::endBuffer()) {
+                $result['js'][] = $js_inline;
+            }
+        } else {
             try {
                 $result = Horde::callHook('dimp_messageview', array($result), 'imp');
             } catch (Horde_Exception_HookNotSet $e) {}
-        }
 
-        if (!$preview) {
             $result['list_info'] = $imp_ui->getListInformation($mime_headers);
             $result['save_as'] = Horde::downloadUrl(htmlspecialchars_decode($result['subject']), array_merge(array('actionID' => 'save_message'), IMP::getIMPMboxParameters($mailbox, $uid, $mailbox)));
         }
-- 
2.11.0