Prevent endless recursive sent subfolder names - see: http://thread.gmane.org/gmane...

[squirrelmail.git] / plugins / filters / setup.php

diff --git a/plugins/filters/setup.php b/plugins/filters/setup.php
index 153aaaab513b01730e5eb69a4b2a612db0e022f0..98984327a0230742a7914c0cd60c93a0d328e7a5 100644 (file)
--- a/plugins/filters/setup.php
+++ b/plugins/filters/setup.php
@@ -1,8 +1,11 @@
 <?php
+
 /**
- * @version $Id$
- * @copyright (c) 1999-2005 The SquirrelMail Project Team
+ * Message and Spam Filter Plugin - Setup
+ *
+ * @copyright 1999-2012 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package plugins
  * @subpackage filters
  */
@@ -12,8 +15,15 @@
  * @access private
  */
 function squirrelmail_plugin_init_filters() {
-    include_once(SM_PATH . 'plugins/filters/filters.php');
-    filters_init_hooks ();
+    global $squirrelmail_plugin_hooks;
+
+    $squirrelmail_plugin_hooks['left_main_before']['filters'] = 'start_filters_hook';
+    $squirrelmail_plugin_hooks['right_main_after_header']['filters'] = 'start_filters_hook';
+    $squirrelmail_plugin_hooks['optpage_register_block']['filters'] = 'filters_optpage_register_block_hook';
+    $squirrelmail_plugin_hooks['special_mailbox']['filters'] = 'filters_special_mailbox';
+    $squirrelmail_plugin_hooks['rename_or_delete_folder']['filters'] = 'update_for_folder_hook';
+    $squirrelmail_plugin_hooks['template_construct_login_webmail.tpl']['filters'] = 'start_filters_hook';
+    $squirrelmail_plugin_hooks['folder_status']['filters'] = 'filters_folder_status';
 }
 
 /**
@@ -43,16 +53,14 @@ function filters_optpage_register_block_hook() {
  */
 function start_filters_hook($args) {
     include_once(SM_PATH . 'plugins/filters/filters.php');
-    start_filters ();
+    start_filters ($args);
 }
 
 /**
  * Called by hook to Update filters when Folders Change
  * @access private
  */
-function update_for_folder_hook() {
+function update_for_folder_hook($args) {
     include_once(SM_PATH . 'plugins/filters/filters.php');
-    update_for_folder ();
+    update_for_folder ($args);
 }
-
-?>
\ No newline at end of file