removed orbl and added 2 new osirusoft filters

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

diff --git a/plugins/filters/setup.php b/plugins/filters/setup.php
index 03decc5a28e9b1e5d2d7f95bfd35ec4c10ea84bc..2557f409adb774244efb742e01cc1204273a690a 100644 (file)
--- a/plugins/filters/setup.php
+++ b/plugins/filters/setup.php
@@ -1,28 +1,28 @@
 <?php
-   /*
-    *  Message and Spam Filter Plugin
-    *  Copyright (c) 1999-2001 The Squirrelmail Development Team
-    *  Licensed under the GNU GPL. For full terms see the file COPYING.
-    *
-    *  This plugin filters your inbox into different folders based upon given
-    *  criteria.  It is most useful for people who are subscibed to mailing lists
-    *  to help organize their messages.  The argument stands that filtering is
-    *  not the place of the client, which is why this has been made a plugin for
-    *  SquirrelMail.  You may be better off using products such as Sieve or
-    *  Procmail to do your filtering so it happens even when SquirrelMail isn't
-    *  running.
-    *
-    *  If you need help with this, or see improvements that can be made, please
-    *  email me directly at the address above.  I definately welcome suggestions
-    *  and comments.  This plugin, as is the case with all SquirrelMail plugins,
-    *  is not directly supported by the developers.  Please come to me off the
-    *  mailing list if you have trouble with it.
-    *
-    *  Also view plugins/README.plugins for more information.
-    *
-    *  $Id$
-    *
-    */
+/**
+ * Message and Spam Filter Plugin
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * This plugin filters your inbox into different folders based upon given
+ * criteria.  It is most useful for people who are subscibed to mailing lists
+ * to help organize their messages.  The argument stands that filtering is
+ * not the place of the client, which is why this has been made a plugin for
+ * SquirrelMail.  You may be better off using products such as Sieve or
+ * Procmail to do your filtering so it happens even when SquirrelMail isn't
+ * running.
+ *
+ * If you need help with this, or see improvements that can be made, please
+ * email me directly at the address above.  I definately welcome suggestions
+ * and comments.  This plugin, as is the case with all SquirrelMail plugins,
+ * is not directly supported by the developers.  Please come to me off the
+ * mailing list if you have trouble with it.
+ *
+ * Also view plugins/README.plugins for more information.
+ *
+ * $Id$
+ */
 
    // Set this to true if you have problems -- check the README file
    // Note:  This doesn't work all of the time (No idea why)
@@ -49,7 +49,7 @@
    // the header (lots of false alarms here tho).
 
    global $SpamFilters_YourHop;
-   $SpamFilters_YourHop = 'by firewall.persistence.com';
+   $SpamFilters_YourHop = ' ';
 
    // A cache of IPs we've already checked or are known bad boys or good boys
    // ie. $SpamFilters_DNScache["210.54.220.18"] = true;
@@ -67,17 +67,27 @@
       $squirrelmail_plugin_hooks['left_main_before']['filters'] = 'start_filters';
       if ($mailbox == 'INBOX')
          $squirrelmail_plugin_hooks["right_main_after_header"]['filters'] = 'start_filters';
-      $squirrelmail_plugin_hooks['options_register']['filters'] = 'squirrelmail_plugin_register';
+      $squirrelmail_plugin_hooks['optpage_register_block']['filters'] = 'squirrelmail_plugin_optpage_register_block';
    }
 
-   function squirrelmail_plugin_register() {
-      global $optionpages;
+   function squirrelmail_plugin_optpage_register_block() {
+      global $optpage_blocks;
+      global $AllowSpamFilters;
 
-      $optionpages[] = array(
+      $optpage_blocks[] = array(
          'name' => _("Message Filters"),
          'url'  => '../plugins/filters/options.php',
          'desc' => _("Filtering enables messages with different criteria to be automatically filtered into different folders for easier organization."),
          'js'   => false
       );
+
+      if ($AllowSpamFilters) {
+         $optpage_blocks[] = array(
+            'name' => _("SPAM Filters"),
+            'url'  => '../plugins/filters/spamoptions.php',
+            'desc' => _("SPAM filters allow you to select from various DNS based blacklists to detect junk email in your INBOX and move it to another folder (like Trash)."),
+            'js'   => false
+         );
+      }
    }
-?>
\ No newline at end of file
+?>