Use injector to load IMP_Filter

diff --git a/imp/lib/Ajax/Application.php b/imp/lib/Ajax/Application.php
index 71b19d2..ef03162 100644 (file)
--- a/imp/lib/Ajax/Application.php
+++ b/imp/lib/Ajax/Application.php
@@ -817,14 +817,13 @@ class IMP_Ajax_Application extends Horde_Core_Ajax_Application
             return false;
         }
 
-        $imp_filter = new IMP_Filter();
         $result = false;
 
         if ($this->_vars->blacklist) {
             $change = $this->_changed(false);
             if (!is_null($change)) {
                 try {
-                    if ($imp_filter->blacklistMessage($indices, false)) {
+                    if ($GLOBALS['injector']->getInstance('IMP_Filter')->blacklistMessage($indices, false)) {
                         $result = $this->_generateDeleteResult($indices, $change);
                     }
                 } catch (Horde_Exception $e) {
@@ -833,7 +832,7 @@ class IMP_Ajax_Application extends Horde_Core_Ajax_Application
             }
         } else {
             try {
-                $imp_filter->whitelistMessage($indices, false);
+                $GLOBALS['injector']->getInstance('IMP_Filter')->whitelistMessage($indices, false);
             } catch (Horde_Exception $e) {
                 $result = $this->_checkUidvalidity();
             }

diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php
index 1838a42..e7646f8 100644 (file)
--- a/imp/lib/Auth.php
+++ b/imp/lib/Auth.php
@@ -500,9 +500,7 @@ class IMP_Auth
         /* If the user wants to run filters on login, make sure they get
            run. */
         if ($GLOBALS['prefs']->getValue('filter_on_login')) {
-            /* Run filters. */
-            $imp_filter = new IMP_Filter();
-            $imp_filter->filter('INBOX');
+            $GLOBALS['injector']->getInstance('IMP_Filter')->filter('INBOX');
         }
 
         /* Check for drafts due to session timeouts. */

diff --git a/imp/lib/Block/Newmail.php b/imp/lib/Block/Newmail.php
index 9ad0628..1246f3f 100644 (file)
--- a/imp/lib/Block/Newmail.php
+++ b/imp/lib/Block/Newmail.php
@@ -20,8 +20,7 @@ class IMP_Block_Newmail extends Horde_Block
     {
         /* Filter on INBOX display, if requested. */
         if ($GLOBALS['prefs']->getValue('filter_on_display')) {
-            $imp_filter = new IMP_Filter();
-            $imp_filter->filter('INBOX');
+            $GLOBALS['injector']->getInstance('IMP_Filter')->filter('INBOX');
         }
 
         $query = new Horde_Imap_Client_Search_Query();

diff --git a/imp/lib/Block/tree_folders.php b/imp/lib/Block/tree_folders.php
index 3cf1c16..2be8fff 100644 (file)
--- a/imp/lib/Block/tree_folders.php
+++ b/imp/lib/Block/tree_folders.php
@@ -24,8 +24,7 @@ class Horde_Block_imp_tree_folders extends Horde_Block
     {
         /* Run filters now */
         if ($GLOBALS['prefs']->getValue('filter_on_display')) {
-            $imp_filter = new IMP_Filter();
-            $imp_filter->filter('INBOX');
+            $GLOBALS['injector']->getInstance('IMP_Filter')->filter('INBOX');
         }
 
         /* Cache some additional values. */

diff --git a/imp/lib/Ui/Block.php b/imp/lib/Ui/Block.php
index 32e1398..a6ee121 100644 (file)
--- a/imp/lib/Ui/Block.php
+++ b/imp/lib/Ui/Block.php
@@ -29,8 +29,7 @@ class IMP_Ui_Block
     {
         /* Filter on INBOX display, if requested. */
         if ($GLOBALS['prefs']->getValue('filter_on_display')) {
-            $imp_filter = new IMP_Filter();
-            $imp_filter->filter('INBOX');
+            $GLOBALS['injector']->getInstance('IMP_Filter')->filter('INBOX');
         }
 
         $imp_imap = $GLOBALS['injector']->getInstance('IMP_Imap')->getOb();

diff --git a/imp/lib/Views/ListMessages.php b/imp/lib/Views/ListMessages.php
index 18808fc..02449ab 100644 (file)
--- a/imp/lib/Views/ListMessages.php
+++ b/imp/lib/Views/ListMessages.php
@@ -85,8 +85,7 @@ class IMP_Views_ListMessages
             !empty($args['applyfilter']) ||
             (($mbox == 'INBOX') &&
              $GLOBALS['prefs']->getValue('filter_on_display'))) {
-            $imp_filter = new IMP_Filter();
-            $imp_filter->filter($mbox);
+            $GLOBALS['injector']->getInstance('IMP_Filter')->filter($mbox);
         }
 
         /* Generate the sorted mailbox list now. */

diff --git a/imp/mailbox.php b/imp/mailbox.php
index 31f4f81..e1a373b 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -101,13 +101,11 @@ case 'change_sort':
     break;
 
 case 'blacklist':
-    $imp_filter = new IMP_Filter();
-    $imp_filter->blacklistMessage($indices);
+    $injector->getInstance('IMP_Filter')->blacklistMessage($indices);
     break;
 
 case 'whitelist':
-    $imp_filter = new IMP_Filter();
-    $imp_filter->whitelistMessage($indices);
+    $injector->getInstance('IMP_Filter')->whitelistMessage($indices);
     break;
 
 case 'spam_report':
@@ -207,8 +205,7 @@ if (!$readonly && !empty($_SESSION['imp']['filteravail'])) {
 
 /* Run filters now. */
 if ($do_filter) {
-    $imp_filter = new IMP_Filter();
-    $imp_filter->filter(IMP::$mailbox);
+    $injector->getInstance('IMP_Filter')->filter(IMP::$mailbox);
 }
 
 /* Generate folder options list. */

diff --git a/imp/message.php b/imp/message.php
index 2ff2013..7e98176 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -78,11 +78,10 @@ $imp_ui = new IMP_Ui_Message();
 switch ($vars->actionID) {
 case 'blacklist':
 case 'whitelist':
-    $imp_filter = new IMP_Filter();
     if ($vars->actionID == 'blacklist') {
-        $imp_filter->blacklistMessage($indices);
+        $injector->getInstance('IMP_Filter')->blacklistMessage($indices);
     } else {
-        $imp_filter->whitelistMessage($indices);
+        $injector->getInstance('IMP_Filter')->whitelistMessage($indices);
     }
     break;