Unneeded globals usage.

diff --git a/imp/compose-mimp.php b/imp/compose-mimp.php
index 4ced357..1e9fad3 100644 (file)
--- a/imp/compose-mimp.php
+++ b/imp/compose-mimp.php
@@ -279,7 +279,7 @@ case _("Send"):
         );
 
         try {
-            if ($imp_compose->buildAndSendMessage($message, $header, $GLOBALS['registry']->getEmailCharset(), false, $options)) {
+            if ($imp_compose->buildAndSendMessage($message, $header, $registry->getEmailCharset(), false, $options)) {
                 $imp_compose->destroy('send');
 
                 $notification->push(_("Message sent successfully."), 'horde.success');

diff --git a/imp/mailbox.php b/imp/mailbox.php
index 8f1403b..33a0a39 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -746,7 +746,7 @@ while (list(,$ob) = each($mbox_info['overview'])) {
             }
 
             if (!$preview_tooltip) {
-                $ptext = $GLOBALS['injector']->getInstance('Horde_Text_Filter')->filter($ptext, 'text2html', array(
+                $ptext = $injector->getInstance('Horde_Text_Filter')->filter($ptext, 'text2html', array(
                     'parselevel' => Horde_Text_Filter_Text2html::NOHTML
                 ));
             }

diff --git a/imp/message-mimp.php b/imp/message-mimp.php
index 6509201..9201e26 100644 (file)
--- a/imp/message-mimp.php
+++ b/imp/message-mimp.php
@@ -254,7 +254,7 @@ if ($prefs->getValue('mimp_preview_msg') &&
     $t->set('fullmsg_link', $self_link->copy()->add('fullmsg', 1));
 }
 
-$t->set('msg', nl2br($GLOBALS['injector']->getInstance('Horde_Text_Filter')->filter($msg_text, 'space2html', array('encode' => true))));
+$t->set('msg', nl2br($injector->getInstance('Horde_Text_Filter')->filter($msg_text, 'space2html', array('encode' => true))));
 
 $compose_params = array(
     'identity' => $identity,

diff --git a/imp/rss.php b/imp/rss.php
index 7358a86..9de575a 100644 (file)
--- a/imp/rss.php
+++ b/imp/rss.php
@@ -74,7 +74,7 @@ if ($ids->count()) {
             'description' => isset($ob['preview']) ? $ob['preview'] : '',
             'url' => Horde::applicationURL(IMP::generateIMPUrl('message.php', $mailbox, $ob['uid'], $mailbox), true, -1),
             'fromAddr' => $from_addr['fullfrom'],
-            'toAddr' => Horde_Mime_Address::addrArray2String(isset($ob['envelope']['to']) ? $ob['envelope']['to'] : array(), array('charset' => $GLOBALS['registry']->getCharset()))
+            'toAddr' => Horde_Mime_Address::addrArray2String(isset($ob['envelope']['to']) ? $ob['envelope']['to'] : array(), array('charset' => $registry->getCharset()))
         ));
     }
 }