From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 4 May 2010 09:16:43 +0000 (-0600)
Subject: IMP_Imap injector fixes
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9c8e6c13d053c63519a9262fffe833e5baa1abc5;p=horde.git

IMP_Imap injector fixes
---

diff --git a/imp/compose-mimp.php b/imp/compose-mimp.php
index 23ca8ba99..4c46ca5bb 100644
--- a/imp/compose-mimp.php
+++ b/imp/compose-mimp.php
@@ -59,6 +59,7 @@ $draft = IMP::folderPref($prefs->getValue('drafts_folder'), true);
 $sent_mail_folder = $identity->getValue('sent_mail_folder');
 
 /* Determine if mailboxes are readonly. */
+$imp_imap = $injector->getInstance('IMP_Imap')->getOb();
 $readonly_drafts = empty($draft)
     ? false
     : $imp_imap->isReadOnly($draft);
diff --git a/imp/mailbox-mimp.php b/imp/mailbox-mimp.php
index b3c174c18..c8b42b69b 100644
--- a/imp/mailbox-mimp.php
+++ b/imp/mailbox-mimp.php
@@ -34,6 +34,7 @@ $t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 
 /* Determine if mailbox is readonly. */
+$imp_imap = $injector->getInstance('IMP_Imap')->getOb();
 $readonly = $imp_imap->isReadOnly(IMP::$mailbox);
 
 /* Get the base URL for this page. */
diff --git a/imp/message-mimp.php b/imp/message-mimp.php
index e5f4b9645..7b213abc6 100644
--- a/imp/message-mimp.php
+++ b/imp/message-mimp.php
@@ -31,7 +31,7 @@ if (!$imp_mailbox->isValidIndex(false)) {
     exit;
 }
 
-$readonly = $imp_imap->isReadOnly(IMP::$mailbox);
+$readonly = $injector->getInstance('IMP_Imap')->getOb()->isReadOnly(IMP::$mailbox);
 
 $imp_ui_mimp = $injector->getInstance('IMP_Ui_Mimp');
 $imp_hdr_ui = new IMP_Ui_Headers();
diff --git a/imp/scripts/query-imap-cache.php b/imp/scripts/query-imap-cache.php
index 8f728fd93..616f6fda8 100755
--- a/imp/scripts/query-imap-cache.php
+++ b/imp/scripts/query-imap-cache.php
@@ -40,6 +40,8 @@ foreach ($options[0] as $val) {
     }
 }
 
+$imp_imap = $injector->getInstance('IMP_Imap')->getOb();
+
 if (is_null($server)) {
     $keys = array_keys($imp_imap->loadServerConfig());