Massive update to plugin system architecture. Please test! Not all core plugins...
[squirrelmail.git] / plugins / filters / filters.php
index 7b517f6dbcaaffdb1c69bc0f8a783fcacd35b3d6..f10e0646bb267b737e86d4f2399325f71b7c4ecd 100644 (file)
 <?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.
-    **
-    **/
-
-    function filters_sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
-        global $color, $squirrelmail_language, $imap_general_debug;
-
-        $data = array();
-        $size = 0;
-
-        do {
-            $read = fgets($imap_stream, 9096);
-            if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
-                break;  // found end of reply
-            }
-
-            // Continue if needed for this single line
-            while (strpos($read, "\n") === false) {
-                $read .= fgets($imap_stream, 9096);
-            }
+/**
+ * Message and Spam Filter Plugin - Filtering Functions
+ *
+ * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage filters
+ */
+
+/**
+ * do not allow to call this file directly
+ */
+if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
+     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+    header("Location: ../../src/login.php");
+    die();
+}
+
+/** load globals */
+global $UseSeparateImapConnection,
+    $AllowSpamFilters, $SpamFilters_YourHop, $SpamFilters_ShowCommercial,
+    $SpamFilters_DNScache, $SpamFilters_BulkQuery, $SpamFilters_SharedCache,
+    $SpamFilters_CacheTTL;
+
+/**
+ * load required functions. Plugin depends on IMAP functions and they are not 
+ * loaded in src/webmail.php
+ */
+include_once (SM_PATH . 'functions/imap.php');
+
+/** load default config */
+if (file_exists(SM_PATH . 'plugins/filters/config_default.php')) {
+    include_once (SM_PATH . 'plugins/filters/config_default.php');
+} else {
+    // default config was removed.
+    $UseSeparateImapConnection = false;
+    $AllowSpamFilters = true;
+    $SpamFilters_YourHop = ' ';
+    $SpamFilters_ShowCommercial = false;
+    $SpamFilters_DNScache = array();
+    $SpamFilters_BulkQuery = '';
+    $SpamFilters_SharedCache = true;
+    $SpamFilters_CacheTTL = 7200;
+}
+
+if (file_exists(SM_PATH . 'config/filters_config.php')) {
+    include_once (SM_PATH . 'config/filters_config.php');
+} elseif (file_exists(SM_PATH . 'plugins/filters/config.php')) {
+    include_once (SM_PATH . 'plugins/filters/config.php');
+}
+
+/**
+ * Register option blocks
+ * @access private
+ */
+function filters_optpage_register_block() {
+    global $optpage_blocks, $AllowSpamFilters;
+
+    $optpage_blocks[] = array(
+        'name' => _("Message Filters"),
+        'url'  => SM_PATH . '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'  => SM_PATH . '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
+        );
+    }
+}
 
-            $data[] = $read;
+/* Receive the status of the folder and do something with it */
+function filters_folder_status($statusarr) {
 
-            if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
-                $size = $regs[1];
-                if ($imap_general_debug) {
-                echo "<small><tt><font color=\"#CC0000\">Size is $size</font></tt></small><br>\n";
-                }
+    global $filter_inbox_count;
+    if (empty($filter_inbox_count)) $filter_inbox_count=0;
 
-                $total_size = 0;
-                do {
-                $read = fgets($imap_stream, 9096);
-                if ($imap_general_debug) {
-                    echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
-                    flush();
-                }
-                $data[] = $read;
-                $total_size += strlen($read);
-                } while ($total_size < $size);
+    if ($statusarr['MAILBOX'] == 'INBOX')
+    {
+     if (!empty($statusarr['MESSAGES'])) $filter_inbox_count=$statusarr['MESSAGES'];
+    }
+}
+
+/**
+ * Saves the DNS Cache to disk
+ * @access private
+ */
+function filters_SaveCache () {
+    global $data_dir, $SpamFilters_DNScache;
+
+    if (file_exists($data_dir . '/dnscache')) {
+        $fp = fopen($data_dir . '/dnscache', 'r');
+    } else {
+        $fp = false;
+    }
+    if ($fp) {
+        flock($fp,LOCK_EX);
+    } else {
+       $fp = fopen($data_dir . '/dnscache', 'w+');
+       fclose($fp);
+       $fp = fopen($data_dir . '/dnscache', 'r');
+       flock($fp,LOCK_EX);
+    }
+    $fp1 = fopen($data_dir . '/dnscache', 'w+');
 
-                $size = 0;
-            }
-            // For debugging purposes
-            if ($imap_general_debug) {
-                echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
-                flush();
+    foreach ($SpamFilters_DNScache as $Key=> $Value) {
+       $tstr = $Key . ',' . $Value['L'] . ',' . $Value['T'] . "\n";
+       fputs ($fp1, $tstr);
+    }
+    fclose($fp1);
+    flock($fp,LOCK_UN);
+    fclose($fp);
+}
+
+/**
+ * Loads the DNS Cache from disk
+ * @access private
+ */
+function filters_LoadCache () {
+    global $data_dir, $SpamFilters_DNScache;
+
+    if (file_exists($data_dir . '/dnscache')) {
+        $SpamFilters_DNScache = array();
+        if ($fp = fopen ($data_dir . '/dnscache', 'r')) {
+            flock($fp,LOCK_SH);
+            while ($data = fgetcsv($fp,1024)) {
+               if ($data[2] > time()) {
+                  $SpamFilters_DNScache[$data[0]]['L'] = $data[1];
+                  $SpamFilters_DNScache[$data[0]]['T'] = $data[2];
+               }
             }
-        } while (true);
-
-        $response = $regs[1];
-        $message = trim($regs[2]);
-
-        if ($imap_general_debug) echo '--<br>';
-
-        if ($handle_errors == false)
-            return $data;
-
-        if ($response == 'NO') {
-            // ignore this error from m$ exchange, it is not fatal (aka bug)
-            if (strstr($message, 'command resulted in') === false) {
-                set_up_language($squirrelmail_language);
-                echo "<br><b><font color=$color[2]>\n";
-                echo _("ERROR : Could not complete request.");
-                echo "</b><br>\n";
-                echo _("Reason Given: ");
-                echo $message . "</font><br>\n";
-                exit;
+            flock($fp,LOCK_UN);
+        }
+    }
+}
+
+/**
+ * Uses the BulkQuery executable to query all the RBLs at once
+ * @param array $filters Array of SPAM Fitlers
+ * @param array $IPs Array of IP Addresses
+ * @access private
+ */
+function filters_bulkquery($filters, $IPs) {
+    global $attachment_dir, $username,
+           $SpamFilters_DNScache, $SpamFilters_BulkQuery,
+           $SpamFilters_CacheTTL;
+
+    if (count($IPs) > 0) {
+        $rbls = array();
+        foreach ($filters as $key => $value) {
+            if ($filters[$key]['enabled']) {
+                if ($filters[$key]['dns']) {
+                    $rbls[$filters[$key]['dns']] = true;
+                }
             }
-        } else if ($response == 'BAD') {
-            set_up_language($squirrelmail_language);
-            echo "<br><b><font color=$color[2]>\n";
-            echo _("ERROR : Bad or malformed request.");
-            echo "</b><br>\n";
-            echo _("Server responded: ");
-            echo $message . "</font><br>\n";
-            exit;
         }
 
-        return $data;
+        $bqfil = $attachment_dir . $username . '-bq.in';
+        $fp = fopen($bqfil, 'w');
+        fputs ($fp, $SpamFilters_CacheTTL . "\n");
+        foreach ($rbls as $key => $value) {
+            fputs ($fp, '.' . $key . "\n");
+        }
+        fputs ($fp, "----------\n");
+        foreach ($IPs as $key => $value) {
+            fputs ($fp, $key . "\n");
+        }
+        fclose ($fp);
+        $bqout = array();
+        exec ($SpamFilters_BulkQuery . ' < ' . $bqfil, $bqout);
+        foreach ($bqout as $value) {
+            $Chunks = explode(',', $value);
+            $SpamFilters_DNScache[$Chunks[0]]['L'] = $Chunks[1];
+            $SpamFilters_DNScache[$Chunks[0]]['T'] = $Chunks[2] + time();
+        }
+        unlink($bqfil);
+    }
+}
+
+/**
+ * Starts the filtering process
+ * @param array $hook_args (since 1.5.2) do hook arguments. Is used to check
+ * hook name, array key = 0.
+ * @access private
+ */
+function start_filters($hook_args) {
+    global $imapServerAddress, $imapPort, $imap_stream, $imapConnection,
+           $UseSeparateImapConnection, $AllowSpamFilters, $filter_inbox_count,
+           $username;
+
+    /**
+     * check hook that calls filtering. If filters are called by right_main_after_header,
+     * do filtering only when we are in INBOX folder.
+     */
+    if ($hook_args[0]=='right_main_after_header' &&
+        (sqgetGlobalVar('mailbox',$mailbox,SQ_FORM) && $mailbox!='INBOX')) {
+        return;
     }
 
+    $filters = load_filters();
 
-    function start_filters() {
-        global $mailbox, $username, $key, $imapServerAddress, $imapPort, $imap,
-            $imap_general, $filters, $imap_stream, $imapConnection,
-        $UseSeparateImapConnection, $AllowSpamFilters;
+    // No point running spam filters if there aren't any to run //
+    if ($AllowSpamFilters) {
+        $spamfilters = load_spam_filters();
 
-        if ($mailbox == 'INBOX') {
-            // Detect if we have already connected to IMAP or not.
-            // Also check if we are forced to use a separate IMAP connection
-            if ((!isset($imap_stream) && !isset($imapConnection)) ||
-                $UseSeparateImapConnection) {
-                $stream = sqimap_login($username, $key, $imapServerAddress,
-            $imapPort, 10);
-                $previously_connected = false;
-            } elseif (isset($imapConnection)) {
-                $stream = $imapConnection;
-                $previously_connected = true;
-            } else {
-                $previously_connected = true;
-        $stream = $imap_stream;
+        $AllowSpamFilters = false;
+        foreach($spamfilters as $filterskey=>$value) {
+            if ($value['enabled'] == 'yes') {
+                $AllowSpamFilters = true;
+                break;
             }
+        }
+    }
 
-            if (sqimap_get_num_messages($stream, 'INBOX') > 0) {
-                // Filter spam from inbox before we sort them into folders
-                if ($AllowSpamFilters)
-                spam_filters($stream);
+    if (!$AllowSpamFilters && empty($filters)) {
+        return;
+    }
 
-                // Sort into folders
-                user_filters($stream);
-            }
 
-            if (!$previously_connected)
-                sqimap_logout($stream);
-        }
+    // Detect if we have already connected to IMAP or not.
+    // Also check if we are forced to use a separate IMAP connection
+    if ((!isset($imap_stream) && !isset($imapConnection)) ||
+        $UseSeparateImapConnection ) {
+            $stream = sqimap_login($username, false, $imapServerAddress,
+                                $imapPort, 10);
+            $previously_connected = false;
+    } else if (isset($imapConnection)) {
+        $stream = $imapConnection;
+        $previously_connected = true;
+    } else {
+        $previously_connected = true;
+        $stream = $imap_stream;
     }
 
+    if (!isset($filter_inbox_count)) {
+        $aStatus = sqimap_status_messages ($stream, 'INBOX', array('MESSAGES'));
+        if (!empty($aStatus['MESSAGES'])) {
+            $filter_inbox_count=$aStatus['MESSAGES'];
+        } else {
+            $filter_inbox_count=0;
+        }
+    }
 
-    function user_filters($imap_stream) {
-        $filters = load_filters();
-        if (! $filters) return;
+    if ($filter_inbox_count > 0) {
+        sqimap_mailbox_select($stream, 'INBOX');
+        // Filter spam from inbox before we sort them into folders
+        if ($AllowSpamFilters) {
+            spam_filters($stream);
+        }
 
-        sqimap_mailbox_select($imap_stream, 'INBOX');
+        // Sort into folders
+        user_filters($stream);
+    }
 
-        // For every rule
-        for ($i=0; $i < count($filters); $i++) {
-            // If it is the "combo" rule
-            if ($filters[$i]['where'] == 'To or Cc') {
-                /*
-                *  If it's "TO OR CC", we have to do two searches, one for TO
-                *  and the other for CC.
-                */
-            filter_search_and_delete($imap_stream, 'TO',
-            $filters[$i]['what'], $filters[$i]['folder']);
-            filter_search_and_delete($imap_stream, 'CC',
-            $filters[$i]['what'], $filters[$i]['folder']);
-            } else {
-                /*
-                *  If it's a normal TO, CC, SUBJECT, or FROM, then handle it
+    if (!$previously_connected) {
+        sqimap_logout($stream);
+    }
+}
+
+/**
+ * Does the loop through each filter
+ * @param stream imap_stream the stream to read from
+ * @access private
+ */
+function user_filters($imap_stream) {
+    global $data_dir, $username;
+    $filters = load_filters();
+    if (! $filters) return;
+    $filters_user_scan = getPref($data_dir, $username, 'filters_user_scan');
+
+    $expunge = false;
+    // For every rule
+    for ($i=0, $num = count($filters); $i < $num; $i++) {
+        // If it is the "combo" rule
+        if ($filters[$i]['where'] == 'To or Cc') {
+            /*
+            *  If it's "TO OR CC", we have to do two searches, one for TO
+            *  and the other for CC.
+            */
+            $expunge = filter_search_and_delete($imap_stream, 'TO',
+                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
+            $expunge = filter_search_and_delete($imap_stream, 'CC',
+                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
+        } else if ($filters[$i]['where'] == 'Header and Body') {
+            $expunge = filter_search_and_delete($imap_stream, 'TEXT',
+                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
+        } else if ($filters[$i]['where'] == 'Message Body') {
+            $expunge = filter_search_and_delete($imap_stream, 'BODY',
+                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
+        } else {
+            /*
+            *  If it's a normal TO, CC, SUBJECT, or FROM, then handle it
             *  normally.
-                */
-            filter_search_and_delete($imap_stream, $filters[$i]['where'],
-            $filters[$i]['what'], $filters[$i]['folder']);
-            }
+            */
+            $expunge = filter_search_and_delete($imap_stream, $filters[$i]['where'],
+                 $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge);
         }
-        // Clean out the mailbox whether or not auto_expunge is on
-        // That way it looks like it was redirected properly
+    }
+    // Clean out the mailbox whether or not auto_expunge is on
+    // That way it looks like it was redirected properly
+    if ($expunge) {
         sqimap_mailbox_expunge($imap_stream, 'INBOX');
     }
+}
+
+/**
+ * Creates and runs the IMAP command to filter messages
+ * @param string $where Which part of the message to search (TO, CC, SUBJECT, etc...)
+ * @param string $what String to search for
+ * @param string $where_to Folder it will move to
+ * @param string $user_scan Whether to search all or just unseen
+ * @param string $should_expunge
+ * @param boolean $where Which part of location to search
+ * @access private
+ */
+function filter_search_and_delete($imap_stream, $where, $what, $where_to, $user_scan,
+                                  $should_expunge) {
+    global $languages, $squirrelmail_language, $allow_charset_search, $imap_server_type;
+
+    //TODO: make use of new mailbox cache. See mailbox_display.phpinfo
+
+    if (strtolower($where_to) == 'inbox') {
+        return array();
+    }
 
-    function filter_search_and_delete($imap, $where, $what, $where_to) {
-        // Don't mess with the " characters on this fputs line!
-        fputs ($imap, 'a001 SEARCH ALL ' . $where . ' "' . addslashes($what) .
-            "\"\r\n");
-        $read = filters_sqimap_read_data ($imap, 'a001', true, $response, $message);
+    if ($user_scan == 'new') {
+        $category = 'UNSEEN';
+    } else {
+        $category = 'ALL';
+    }
+    $category .= ' UNDELETED';
+
+    if ($allow_charset_search &&
+        isset($languages[$squirrelmail_language]['CHARSET']) &&
+        $languages[$squirrelmail_language]['CHARSET']) {
+        $search_str = 'SEARCH CHARSET '
+                    . strtoupper($languages[$squirrelmail_language]['CHARSET'])
+                    . ' ' . $category;
+    } else {
+        $search_str = 'SEARCH CHARSET US-ASCII ' . $category;
+    }
+    if ($where == 'Header') {
+        $what  = explode(':', $what);
+        $where = strtoupper($where);
+        $where = trim($where . ' ' . $what[0]);
+        $what  = addslashes(trim($what[1]));
+    }
 
-        // This may have problems with EIMS due to it being goofy
+    // see comments in squirrelmail sqimap_search function
+    if ($imap_server_type == 'macosx' || $imap_server_type == 'hmailserver') {
+         $search_str .= ' ' . $where . ' ' . $what;
+        /* read data back from IMAP */
+        $read = sqimap_run_command($imap_stream, $search_str, true, $response, $message, TRUE);
+    } else {
+        $search_str .= ' ' . $where . ' {' . strlen($what) . "}";
+        $sid = sqimap_session_id(true);
+        fputs ($imap_stream, $sid . ' ' . $search_str . "\r\n");
+        $read2 = sqimap_fgets($imap_stream);
+        # server should respond with Ready for argument, then we will send search text
+        #echo "RR2 $read2<br>";
+        fputs ($imap_stream, "$what\r\n");
+        #echo "SS $what<br>";
+        $read2 = sqimap_fgets($imap_stream);
+        #echo "RR2 $read2<br>";
+        $read[]=$read2;
+        $read3 = sqimap_fgets($imap_stream);
+        #echo "RR3 $read3<br>";
+        list($rtag,$response,$message)=explode(' ',$read3,3);
+##        $read2 = sqimap_retrieve_imap_response($imap_stream, $sid, true,
+##              $response, $message, $search_str, false, true, false);
+        #echo "RR2 $read2 / RESPONSE $response<br>";
+    }
 
-        for ($r=0; $r < count($read) &&
-                    substr($read[$r], 0, 8) != '* SEARCH'; $r++) {}
-        if ($response == 'OK') {
-            $ids = explode(' ', $read[$r]);
-        if (sqimap_mailbox_exists($imap, $where_to)) {
-                for ($j=2; $j < count($ids); $j++) {
-            $id = trim($ids[$j]);
-                sqimap_messages_copy ($imap, $id, $id, $where_to);
-                sqimap_messages_flag ($imap, $id, $id, 'Deleted');
+    if (isset($read[0])) {
+        $ids = array();
+        for ($i = 0, $iCnt = count($read); $i < $iCnt; ++$i) {
+            if (preg_match("/^\* SEARCH (.+)$/", $read[$i], $regs)) {
+                $ids += preg_split("/ /", trim($regs[1]));
+            }
+        }
+        if ($response == 'OK' && count($ids)) {
+            if (sqimap_mailbox_exists($imap_stream, $where_to)) {
+                 $should_expunge = true;
+                 sqimap_msgs_list_move ($imap_stream, $ids, $where_to, false);
+            }
+        } elseif ($response != 'OK') {
+            $query = $search_str . "\r\n".$what ."\r\n";
+            if ($response == 'NO') {
+                if (strpos($message,'BADCHARSET') !== false ||
+                    strpos($message,'character') !== false) {
+                    sqm_trigger_imap_error('SQM_IMAP_BADCHARSET',$query, $response, $message);
+                } else {
+                    sqm_trigger_imap_error('SQM_IMAP_ERROR',$query, $response, $message);
                 }
+            } else {
+                sqm_trigger_imap_error('SQM_IMAP_ERROR',$query, $response, $message);
             }
         }
     }
+    return $should_expunge;
+}
+
+/**
+ * Loops through all the Received Headers to find IP Addresses
+ * @param stream imap_stream the stream to read from
+ * @access private
+ */
+function spam_filters($imap_stream) {
+    global $data_dir, $username;
+    global $SpamFilters_YourHop;
+    global $SpamFilters_DNScache;
+    global $SpamFilters_SharedCache;
+    global $SpamFilters_BulkQuery;
+    global $SpamFilters_CacheTTL;
+
+    $filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan');
+    $filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder');
+    $filters = load_spam_filters();
+
+    if ($SpamFilters_SharedCache) {
+       filters_LoadCache();
+    }
 
-    // These are the spam filters
-    function spam_filters($imap_stream) {
-        global $data_dir, $username;
-        global $SpamFilters_YourHop;
-        global $SpamFilters_DNScache;
-
-        $filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan');
-        $filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder');
-        $filters = load_spam_filters();
-
-        $run = 0;
-
-        foreach ($filters as $Key=> $Value) {
-            if ($Value['enabled'])
-                $run ++;
-        }
+    $run = false;
 
-        // short-circuit
-        if ($run == 0) {
-            return;
+    foreach ($filters as $Key => $Value) {
+        if ($Value['enabled']) {
+            $run = true;
+            break;
         }
+    }
 
-        sqimap_mailbox_select($imap_stream, 'INBOX');
-
-        // Ask for a big list of all "Received" headers in the inbox with
-        // flags for each message.  Kinda big.
-        fputs($imap_stream, 'A3999 FETCH 1:* (FLAGS BODY.PEEK[HEADER.FIELDS ' .
-              "(RECEIVED)])\r\n");
-
-        $read = filters_sqimap_read_data ($imap_stream, 'A3999', true, $response, $message);
-
-        if ($response != 'OK')
-            return;
-
-        $i = 0;
-        while ($i < count($read)) {
-            // EIMS will give funky results
-            $Chunks = explode(' ', $read[$i]);
-            if ($Chunks[0] != '*') {
-                $i ++;
-                continue;
-            }
-            $MsgNum = $Chunks[1];
-
-            $IPs = array();
-            $i ++;
-            $IsSpam = 0;
-            $Scan = 1;
+    // short-circuit
+    if (!$run) {
+        return;
+    }
 
-            // Check for normal IMAP servers
-            if ($filters_spam_scan == 'new') {
-                if (is_int(strpos($Chunks[4], '\Seen'))) {
-                    $Scan = 0;
+    // Ask for a big list of all "Received" headers in the inbox with
+    // flags for each message.  Kinda big.
+
+    if ($filters_spam_scan == 'new') {
+        $search_array = array();
+        $read = sqimap_run_command($imap_stream, 'SEARCH UNSEEN', true, $response, $message, TRUE);
+        if (isset($read[0])) {
+            for ($i = 0, $iCnt = count($read); $i < $iCnt; ++$i) {
+                if (preg_match("/^\* SEARCH (.+)$/", $read[$i], $regs)) {
+                    $search_array = preg_split("/ /", trim($regs[1]));
+                break;
                 }
             }
-
+        }
+    }
+    if ($filters_spam_scan == 'new' && count($search_array)) {
+        $headers = sqimap_get_small_header_list ($imap_stream, $search_array, array('Received'),array());
+    } else if ($filters_spam_scan != 'new') {
+        $headers = sqimap_get_small_header_list ($imap_stream, null , array('Received'),array());
+    } else {
+        return;
+    }
+    if (!count($headers)) {
+        return;
+    }
+    $bulkquery = (strlen($SpamFilters_BulkQuery) > 0 ? true : false);
+    $IPs = array();
+    $aSpamIds = array();
+    foreach ($headers as $id => $aValue) {
+        if (isset($aValue['UID'])) {
+            $MsgNum = $aValue['UID'];
+        } else {
+            $MsgNum = $id;
+        }
         // Look through all of the Received headers for IP addresses
-        // Stop when I get ")" on a line
-        // Stop if I get "*" on a line (don't advance)
-            // and above all, stop if $i is bigger than the total # of lines
-            while (($i < count($read)) &&
-                    ($read[$i][0] != ')' && $read[$i][0] != '*' &&
-                $read[$i][0] != "\n") && (! $IsSpam))
-                {
+        if (isset($aValue['RECEIVED'])) {
+            foreach ($aValue['RECEIVED'] as $received) {
                 // Check to see if this line is the right "Received from" line
                 // to check
-                if (is_int(strpos($read[$i], $SpamFilters_YourHop))) {
-
-                // short-circuit and skip work if we don't scan this one
-                    if ($Scan) {
-                        $read[$i] = ereg_replace('[^0-9\.]', ' ', $read[$i]);
-                        $elements = explode(' ', $read[$i]);
-                        foreach ($elements as $value) {
-                if ($value != '' &&
-                            ereg('[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}',
-                    $value, $regs)) {
-                    $Chunks = explode('.', $value);
-                            if (filters_spam_check_site($Chunks[0], $Chunks[1],
-                                $Chunks[2], $Chunks[3], $filters)) {
-                        $IsSpam ++;
-                                break;  // no sense in checking more IPs
+
+                // $aValue['Received'] is an array with all the received lines.
+                // We should check them from bottom to top and only check the first 2.
+                // Currently we check only the header where $SpamFilters_YourHop in occures
+
+                if (is_int(strpos($received, $SpamFilters_YourHop))) {
+                    if (preg_match('/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/',$received,$aMatch)) {
+                        $isspam = false;
+                        if (filters_spam_check_site($aMatch[1],$aMatch[2],$aMatch[3],$aMatch[4],$filters)) {
+                            $aSpamIds[] = $MsgNum;
+                            $isspam = true;
+                        }
+                        if ($bulkquery) {
+                            array_shift($aMatch);
+                            $IP = explode('.',$aMatch);
+                            foreach ($filters as $key => $value) {
+                                if ($filters[$key]['enabled'] && $filters[$key]['dns']) {
+                                    if (strlen($SpamFilters_DNScache[$IP.'.'.$filters[$key]['dns']]) == 0) {
+                                       $IPs[$IP] = true;
+                                       break;
+                                    }
+                                }
                             }
                         }
+                        // If we've checked one IP and YourHop is
+                        // just a space
+                        if ($SpamFilters_YourHop == ' ' || $isspam) {
+                            break;  // don't check any more
                         }
                     }
                 }
-                $i ++;
-            }
-
-            // Lookie!  It's spam!  Yum!
-            if ($IsSpam) {
-                if (sqimap_mailbox_exists ($imap_stream, $filters_spam_folder)) {
-                    sqimap_messages_copy ($imap_stream, $MsgNum, $MsgNum,
-                $filters_spam_folder);
-                    sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum,
-                'Deleted');
-                }
-            } else {
             }
         }
-
+    }
+    // Lookie!  It's spam!  Yum!
+    if (count($aSpamIds) && sqimap_mailbox_exists($imap_stream, $filters_spam_folder)) {
+        sqimap_msgs_list_move ($imap_stream, $aSpamIds, $filters_spam_folder);
         sqimap_mailbox_expunge($imap_stream, 'INBOX');
-
-        session_register('SpamFilters_DNScache');
     }
 
+    if ($bulkquery && count($IPs)) {
+        filters_bulkquery($filters, $IPs);
+    }
 
-    // Does the loop through each enabled filter for the specified IP address.
-    // IP format:  $a.$b.$c.$d
-    function filters_spam_check_site($a, $b, $c, $d, &$filters) {
-        global $SpamFilters_DNScache;
-        foreach ($filters as $key => $value) {
-            if ($filters[$key]['enabled']) {
-                if ($filters[$key]['dns']) {
-            $filter_revip = $d . '.' . $c . '.' . $b . '.' . $a . '.' .
-                                    $filters[$key]['dns'];
-                    if (strlen($SpamFilters_DNScache[$filter_revip]) == 0) {
-                $SpamFilters_DNScache[$filter_revip]=gethostbyname($filter_revip);
-            }
-            if ($SpamFilters_DNScache[$filter_revip] ==
-                $filters[$key]['result']) {
-                        return 1;
-                    }
+    if ($SpamFilters_SharedCache) {
+       filters_SaveCache();
+    } else {
+       sqsession_register($SpamFilters_DNScache, 'SpamFilters_DNScache');
+    }
+}
+
+/**
+ * Does the loop through each enabled filter for the specified IP address.
+ * IP format:  $a.$b.$c.$d
+ * @param int $a First subset of IP
+ * @param int $b Second subset of IP
+ * @param int $c Third subset of IP
+ * @param int $d Forth subset of IP
+ * @param array $filters The Spam Filters
+ * @return boolean Whether the IP is Spam
+ * @access private
+ */
+function filters_spam_check_site($a, $b, $c, $d, &$filters) {
+    global $SpamFilters_DNScache, $SpamFilters_CacheTTL;
+    foreach ($filters as $key => $value) {
+        if ($filters[$key]['enabled']) {
+            if ($filters[$key]['dns']) {
+                $filter_revip = $d . '.' . $c . '.' . $b . '.' . $a . '.' .
+                                $filters[$key]['dns'];
+
+                if(!isset($SpamFilters_DNScache[$filter_revip]['L']))
+                        $SpamFilters_DNScache[$filter_revip]['L'] = '';
+
+                if(!isset($SpamFilters_DNScache[$filter_revip]['T']))
+                        $SpamFilters_DNScache[$filter_revip]['T'] = '';
+
+                if (strlen($SpamFilters_DNScache[$filter_revip]['L']) == 0) {
+                    $SpamFilters_DNScache[$filter_revip]['L'] =
+                                    gethostbyname($filter_revip);
+                    $SpamFilters_DNScache[$filter_revip]['T'] =
+                                       time() + $SpamFilters_CacheTTL;
+                }
+                if ($SpamFilters_DNScache[$filter_revip]['L'] ==
+                    $filters[$key]['result']) {
+                    return 1;
                 }
             }
         }
-        return 0;
     }
-
-    function load_filters() {
-        global $data_dir, $username;
-        $filters = array();
-        for ($i=0; $fltr = getPref($data_dir, $username, 'filter' . $i); $i++) {
-            $ary = explode(',', $fltr);
-            $filters[$i]['where'] = $ary[0];
-            $filters[$i]['what'] = $ary[1];
-            $filters[$i]['folder'] = $ary[2];
-        }
-        return $filters;
+    return 0;
+}
+
+/**
+ * Loads the filters from the user preferences
+ * @return array All the user filters
+ * @access private
+ */
+function load_filters() {
+    global $data_dir, $username;
+
+    $filters = array();
+    for ($i = 0; $fltr = getPref($data_dir, $username, 'filter' . $i); $i++) {
+        $ary = explode(',', $fltr);
+        $filters[$i]['where'] = $ary[0];
+        $filters[$i]['what'] = $ary[1];
+        $filters[$i]['folder'] = $ary[2];
     }
-
-    function load_spam_filters() {
-        global $data_dir, $username;
-
+    return $filters;
+}
+
+/**
+ * Loads the Spam Filters and checks the preferences for the enabled status
+ * @return array All the spam filters
+ * @access private
+ */
+function load_spam_filters() {
+    global $data_dir, $username, $SpamFilters_ShowCommercial;
+
+    if ($SpamFilters_ShowCommercial) {
         $filters['MAPS RBL']['prefname'] = 'filters_spam_maps_rbl';
         $filters['MAPS RBL']['name'] = 'MAPS Realtime Blackhole List';
         $filters['MAPS RBL']['link'] = 'http://www.mail-abuse.org/rbl/';
         $filters['MAPS RBL']['dns'] = 'blackholes.mail-abuse.org';
         $filters['MAPS RBL']['result'] = '127.0.0.2';
         $filters['MAPS RBL']['comment'] =
-    _("COMMERCIAL - This list contains servers that are verified spam senders. It is a pretty reliable list to scan spam from.");
+            _("COMMERCIAL - This list contains servers that are verified spam senders. It is a pretty reliable list to scan spam from.");
 
         $filters['MAPS RSS']['prefname'] = 'filters_spam_maps_rss';
         $filters['MAPS RSS']['name'] = 'MAPS Relay Spam Stopper';
         $filters['MAPS RSS']['dns'] = 'relays.mail-abuse.org';
         $filters['MAPS RSS']['result'] = '127.0.0.2';
         $filters['MAPS RSS']['comment'] =
-    _("COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to be relayed through their system will be banned with this.  Another good one to use.");
+            _("COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to be relayed through their system will be banned with this. Another good one to use.");
 
         $filters['MAPS DUL']['prefname'] = 'filters_spam_maps_dul';
         $filters['MAPS DUL']['name'] = 'MAPS Dial-Up List';
         $filters['MAPS DUL']['dns'] = 'dialups.mail-abuse.org';
         $filters['MAPS DUL']['result'] = '127.0.0.3';
         $filters['MAPS DUL']['comment'] =
-    _("COMMERCIAL - Dial-up users are often filtered out since they should use their ISP's mail servers to send mail.  Spammers typically get a dial-up account and send spam directly from there.");
+            _("COMMERCIAL - Dial-up users are often filtered out since they should use their ISP's mail servers to send mail. Spammers typically get a dial-up account and send spam directly from there.");
 
         $filters['MAPS RBLplus-RBL']['prefname'] = 'filters_spam_maps_rblplus_rbl';
         $filters['MAPS RBLplus-RBL']['name'] = 'MAPS RBL+ RBL List';
         $filters['MAPS RBLplus-RBL']['dns'] = 'rbl-plus.mail-abuse.org';
         $filters['MAPS RBLplus-RBL']['result'] = '127.0.0.2';
         $filters['MAPS RBLplus-RBL']['comment'] =
-    _("COMMERCIAL - RBL+ Blackhole entries.");
+            _("COMMERCIAL - RBL+ Blackhole entries.");
 
         $filters['MAPS RBLplus-RSS']['prefname'] = 'filters_spam_maps_rblplus_rss';
         $filters['MAPS RBLplus-RSS']['name'] = 'MAPS RBL+ List RSS entries';
         $filters['MAPS RBLplus-RSS']['dns'] = 'rbl-plus.mail-abuse.org';
         $filters['MAPS RBLplus-RSS']['result'] = '127.0.0.2';
         $filters['MAPS RBLplus-RSS']['comment'] =
-    _("COMMERCIAL - RBL+ OpenRelay entries.");
+            _("COMMERCIAL - RBL+ OpenRelay entries.");
 
         $filters['MAPS RBLplus-DUL']['prefname'] = 'filters_spam_maps_rblplus_dul';
         $filters['MAPS RBLplus-DUL']['name'] = 'MAPS RBL+ List DUL entries';
         $filters['MAPS RBLplus-DUL']['dns'] = 'rbl-plus.mail-abuse.org';
         $filters['MAPS RBLplus-DUL']['result'] = '127.0.0.3';
         $filters['MAPS RBLplus-DUL']['comment'] =
-    _("COMMERCIAL - RBL+ Dial-up entries.");
-
-        $filters['Osirusoft Relays']['prefname'] = 'filters_spam_maps_osirusoft_relay';
-        $filters['Osirusoft Relays']['name'] = 'Osirusoft Relay List';
-        $filters['Osirusoft Relays']['link'] = 'http://relays.osirusoft.com/';
-        $filters['Osirusoft Relays']['dns'] = 'relays.osirusoft.com';
-        $filters['Osirusoft Relays']['result'] = '127.0.0.2';
-        $filters['Osirusoft Relays']['comment'] =
-    _("FREE - Osirusoft Relays - Osirusofts list of verified open relays. Seems to include servers used by abuse@uunet.net auto-replies too.");
-
-        $filters['Osirusoft DUL']['prefname'] = 'filters_spam_maps_osirusoft_dul';
-        $filters['Osirusoft DUL']['name'] = 'Osirusoft Dialup List';
-        $filters['Osirusoft DUL']['link'] = 'http://relays.osirusoft.com/';
-        $filters['Osirusoft DUL']['dns'] = 'relays.osirusoft.com';
-        $filters['Osirusoft DUL']['result'] = '127.0.0.3';
-        $filters['Osirusoft DUL']['comment'] =
-    _("FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list.");
-
-        $filters['Osirusoft Spam Source']['prefname'] = 'filters_spam_maps_osirusoft_rc';
-        $filters['Osirusoft Spam Source']['name'] = 'Osirusoft Confirmed Spam Source List';
-        $filters['Osirusoft Spam Source']['link'] = 'http://relays.osirusoft.com/';
-        $filters['Osirusoft Spam Source']['dns'] = 'relays.osirusoft.com';
-        $filters['Osirusoft Spam Source']['result'] = '127.0.0.4';
-        $filters['Osirusoft Spam Source']['comment'] =
-    _("FREE - Osirusoft Confirmed Spam Source - Sites that continually spam and have been manually added after multiple nominations. Use with caution. Seems to catch abuse auto-replies from some ISPs.");
-
-        $filters['Osirusoft Smart Host']['prefname'] = 'filters_spam_maps_osirusoft_sh';
-        $filters['Osirusoft Smart Host']['name'] = 'Osirusoft Smart Host List';
-        $filters['Osirusoft Smart Host']['link'] = 'http://relays.osirusoft.com/';
-        $filters['Osirusoft Smart Host']['dns'] = 'relays.osirusoft.com';
-        $filters['Osirusoft Smart Host']['result'] = '127.0.0.5';
-        $filters['Osirusoft Smart Host']['comment'] =
-    _("FREE - Osirusoft Smart Hosts - List of hosts that are secure but relay for other mail servers that are not secure.");
-
-        $filters['Osirusoft SPAMware']['prefname'] = 'filters_spam_maps_osirusoft_ss';
-        $filters['Osirusoft SPAMware']['name'] = 'Osirusoft Spamware Developers List';
-        $filters['Osirusoft SPAMware']['link'] = 'http://relays.osirusoft.com/';
-        $filters['Osirusoft SPAMware']['dns'] = 'relays.osirusoft.com';
-        $filters['Osirusoft SPAMware']['result'] = '127.0.0.6';
-        $filters['Osirusoft SPAMware']['comment'] =
-    _("FREE - Osirusoft Spamware Developers - It is believed that these are IP ranges of companies that are known to produce spam software. Seems to catch abuse auto-replies from some ISPs.");
-
-        $filters['Osirusoft Unc. OptIn']['prefname'] = 'filters_spam_maps_osirusoft_sl';
-        $filters['Osirusoft Unc. OptIn']['name'] = 'Osirusoft Unconfirmed OptIn Server List';
-        $filters['Osirusoft Unc. OptIn']['link'] = 'http://relays.osirusoft.com/';
-        $filters['Osirusoft Unc. OptIn']['dns'] = 'relays.osirusoft.com';
-        $filters['Osirusoft Unc. OptIn']['result'] = '127.0.0.7';
-        $filters['Osirusoft Unc. OptIn']['comment'] =
-    _("FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt users in without confirmation.");
-
-        $filters['ORDB']['prefname'] = 'filters_spam_ordb';
-        $filters['ORDB']['name'] = 'Open Relay Database List';
-        $filters['ORDB']['link'] = 'http://www.ordb.org/';
-        $filters['ORDB']['dns'] = 'relays.ordb.org';
-        $filters['ORDB']['result'] = '127.0.0.2';
-        $filters['ORDB']['comment'] =
-    _("FREE - ORDB was born when ORBS went off the air. It seems to have fewer false positives than ORBS did though.");
-
-        $filters['ORBZ Inputs']['prefname'] = 'filters_spam_orbz';
-        $filters['ORBZ Inputs']['name'] = 'ORBZ Inputs List';
-        $filters['ORBZ Inputs']['link'] = 'http://www.orbz.org/';
-        $filters['ORBZ Inputs']['dns'] = 'inputs.orbz.org';
-        $filters['ORBZ Inputs']['result'] = '127.0.0.2';
-        $filters['ORBZ Inputs']['comment'] =
-    _("FREE - Another ORBS replacement (just the INPUTS database used here).");
-
-        $filters['ORBZ Outputs']['prefname'] = 'filters_spam_orbz_outputs';
-        $filters['ORBZ Outputs']['name'] = 'ORBZ Outputs List';
-        $filters['ORBZ Outputs']['link'] = 'http://www.orbz.org/';
-        $filters['ORBZ Outputs']['dns'] = 'outputs.orbz.org';
-        $filters['ORBZ Outputs']['result'] = '127.0.0.2';
-        $filters['ORBZ Outputs']['comment'] =
-    _("FREE - Another ORBS replacement (just the OUTPUTS database used here).");
-
-        $filters['FiveTen Direct']['prefname'] = 'filters_spam_fiveten_src';
-        $filters['FiveTen Direct']['name'] = 'Five-Ten-sg.com Direct SPAM Sources';
-        $filters['FiveTen Direct']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
-        $filters['FiveTen Direct']['dns'] = 'blackholes.five-ten-sg.com';
-        $filters['FiveTen Direct']['result'] = '127.0.0.2';
-        $filters['FiveTen Direct']['comment'] =
-    _("FREE - Five-Ten-sg.com - Direct SPAM sources.");
-
-        $filters['FiveTen DUL']['prefname'] = 'filters_spam_fiveten_dul';
-        $filters['FiveTen DUL']['name'] = 'Five-Ten-sg.com DUL Lists';
-        $filters['FiveTen DUL']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
-        $filters['FiveTen DUL']['dns'] = 'blackholes.five-ten-sg.com';
-        $filters['FiveTen DUL']['result'] = '127.0.0.3';
-        $filters['FiveTen DUL']['comment'] =
-    _("FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs.");
-
-        $filters['FiveTen Unc. OptIn']['prefname'] = 'filters_spam_fiveten_oi';
-        $filters['FiveTen Unc. OptIn']['name'] = 'Five-Ten-sg.com Unconfirmed OptIn Lists';
-        $filters['FiveTen Unc. OptIn']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
-        $filters['FiveTen Unc. OptIn']['dns'] = 'blackholes.five-ten-sg.com';
-        $filters['FiveTen Unc. OptIn']['result'] = '127.0.0.4';
-        $filters['FiveTen Unc. OptIn']['comment'] =
-    _("FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in.");
-
-        $filters['FiveTen Others']['prefname'] = 'filters_spam_fiveten_oth';
-        $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com Other Misc. Servers';
-        $filters['FiveTen Others']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
-        $filters['FiveTen Others']['dns'] = 'blackholes.five-ten-sg.com';
-        $filters['FiveTen Others']['result'] = '127.0.0.5';
-        $filters['FiveTen Others']['comment'] =
-    'FREE - Five-Ten-sg.com - Other misc. servers.';
-
-        $filters['Dorkslayers']['prefname'] = 'filters_spam_dorks';
-        $filters['Dorkslayers']['name'] = 'Dorkslayers Lists';
-        $filters['Dorkslayers']['link'] = 'http://www.dorkslayers.com';
-        $filters['Dorkslayers']['dns'] = 'orbs.dorkslayers.com';
-        $filters['Dorkslayers']['result'] = '127.0.0.2';
-        $filters['Dorkslayers']['comment'] =
-    _("FREE - Dorkslayers appears to include only really bad open relays outside the US to avoid being sued. Interestingly enough, their website recommends you NOT use their service.");
-
-        $filters['ORBL']['prefname'] = 'filters_spam_orbl';
-        $filters['ORBL']['name'] = 'ORBL Lists';
-        $filters['ORBL']['link'] = 'http://www.orbl.org';
-        $filters['ORBL']['dns'] = 'or.orbl.org';
-        $filters['ORBL']['result'] = '127.0.0.2';
-        $filters['ORBL']['comment'] =
-    _("FREE - ORBL is another ORBS spinoff formed after ORBS shut down. May be SLOOOOOOW!");
-
-        $filters['ORBZ-UK Inputs']['prefname'] = 'filters_spam_orbzuk_in';
-        $filters['ORBZ-UK Inputs']['name'] = 'ORBZ-UK Inputs Lists';
-        $filters['ORBZ-UK Inputs']['link'] = 'http://orbz.gst-group.co.uk';
-        $filters['ORBZ-UK Inputs']['dns'] = 'orbz.gst-group.co.uk';
-        $filters['ORBZ-UK Inputs']['result'] = '127.0.0.3';
-        $filters['ORBZ-UK Inputs']['comment'] =
-    _("FREE - orbz.gst-group.co.uk - Inputs only.");
-
-        $filters['ORBZ-UK Outputs']['prefname'] = 'filters_spam_orbzuk_out';
-        $filters['ORBZ-UK Outputs']['name'] = 'ORBZ-UK Outputs Lists';
-        $filters['ORBZ-UK Outputs']['link'] = 'http://orbz.gst-group.co.uk';
-        $filters['ORBZ-UK Outputs']['dns'] = 'orbz.gst-group.co.uk';
-        $filters['ORBZ-UK Outputs']['result'] = '127.0.0.2';
-        $filters['ORBZ-UK Outputs']['comment'] =
-    _("FREE - orbz.gst-group.co.uk - Outputs only.");
-
-        $filters['ORBZ-UK Postmaster']['prefname'] = 'filters_spam_orbzuk_pst';
-        $filters['ORBZ-UK Postmaster']['name'] = 'ORBZ-UK Postmaster Bouncer Lists';
-        $filters['ORBZ-UK Postmaster']['link'] = 'http://orbz.gst-group.co.uk';
-        $filters['ORBZ-UK Postmaster']['dns'] = 'orbz.gst-group.co.uk';
-        $filters['ORBZ-UK Postmaster']['result'] = '127.0.0.9';
-        $filters['ORBZ-UK Postmaster']['comment'] =
-    _("FREE - orbz.gst-group.co.uk - mailservers that refuse or bounce email addressed to postmaster@<theirdomain>.");
-
-        $filters['SPAMcop']['prefname'] = 'filters_spam_spamcop';
-        $filters['SPAMcop']['name'] = 'SPAM Cop Lists';
-        $filters['SPAMcop']['link'] = 'http://spamcop.net/bl.shtml';
-        $filters['SPAMcop']['dns'] = 'bl.spamcop.net';
-        $filters['SPAMcop']['result'] = '127.0.0.2';
-        $filters['SPAMcop']['comment'] =
-    _("FREE, for now - SPAMCOP - An interesting solution that lists servers that have a very high spam to legit email ratio (85% or more).");
-
-        foreach ($filters as $Key => $Value) {
-            $filters[$Key]['enabled'] = getPref($data_dir, $username,
-                $filters[$Key]['prefname']);
-        }
+            _("COMMERCIAL - RBL+ Dial-up entries.");
+    }
 
-        return $filters;
+    $filters['ORDB']['prefname'] = 'filters_spam_ordb';
+    $filters['ORDB']['name'] = 'Open Relay Database List';
+    $filters['ORDB']['link'] = 'http://www.ordb.org/';
+    $filters['ORDB']['dns'] = 'relays.ordb.org';
+    $filters['ORDB']['result'] = '127.0.0.2';
+    $filters['ORDB']['comment'] =
+        _("FREE - ORDB was born when ORBS went off the air. It seems to have fewer false positives than ORBS did though.");
+
+    $filters['FiveTen Direct']['prefname'] = 'filters_spam_fiveten_src';
+    $filters['FiveTen Direct']['name'] = 'Five-Ten-sg.com Direct SPAM Sources';
+    $filters['FiveTen Direct']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+    $filters['FiveTen Direct']['dns'] = 'blackholes.five-ten-sg.com';
+    $filters['FiveTen Direct']['result'] = '127.0.0.2';
+    $filters['FiveTen Direct']['comment'] =
+        _("FREE - Five-Ten-sg.com - Direct SPAM sources.");
+
+    $filters['FiveTen DUL']['prefname'] = 'filters_spam_fiveten_dul';
+    $filters['FiveTen DUL']['name'] = 'Five-Ten-sg.com DUL Lists';
+    $filters['FiveTen DUL']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+    $filters['FiveTen DUL']['dns'] = 'blackholes.five-ten-sg.com';
+    $filters['FiveTen DUL']['result'] = '127.0.0.3';
+    $filters['FiveTen DUL']['comment'] =
+        _("FREE - Five-Ten-sg.com - Dial-up lists - includes some DSL IPs.");
+
+    $filters['FiveTen Unc. OptIn']['prefname'] = 'filters_spam_fiveten_oi';
+    $filters['FiveTen Unc. OptIn']['name'] = 'Five-Ten-sg.com Unconfirmed OptIn Lists';
+    $filters['FiveTen Unc. OptIn']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+    $filters['FiveTen Unc. OptIn']['dns'] = 'blackholes.five-ten-sg.com';
+    $filters['FiveTen Unc. OptIn']['result'] = '127.0.0.4';
+    $filters['FiveTen Unc. OptIn']['comment'] =
+        _("FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in.");
+
+    $filters['FiveTen Others']['prefname'] = 'filters_spam_fiveten_oth';
+    $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com Other Misc. Servers';
+    $filters['FiveTen Others']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+    $filters['FiveTen Others']['dns'] = 'blackholes.five-ten-sg.com';
+    $filters['FiveTen Others']['result'] = '127.0.0.5';
+    $filters['FiveTen Others']['comment'] =
+        _("FREE - Five-Ten-sg.com - Other misc. servers.");
+
+    $filters['FiveTen Single Stage']['prefname'] = 'filters_spam_fiveten_ss';
+    $filters['FiveTen Single Stage']['name'] = 'Five-Ten-sg.com Single Stage Servers';
+    $filters['FiveTen Single Stage']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+    $filters['FiveTen Single Stage']['dns'] = 'blackholes.five-ten-sg.com';
+    $filters['FiveTen Single Stage']['result'] = '127.0.0.6';
+    $filters['FiveTen Single Stage']['comment'] =
+        _("FREE - Five-Ten-sg.com - Single Stage servers.");
+
+    $filters['FiveTen SPAM Support']['prefname'] = 'filters_spam_fiveten_supp';
+    $filters['FiveTen SPAM Support']['name'] = 'Five-Ten-sg.com SPAM Support Servers';
+    $filters['FiveTen SPAM Support']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+    $filters['FiveTen SPAM Support']['dns'] = 'blackholes.five-ten-sg.com';
+    $filters['FiveTen SPAM Support']['result'] = '127.0.0.7';
+    $filters['FiveTen SPAM Support']['comment'] =
+        _("FREE - Five-Ten-sg.com - SPAM Support servers.");
+
+    $filters['FiveTen Web forms']['prefname'] = 'filters_spam_fiveten_wf';
+    $filters['FiveTen Web forms']['name'] = 'Five-Ten-sg.com Web Form IPs';
+    $filters['FiveTen Web forms']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+    $filters['FiveTen Web forms']['dns'] = 'blackholes.five-ten-sg.com';
+    $filters['FiveTen Web forms']['result'] = '127.0.0.8';
+    $filters['FiveTen Web forms']['comment'] =
+        _("FREE - Five-Ten-sg.com - Web Form IPs.");
+
+    $filters['Dorkslayers']['prefname'] = 'filters_spam_dorks';
+    $filters['Dorkslayers']['name'] = 'Dorkslayers Lists';
+    $filters['Dorkslayers']['link'] = 'http://www.dorkslayers.com';
+    $filters['Dorkslayers']['dns'] = 'orbs.dorkslayers.com';
+    $filters['Dorkslayers']['result'] = '127.0.0.2';
+    $filters['Dorkslayers']['comment'] =
+        _("FREE - Dorkslayers appears to include only really bad open relays outside the US to avoid being sued. Interestingly enough, their website recommends you NOT use their service.");
+
+    $filters['SPAMhaus']['prefname'] = 'filters_spam_spamhaus';
+    $filters['SPAMhaus']['name'] = 'SPAMhaus Lists';
+    $filters['SPAMhaus']['link'] = 'http://www.spamhaus.org';
+    $filters['SPAMhaus']['dns'] = 'sbl.spamhaus.org';
+    $filters['SPAMhaus']['result'] = '127.0.0.6';
+    $filters['SPAMhaus']['comment'] =
+        _("FREE - SPAMhaus - A list of well-known SPAM sources.");
+
+    $filters['SPAMcop']['prefname'] = 'filters_spam_spamcop';
+    $filters['SPAMcop']['name'] = 'SPAM Cop Lists';
+    $filters['SPAMcop']['link'] = 'http://spamcop.net/bl.shtml';
+    $filters['SPAMcop']['dns'] = 'bl.spamcop.net';
+    $filters['SPAMcop']['result'] = '127.0.0.2';
+    $filters['SPAMcop']['comment'] =
+        _("FREE, for now - SpamCop - An interesting solution that lists servers that have a very high spam to legit email ratio (85 percent or more).");
+
+    $filters['dev.null.dk']['prefname'] = 'filters_spam_devnull';
+    $filters['dev.null.dk']['name'] = 'dev.null.dk Lists';
+    $filters['dev.null.dk']['link'] = 'http://dev.null.dk/';
+    $filters['dev.null.dk']['dns'] = 'dev.null.dk';
+    $filters['dev.null.dk']['result'] = '127.0.0.2';
+    $filters['dev.null.dk']['comment'] =
+        _("FREE - dev.null.dk - I don't have any detailed info on this list.");
+
+    $filters['visi.com']['prefname'] = 'filters_spam_visi';
+    $filters['visi.com']['name'] = 'visi.com Relay Stop List';
+    $filters['visi.com']['link'] = 'http://relays.visi.com';
+    $filters['visi.com']['dns'] = 'relays.visi.com';
+    $filters['visi.com']['result'] = '127.0.0.2';
+    $filters['visi.com']['comment'] =
+        _("FREE - visi.com - Relay Stop List. Very conservative OpenRelay List.");
+
+    $filters['ahbl.org Open Relays']['prefname'] = 'filters_spam_2mb_or';
+    $filters['ahbl.org Open Relays']['name'] = 'ahbl.org Open Relays List';
+    $filters['ahbl.org Open Relays']['link'] = 'http://www.ahbl.org/';
+    $filters['ahbl.org Open Relays']['dns'] = 'dnsbl.ahbl.org';
+    $filters['ahbl.org Open Relays']['result'] = '127.0.0.2';
+    $filters['ahbl.org Open Relays']['comment'] =
+        _("FREE - ahbl.org Open Relays - Another list of Open Relays.");
+
+    $filters['ahbl.org SPAM Source']['prefname'] = 'filters_spam_2mb_ss';
+    $filters['ahbl.org SPAM Source']['name'] = 'ahbl.org SPAM Source List';
+    $filters['ahbl.org SPAM Source']['link'] = 'http://www.ahbl.org/';
+    $filters['ahbl.org SPAM Source']['dns'] = 'dnsbl.ahbl.org';
+    $filters['ahbl.org SPAM Source']['result'] = '127.0.0.4';
+    $filters['ahbl.org SPAM Source']['comment'] =
+        _("FREE - ahbl.org SPAM Source - List of Direct SPAM Sources.");
+
+    $filters['ahbl.org SPAM ISPs']['prefname'] = 'filters_spam_2mb_isp';
+    $filters['ahbl.org SPAM ISPs']['name'] = 'ahbl.org SPAM-friendly ISP List';
+    $filters['ahbl.org SPAM ISPs']['link'] = 'http://www.ahbl.org/';
+    $filters['ahbl.org SPAM ISPs']['dns'] = 'dnsbl.ahbl.org';
+    $filters['ahbl.org SPAM ISPs']['result'] = '127.0.0.7';
+    $filters['ahbl.org SPAM ISPs']['comment'] =
+        _("FREE - ahbl.org SPAM ISPs - List of SPAM-friendly ISPs.");
+
+    $filters['Leadmon DUL']['prefname'] = 'filters_spam_lm_dul';
+    $filters['Leadmon DUL']['name'] = 'Leadmon.net DUL List';
+    $filters['Leadmon DUL']['link'] = 'http://www.leadmon.net/spamguard/';
+    $filters['Leadmon DUL']['dns'] = 'spamguard.leadmon.net';
+    $filters['Leadmon DUL']['result'] = '127.0.0.2';
+    $filters['Leadmon DUL']['comment'] =
+        _("FREE - Leadmon DUL - Another list of Dial-up or otherwise dynamically assigned IPs.");
+
+    $filters['Leadmon SPAM Source']['prefname'] = 'filters_spam_lm_ss';
+    $filters['Leadmon SPAM Source']['name'] = 'Leadmon.net SPAM Source List';
+    $filters['Leadmon SPAM Source']['link'] = 'http://www.leadmon.net/spamguard/';
+    $filters['Leadmon SPAM Source']['dns'] = 'spamguard.leadmon.net';
+    $filters['Leadmon SPAM Source']['result'] = '127.0.0.3';
+    $filters['Leadmon SPAM Source']['comment'] =
+        _("FREE - Leadmon SPAM Source - List of IPs Leadmon.net has received SPAM directly from.");
+
+    $filters['Leadmon Bulk Mailers']['prefname'] = 'filters_spam_lm_bm';
+    $filters['Leadmon Bulk Mailers']['name'] = 'Leadmon.net Bulk Mailers List';
+    $filters['Leadmon Bulk Mailers']['link'] = 'http://www.leadmon.net/spamguard/';
+    $filters['Leadmon Bulk Mailers']['dns'] = 'spamguard.leadmon.net';
+    $filters['Leadmon Bulk Mailers']['result'] = '127.0.0.4';
+    $filters['Leadmon Bulk Mailers']['comment'] =
+        _("FREE - Leadmon Bulk Mailers - Bulk mailers that do not require confirmed opt-in or that have allowed known spammers to become clients and abuse their services.");
+
+    $filters['Leadmon Open Relays']['prefname'] = 'filters_spam_lm_or';
+    $filters['Leadmon Open Relays']['name'] = 'Leadmon.net Open Relays List';
+    $filters['Leadmon Open Relays']['link'] = 'http://www.leadmon.net/spamguard/';
+    $filters['Leadmon Open Relays']['dns'] = 'spamguard.leadmon.net';
+    $filters['Leadmon Open Relays']['result'] = '127.0.0.5';
+    $filters['Leadmon Open Relays']['comment'] =
+        _("FREE - Leadmon Open Relays - Single Stage Open Relays that are not listed on other active RBLs.");
+
+    $filters['Leadmon Multi-stage']['prefname'] = 'filters_spam_lm_ms';
+    $filters['Leadmon Multi-stage']['name'] = 'Leadmon.net Multi-Stage Relay List';
+    $filters['Leadmon Multi-stage']['link'] = 'http://www.leadmon.net/spamguard/';
+    $filters['Leadmon Multi-stage']['dns'] = 'spamguard.leadmon.net';
+    $filters['Leadmon Multi-stage']['result'] = '127.0.0.6';
+    $filters['Leadmon Multi-stage']['comment'] =
+        _("FREE - Leadmon Multi-stage - Multi-Stage Open Relays that are not listed on other active RBLs and that have sent SPAM to Leadmon.net.");
+
+    $filters['Leadmon SpamBlock']['prefname'] = 'filters_spam_lm_sb';
+    $filters['Leadmon SpamBlock']['name'] = 'Leadmon.net SpamBlock Sites List';
+    $filters['Leadmon SpamBlock']['link'] = 'http://www.leadmon.net/spamguard/';
+    $filters['Leadmon SpamBlock']['dns'] = 'spamguard.leadmon.net';
+    $filters['Leadmon SpamBlock']['result'] = '127.0.0.7';
+    $filters['Leadmon SpamBlock']['comment'] =
+        _("FREE - Leadmon SpamBlock - Sites on this listing have sent Leadmon.net direct SPAM from IPs in netblocks where the entire block has no DNS mappings. It's a list of BLOCKS of IPs being used by people who have SPAMmed Leadmon.net.");
+
+    $filters['NJABL Open Relays']['prefname'] = 'filters_spam_njabl_or';
+    $filters['NJABL Open Relays']['name'] = 'NJABL Open Relay/Direct Spam Source List';
+    $filters['NJABL Open Relays']['link'] = 'http://www.njabl.org/';
+    $filters['NJABL Open Relays']['dns'] = 'dnsbl.njabl.org';
+    $filters['NJABL Open Relays']['result'] = '127.0.0.2';
+    $filters['NJABL Open Relays']['comment'] =
+        _("FREE, for now - Not Just Another Blacklist - Both Open Relays and Direct SPAM Sources.");
+
+    $filters['NJABL DUL']['prefname'] = 'filters_spam_njabl_dul';
+    $filters['NJABL DUL']['name'] = 'NJABL Dial-ups List';
+    $filters['NJABL DUL']['link'] = 'http://www.njabl.org/';
+    $filters['NJABL DUL']['dns'] = 'dnsbl.njabl.org';
+    $filters['NJABL DUL']['result'] = '127.0.0.3';
+    $filters['NJABL DUL']['comment'] =
+        _("FREE, for now - Not Just Another Blacklist - Dial-up IPs.");
+
+    $filters['Conf DSBL.ORG Relay']['prefname'] = 'filters_spam_dsbl_conf_ss';
+    $filters['Conf DSBL.ORG Relay']['name'] = 'DSBL.org Confirmed Relay List';
+    $filters['Conf DSBL.ORG Relay']['link'] = 'http://www.dsbl.org/';
+    $filters['Conf DSBL.ORG Relay']['dns'] = 'list.dsbl.org';
+    $filters['Conf DSBL.ORG Relay']['result'] = '127.0.0.2';
+    $filters['Conf DSBL.ORG Relay']['comment'] =
+        _("FREE - Distributed Sender Boycott List - Confirmed Relays");
+
+    $filters['Conf DSBL.ORG Multi-Stage']['prefname'] = 'filters_spam_dsbl_conf_ms';
+    $filters['Conf DSBL.ORG Multi-Stage']['name'] = 'DSBL.org Confirmed Multi-Stage Relay List';
+    $filters['Conf DSBL.ORG Multi-Stage']['link'] = 'http://www.dsbl.org/';
+    $filters['Conf DSBL.ORG Multi-Stage']['dns'] = 'multihop.dsbl.org';
+    $filters['Conf DSBL.ORG Multi-Stage']['result'] = '127.0.0.2';
+    $filters['Conf DSBL.ORG Multi-Stage']['comment'] =
+        _("FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays");
+
+    $filters['UN-Conf DSBL.ORG']['prefname'] = 'filters_spam_dsbl_unc';
+    $filters['UN-Conf DSBL.ORG']['name'] = 'DSBL.org UN-Confirmed Relay List';
+    $filters['UN-Conf DSBL.ORG']['link'] = 'http://www.dsbl.org/';
+    $filters['UN-Conf DSBL.ORG']['dns'] = 'unconfirmed.dsbl.org';
+    $filters['UN-Conf DSBL.ORG']['result'] = '127.0.0.2';
+    $filters['UN-Conf DSBL.ORG']['comment'] =
+        _("FREE - Distributed Sender Boycott List - UN-Confirmed Relays");
+
+    foreach ($filters as $Key => $Value) {
+        $filters[$Key]['enabled'] = getPref($data_dir, $username, $filters[$Key]['prefname']);
     }
 
-    function remove_filter ($id) {
-        global $data_dir, $username;
+    return $filters;
+}
 
-        while ($nextFilter = getPref($data_dir, $username, 'filter' .
-            ($id + 1))) {
-            setPref($data_dir, $username, 'filter' . $id, $nextFilter);
-            $id ++;
-        }
+/**
+ * Removes a User filter
+ * @param int $id ID of the filter to remove
+ * @access private
+ */
+function remove_filter ($id) {
+    global $data_dir, $username;
 
-        removePref($data_dir, $username, 'filter' . $id);
+    while ($nextFilter = getPref($data_dir, $username, 'filter' . ($id + 1))) {
+        setPref($data_dir, $username, 'filter' . $id, $nextFilter);
+        $id ++;
     }
 
-    function filter_swap($id1, $id2) {
-        global $data_dir, $username;
+    removePref($data_dir, $username, 'filter' . $id);
+}
 
-        $FirstFilter = getPref($data_dir, $username, 'filter' . $id1);
-        $SecondFilter = getPref($data_dir, $username, 'filter' . $id2);
+/**
+ * Swaps two filters
+ * @param int $id1 ID of first filter to swap
+ * @param int $id2 ID of second filter to swap
+ * @access private
+ */
+function filter_swap($id1, $id2) {
+    global $data_dir, $username;
 
-        if ($FirstFilter && $SecondFilter) {
-            setPref($data_dir, $username, 'filter' . $id2, $FirstFilter);
-            setPref($data_dir, $username, 'filter' . $id1, $SecondFilter);
+    $FirstFilter = getPref($data_dir, $username, 'filter' . $id1);
+    $SecondFilter = getPref($data_dir, $username, 'filter' . $id2);
+
+    if ($FirstFilter && $SecondFilter) {
+        setPref($data_dir, $username, 'filter' . $id2, $FirstFilter);
+        setPref($data_dir, $username, 'filter' . $id1, $SecondFilter);
+    }
+}
+
+/**
+ * This updates the filter rules when renaming or deleting folders
+ * @param array $args
+ * @access private
+ */
+function update_for_folder ($args) {
+
+    $old_folder = $args[0];
+    $new_folder = $args[2];
+    $action = $args[1];
+    global $data_dir, $username;
+    $filters = array();
+    $filters = load_filters();
+    $filter_count = count($filters);
+    $p = 0;
+    for ($i = 0; $i < $filter_count; $i++) {
+        if (!empty($filters)) {
+            if ($old_folder == $filters[$i]['folder']) {
+                if ($action == 'rename') {
+                    $filters[$i]['folder'] = $new_folder;
+                    setPref($data_dir, $username, 'filter'.$i,
+                    $filters[$i]['where'].','.$filters[$i]['what'].','.$new_folder);
+                }
+                elseif ($action == 'delete') {
+                    remove_filter($p);
+                    $p = $p-1;
+                }
+            }
+        $p++;
         }
     }
-?>
+}
+
+/**
+ * Display formated error message
+ * @param string $string text message
+ * @return string html formated text message
+ * @access private
+ */
+function do_error($string) {
+    global $color;
+    echo "<p align=\"center\"><font color=\"$color[2]\">";
+    echo $string;
+    echo "</font></p>\n";
+}