Some cleanup

plugins/filters/filters.php

@@ -25,577 +25,577 @@
  * $Id$
  */
 
-    function filters_sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
-        global $color, $squirrelmail_language, $imap_general_debug;
+function filters_sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
+    global $color, $squirrelmail_language, $imap_general_debug;
 
-        $data = array();
-        $size = 0;
+    $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);
-            }
-
-            $data[] = $read;
+    do {
+        $read = fgets($imap_stream, 9096);
+        if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
+            break;  // found end of reply
+        }
 
-            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";
-                }
+        // Continue if needed for this single line
+        while (strpos($read, "\n") === false) {
+            $read .= fgets($imap_stream, 9096);
+        }
 
-                $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);
+        $data[] = $read;
 
-                $size = 0;
-            }
-            // For debugging purposes
+        if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
+            $size = $regs[1];
             if ($imap_general_debug) {
-                echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
-                flush();
+                echo "<small><tt><font color=\"#CC0000\">Size is $size</font></tt></small><br>\n";
             }
-        } while (true);
 
-        $response = $regs[1];
-        $message = trim($regs[2]);
+            $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);
 
+            $size = 0;
+        }
+        // For debugging purposes
         if ($imap_general_debug) {
-            echo '--<br>';
+            echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
+            flush();
         }
+    } while (true);
 
-        if ($handle_errors == false) {
-            return $data;
-        }
+    $response = $regs[1];
+    $message = trim($regs[2]);
 
-        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;
-            }
-        } else if ($response == 'BAD') {
+    if ($imap_general_debug) {
+        echo '--<br>';
+    }
+
+    if (!$handle_errors) {
+        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 : Bad or malformed request.");
-            echo "</b><br>\n";
-            echo _("Server responded: ");
-            echo $message . "</font><br>\n";
+            echo "<br><b><font color=$color[2]>\n" .
+                 _("ERROR : Could not complete request.") .
+                 "</b><br>\n" .
+                 _("Reason Given: ") .
+                 $message . "</font><br>\n";
             exit;
         }
-
-        return $data;
+    } else if ($response == 'BAD') {
+        set_up_language($squirrelmail_language);
+        echo "<br><b><font color=$color[2]>\n" .
+             _("ERROR : Bad or malformed request.") .
+             "</b><br>\n" .
+             _("Server responded: ") .
+             $message . "</font><br>\n";
+        exit;
     }
 
+    return $data;
+}
+
+
+function start_filters() {
+    global $mailbox, $username, $key, $imapServerAddress, $imapPort, $imap,
+        $imap_general, $filters, $imap_stream, $imapConnection,
+    $UseSeparateImapConnection, $AllowSpamFilters;
+
+    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;
+        }
 
-    function start_filters() {
-        global $mailbox, $username, $key, $imapServerAddress, $imapPort, $imap,
-            $imap_general, $filters, $imap_stream, $imapConnection,
-        $UseSeparateImapConnection, $AllowSpamFilters;
-
-        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;
+        if (sqimap_get_num_messages($stream, 'INBOX') > 0) {
+            // Filter spam from inbox before we sort them into folders
+            if ($AllowSpamFilters) {
+                spam_filters($stream);
             }
 
-            if (sqimap_get_num_messages($stream, 'INBOX') > 0) {
-                // Filter spam from inbox before we sort them into folders
-                if ($AllowSpamFilters) {
-                    spam_filters($stream);
-                }
-
-                // Sort into folders
-                user_filters($stream);
-            }
+            // Sort into folders
+            user_filters($stream);
+        }
 
-            if (!$previously_connected) {
-                sqimap_logout($stream);
-            }
+        if (!$previously_connected) {
+            sqimap_logout($stream);
         }
     }
-
-
-    function user_filters($imap_stream) {
-        $filters = load_filters();
-        if (! $filters) return;
-
-        sqimap_mailbox_select($imap_stream, 'INBOX');
-
-        // 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
-                *  normally.
-                */
-                filter_search_and_delete($imap_stream, $filters[$i]['where'],
-                $filters[$i]['what'], $filters[$i]['folder']);
-            }
+}
+
+
+function user_filters($imap_stream) {
+    $filters = load_filters();
+    if (! $filters) return;
+
+    sqimap_mailbox_select($imap_stream, 'INBOX');
+
+    // 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
+            *  normally.
+            */
+            filter_search_and_delete($imap_stream, $filters[$i]['where'],
+            $filters[$i]['what'], $filters[$i]['folder']);
         }
-        // Clean out the mailbox whether or not auto_expunge is on
-        // That way it looks like it was redirected properly
-        sqimap_mailbox_expunge($imap_stream, 'INBOX');
     }
-
-    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);
-
-        // This may have problems with EIMS due to it being goofy
-
-        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');
-                }
+    // Clean out the mailbox whether or not auto_expunge is on
+    // That way it looks like it was redirected properly
+    sqimap_mailbox_expunge($imap_stream, 'INBOX');
+}
+
+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);
+
+    // This may have problems with EIMS due to it being goofy
+
+    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');
             }
         }
     }
+}
 
-    // These are the spam filters
-    function spam_filters($imap_stream) {
-        global $data_dir, $username;
-        global $SpamFilters_YourHop;
-        global $SpamFilters_DNScache;
+// 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();
+    $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 = 0;
 
-        // short-circuit
-        if ($run == 0) {
-            return;
+    foreach ($filters as $Key=> $Value) {
+        if ($Value['enabled']) {
+            $run ++;
         }
+    }
 
-        sqimap_mailbox_select($imap_stream, 'INBOX');
+    // short-circuit
+    if ($run == 0) {
+        return;
+    }
 
-        // 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");
+    sqimap_mailbox_select($imap_stream, 'INBOX');
 
-        $read = filters_sqimap_read_data ($imap_stream, 'A3999', true,
-                                          $response, $message);
+    // 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");
 
-        if ($response != 'OK') {
-            return;
-        }
+    $read = filters_sqimap_read_data ($imap_stream, 'A3999', true,
+                                    $response, $message);
 
-        $i = 0;
-        while ($i < count($read)) {
-            // EIMS will give funky results
-            $Chunks = explode(' ', $read[$i]);
-            if ($Chunks[0] != '*') {
-                $i ++;
-                continue;
-            }
-            $MsgNum = $Chunks[1];
+    if ($response != 'OK') {
+        return;
+    }
 
-            $IPs = array();
+    $i = 0;
+    while ($i < count($read)) {
+        // EIMS will give funky results
+        $Chunks = explode(' ', $read[$i]);
+        if ($Chunks[0] != '*') {
             $i ++;
-            $IsSpam = 0;
-            $Scan = 1;
+            continue;
+        }
+        $MsgNum = $Chunks[1];
 
-            // Check for normal IMAP servers
-            if ($filters_spam_scan == 'new') {
-                if (is_int(strpos($Chunks[4], '\Seen'))) {
-                    $Scan = 0;
-                }
+        $IPs = array();
+        $i ++;
+        $IsSpam = 0;
+        $Scan = 1;
+
+        // Check for normal IMAP servers
+        if ($filters_spam_scan == 'new') {
+            if (is_int(strpos($Chunks[4], '\Seen'))) {
+                $Scan = 0;
             }
+        }
 
-            // 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)) {
-                // 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
-                                }
-                                // If we've checked one IP and YourHop is
-                                // just a space
-                                if ($SpamFilters_YourHop == ' ') {
-                                    break;  // don't check any more
-                                }
+        // 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)) {
+            // 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
+                            }
+                            // If we've checked one IP and YourHop is
+                            // just a space
+                            if ($SpamFilters_YourHop == ' ') {
+                                break;  // don't check any more
                             }
                         }
                     }
                 }
-                $i ++;
             }
+            $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 ($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 {
         }
+    }
 
-        sqimap_mailbox_expunge($imap_stream, 'INBOX');
+    sqimap_mailbox_expunge($imap_stream, 'INBOX');
 
-        session_register('SpamFilters_DNScache');
-    }
+    session_register('SpamFilters_DNScache');
+}
 
 
-    // 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;
-                    }
+// 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;
                 }
             }
         }
-        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;
+}
+
+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;
-
-        $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.");
-
-        $filters['MAPS RSS']['prefname'] = 'filters_spam_maps_rss';
-        $filters['MAPS RSS']['name'] = 'MAPS Relay Spam Stopper';
-        $filters['MAPS RSS']['link'] = 'http://www.mail-abuse.org/rss/';
-        $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.");
-
-        $filters['MAPS DUL']['prefname'] = 'filters_spam_maps_dul';
-        $filters['MAPS DUL']['name'] = 'MAPS Dial-Up List';
-        $filters['MAPS DUL']['link'] = 'http://www.mail-abuse.org/dul/';
-        $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.");
-
-        $filters['MAPS RBLplus-RBL']['prefname'] = 'filters_spam_maps_rblplus_rbl';
-        $filters['MAPS RBLplus-RBL']['name'] = 'MAPS RBL+ RBL List';
-        $filters['MAPS RBLplus-RBL']['link'] = 'http://www.mail-abuse.org/';
-        $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.");
-
-        $filters['MAPS RBLplus-RSS']['prefname'] = 'filters_spam_maps_rblplus_rss';
-        $filters['MAPS RBLplus-RSS']['name'] = 'MAPS RBL+ List RSS entries';
-        $filters['MAPS RBLplus-RSS']['link'] = 'http://www.mail-abuse.org/';
-        $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.");
-
-        $filters['MAPS RBLplus-DUL']['prefname'] = 'filters_spam_maps_rblplus_dul';
-        $filters['MAPS RBLplus-DUL']['name'] = 'MAPS RBL+ List DUL entries';
-        $filters['MAPS RBLplus-DUL']['link'] = 'http://www.mail-abuse.org/';
-        $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['Osirusoft Insecure Formmail']['prefname'] = 'filters_spam_maps_osirusoft_fm';
-        $filters['Osirusoft Insecure Formmail']['name'] = 'Osirusoft Insecure formmail.cvi Script List';
-        $filters['Osirusoft Insecure Formmail']['link'] = 'http://relays.osirusoft.com/';
-        $filters['Osirusoft Insecure Formmail']['dns'] = 'relays.osirusoft.com';
-        $filters['Osirusoft Insecure Formmail']['result'] = '127.0.0.8';
-        $filters['Osirusoft Insecure Formmail']['comment'] =
-            _("FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail.cgi scripts. (planned).");
-
-        $filters['Osirusoft Open Proxy']['prefname'] = 'filters_spam_maps_osirusoft_op';
-        $filters['Osirusoft Open Proxy']['name'] = 'Osirusoft Open Proxy Server List';
-        $filters['Osirusoft Open Proxy']['link'] = 'http://relays.osirusoft.com/';
-        $filters['Osirusoft Open Proxy']['dns'] = 'relays.osirusoft.com';
-        $filters['Osirusoft Open Proxy']['result'] = '127.0.0.9';
-        $filters['Osirusoft Open Proxy']['comment'] =
-            _("FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers.");
-
-        $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['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% or more).");
-
-        foreach ($filters as $Key => $Value) {
-            $filters[$Key]['enabled'] = getPref($data_dir, $username,
-                $filters[$Key]['prefname']);
-        }
-
-        return $filters;
+    return $filters;
+}
+
+function load_spam_filters() {
+    global $data_dir, $username;
+
+    $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.");
+
+    $filters['MAPS RSS']['prefname'] = 'filters_spam_maps_rss';
+    $filters['MAPS RSS']['name'] = 'MAPS Relay Spam Stopper';
+    $filters['MAPS RSS']['link'] = 'http://www.mail-abuse.org/rss/';
+    $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.");
+
+    $filters['MAPS DUL']['prefname'] = 'filters_spam_maps_dul';
+    $filters['MAPS DUL']['name'] = 'MAPS Dial-Up List';
+    $filters['MAPS DUL']['link'] = 'http://www.mail-abuse.org/dul/';
+    $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.");
+
+    $filters['MAPS RBLplus-RBL']['prefname'] = 'filters_spam_maps_rblplus_rbl';
+    $filters['MAPS RBLplus-RBL']['name'] = 'MAPS RBL+ RBL List';
+    $filters['MAPS RBLplus-RBL']['link'] = 'http://www.mail-abuse.org/';
+    $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.");
+
+    $filters['MAPS RBLplus-RSS']['prefname'] = 'filters_spam_maps_rblplus_rss';
+    $filters['MAPS RBLplus-RSS']['name'] = 'MAPS RBL+ List RSS entries';
+    $filters['MAPS RBLplus-RSS']['link'] = 'http://www.mail-abuse.org/';
+    $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.");
+
+    $filters['MAPS RBLplus-DUL']['prefname'] = 'filters_spam_maps_rblplus_dul';
+    $filters['MAPS RBLplus-DUL']['name'] = 'MAPS RBL+ List DUL entries';
+    $filters['MAPS RBLplus-DUL']['link'] = 'http://www.mail-abuse.org/';
+    $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['Osirusoft Insecure Formmail']['prefname'] = 'filters_spam_maps_osirusoft_fm';
+    $filters['Osirusoft Insecure Formmail']['name'] = 'Osirusoft Insecure formmail.cvi Script List';
+    $filters['Osirusoft Insecure Formmail']['link'] = 'http://relays.osirusoft.com/';
+    $filters['Osirusoft Insecure Formmail']['dns'] = 'relays.osirusoft.com';
+    $filters['Osirusoft Insecure Formmail']['result'] = '127.0.0.8';
+    $filters['Osirusoft Insecure Formmail']['comment'] =
+        _("FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail.cgi scripts. (planned).");
+
+    $filters['Osirusoft Open Proxy']['prefname'] = 'filters_spam_maps_osirusoft_op';
+    $filters['Osirusoft Open Proxy']['name'] = 'Osirusoft Open Proxy Server List';
+    $filters['Osirusoft Open Proxy']['link'] = 'http://relays.osirusoft.com/';
+    $filters['Osirusoft Open Proxy']['dns'] = 'relays.osirusoft.com';
+    $filters['Osirusoft Open Proxy']['result'] = '127.0.0.9';
+    $filters['Osirusoft Open Proxy']['comment'] =
+        _("FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers.");
+
+    $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['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% or more).");
+
+    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 ++;
-        }
+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);
+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);
     }
+}
 ?>

plugins/filters/setup.php

@@ -24,82 +24,86 @@
  * $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)
-   //        Seems to be related to UW
-   global $UseSeparateImapConnection;
-   $UseSeparateImapConnection = false;
+/*
+ * Set this to true if you have problems -- check the README file
+ * Note:  This doesn't work all of the time (No idea why)
+ *        Seems to be related to UW
+ */
+global $UseSeparateImapConnection;
+$UseSeparateImapConnection = false;
 
-   // Set this to false if you do not want the user to be able to enable
-   // spam filters
-   global $AllowSpamFilters;
-   $AllowSpamFilters = true;
+/*
+ * Set this to false if you do not want the user to be able to enable
+ * spam filters
+ */
+global $AllowSpamFilters;
+$AllowSpamFilters = true;
 
-   // Set this to a string containing something unique to the line in the
-   // header you want me to find IPs to scan the databases with.  For example,
-   // All the email coming IN from the internet to my site has a line in
-   // the header that looks like (all on one line):
-   // Received: [from usw-sf-list1.sourceforge.net (usw-sf-fw2.sourceforge.net
-   //    [216.136.171.252]) by firewall.persistence.com (SYSADMIN-antispam
-   //     0.2) with
-   // Since this line indicates the FIRST hop the email takes into my network,
-   // I set my SpamFilters_YourHop to 'by firewall.persistence.com' but any
-   // case-sensitive string will do.  You can set it to something found on
-   // every line in the header (like ' ') if you want to scan all IPs in
-   // the header (lots of false alarms here tho).
+/*
+ * Set this to a string containing something unique to the line in the
+ * header you want me to find IPs to scan the databases with.  For example,
+ * All the email coming IN from the internet to my site has a line in
+ * the header that looks like (all on one line):
+ * Received: [from usw-sf-list1.sourceforge.net (usw-sf-fw2.sourceforge.net
+ *    [216.136.171.252]) by firewall.persistence.com (SYSADMIN-antispam
+ *     0.2) with
+ * Since this line indicates the FIRST hop the email takes into my network,
+ * I set my SpamFilters_YourHop to 'by firewall.persistence.com' but any
+ * case-sensitive string will do.  You can set it to something found on
+ * every line in the header (like ' ') if you want to scan all IPs in
+ * the header (lots of false alarms here tho).
+ */
+global $SpamFilters_YourHop;
+$SpamFilters_YourHop = ' ';
 
-   global $SpamFilters_YourHop;
-   $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;
+ * would tell filters to not even bother doing the DNS queries for that
+ * IP and any email coming from it are SPAM - false would mean that any
+ * email coming from it would NOT be SPAM
+ */
+global $SpamFilters_DNScache;
 
-   // A cache of IPs we've already checked or are known bad boys or good boys
-   // ie. $SpamFilters_DNScache["210.54.220.18"] = true;
-   // would tell filters to not even bother doing the DNS queries for that
-   // IP and any email coming from it are SPAM - false would mean that any
-   // email coming from it would NOT be SPAM
-   global $SpamFilters_DNScache;
+require_once ('../plugins/filters/filters.php');
 
-   require_once ('../plugins/filters/filters.php');
+function squirrelmail_plugin_init_filters() {
+    global $squirrelmail_plugin_hooks;
+    global $mailbox, $imap_stream, $imapConnection;
 
-   function squirrelmail_plugin_init_filters() {
-      global $squirrelmail_plugin_hooks;
-      global $mailbox, $imap_stream, $imapConnection;
+    $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['optpage_register_block']['filters'] = 'squirrelmail_plugin_optpage_register_block';
+    $squirrelmail_plugin_hooks['special_mailbox']['filters'] = 'filters_special_mailbox';
+}
 
-      $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['optpage_register_block']['filters'] = 'squirrelmail_plugin_optpage_register_block';
-      $squirrelmail_plugin_hooks['special_mailbox']['filters'] = 'filters_special_mailbox';
-   }
+function filters_special_mailbox( $mb ) {
+    GLOBAL $data_dir, $username;
 
-   function filters_special_mailbox( $mb ) {
-       GLOBAL $data_dir, $username;
+    return( $mb == getPref($data_dir, $username, 'filters_spam_folder', 'na' ) );
 
-       if ( $mb == getPref($data_dir, $username, 'filters_spam_folder', 'na' ) ) {
-           return( TRUE );
-       } else {
-           return( FALSE );
-       }
-   }
+}
 
-   function squirrelmail_plugin_optpage_register_block() {
-      global $optpage_blocks;
-      global $AllowSpamFilters;
+function squirrelmail_plugin_optpage_register_block() {
+    global $optpage_blocks;
+    global $AllowSpamFilters;
 
-      $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
-      );
+    $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(
+    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
-         );
-      }
-   }
+        );
+    }
+}
 ?>

plugins/filters/spamoptions.php

@@ -24,160 +24,169 @@
  * $Id$
  */
 
-   chdir ('..');
-   require_once('../src/validate.php');
-   require_once('../functions/page_header.php');
-   require_once('../functions/imap.php');
-   require_once('../src/load_prefs.php');
-
-   global $AllowSpamFilters;
-
-   displayPageHeader($color, 'None');
-
-   if (isset($spam_submit)) {
-      $spam_filters = load_spam_filters();
-      setPref($data_dir, $username, 'filters_spam_folder', $filters_spam_folder_set);
-      setPref($data_dir, $username, 'filters_spam_scan', $filters_spam_scan_set);
-      foreach ($spam_filters as $Key => $Value) {
-          $input = $spam_filters[$Key]['prefname'] . '_set';
-          setPref($data_dir, $username, $spam_filters[$Key]['prefname'],
-              $$input);
-      }
-   }
-
-   $filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder');
-   $filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan');
-   $filters = load_filters();
-
-   echo "<table width=95% align=center border=0 cellpadding=2 cellspacing=0 bgcolor=\"$color[0]\">".
-           '<tr><th align=center>' . _("Spam Filtering") . '</th></tr>'.
-       '</table>';
-
-    if ($SpamFilters_YourHop == ' ') {
-       echo '<BR><center><b>' . _("WARNING! Tell your admin to set the SpamFilters_YourHop variable") . '</b></center><BR>';
+chdir ('..');
+require_once('../src/validate.php');
+require_once('../functions/page_header.php');
+require_once('../functions/imap.php');
+require_once('../src/load_prefs.php');
+
+global $AllowSpamFilters;
+
+displayPageHeader($color, 'None');
+
+if (isset($spam_submit)) {
+    $spam_filters = load_spam_filters();
+    setPref($data_dir, $username, 'filters_spam_folder', $filters_spam_folder_set);
+    setPref($data_dir, $username, 'filters_spam_scan', $filters_spam_scan_set);
+    foreach ($spam_filters as $Key => $Value) {
+        $input = $spam_filters[$Key]['prefname'] . '_set';
+        if ( isset( $$input ) ) {
+            setPref( $data_dir, $username, $spam_filters[$Key]['prefname'],
+                     $$input);
+        }
+    }
+}
+
+$filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder');
+$filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan');
+$filters = load_filters();
+
+echo "<table width=95% align=center border=0 cellpadding=2 cellspacing=0 bgcolor=\"$color[0]\">".
+        '<tr><th align=center>' . _("Spam Filtering") . '</th></tr>'.
+    '</table>';
+
+if ($SpamFilters_YourHop == ' ') {
+    echo '<BR><center><b>' .
+        _("WARNING! Tell your admin to set the SpamFilters_YourHop variable") .
+        '</b></center><BR>';
+}
+
+
+if (isset($action) && $action == 'spam') {
+    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+    $boxes = sqimap_mailbox_list($imapConnection);
+    sqimap_logout($imapConnection);
+    for ($i = 0; $i < count($boxes) && $filters_spam_folder == ''; $i++) {
+
+        if ($boxes[$i]['flags'][0] != 'noselect' &&
+            $boxes[$i]['flags'][1] != 'noselect' &&
+            $boxes[$i]['flags'][2] != 'noselect') {
+            $filters_spam_folder = $boxes[$i]['unformatted'];
+        }
     }
 
+    echo '<form method=post action="spamoptions.php">'.
+        '<center>'.
+        '<table width=85% cellpadding=2 cellspacing=0 border=0>'.
+            '<tr>'.
+            '<th align=right nowrap>' . _("Move spam to:") . '</th>'.
+            '<td><select name="filters_spam_folder_set">';
+
+    for ($i = 0; $i < count($boxes); $i++) {
+        if (! in_array('noselect', $boxes[$i]['flags'])) {
+            $box = $boxes[$i]['unformatted'];
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
+            if ($filters_spam_folder == $box) {
+                echo "<OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
+            } else {
+                echo "<OPTION VALUE=\"$box\">$box2</OPTION>\n";
+            }
+        }
+    }
+    echo    '</select>'.
+        '</td>'.
+        '</tr>'.
+        '<tr><td></td><td>' .
+        _("Moving spam directly to the trash may not be a good idea at first, since messages from friends and mailing lists might accidentally be marked as spam. Whatever folder you set this to, make sure that it gets cleaned out periodically, so that you don't have an excessively large mailbox hanging around.") .
+        '</td></tr>'.
+        '<tr>'.
+            '<th align=right nowrap>' . _("What to Scan:") . '</th>'.
+            '<td><select name="filters_spam_scan_set">'.
+            '<option value=""';
+    if ($filters_spam_scan == '') {
+        echo ' SELECTED';
+    }
+    echo '>' . _("All messages") . '</option>'.
+            '<option value="new"';
+    if ($filters_spam_scan == 'new') {
+        echo ' SELECTED';
+    }
+    echo '>' . _("Only unread messages") . '</option>' .
+            '</select>'.
+        '</td>'.
+    '</tr>'.
+    '<tr>'.
+        '<td></td><td>'.
+        _("The more messages you scan, the longer it takes.  I would suggest that you scan only new messages.  If you make a change to your filters, I would set it to scan all messages, then go view my INBOX, then come back and set it to scan only new messages.  That way, your new spam filters will be applied and you'll scan even the spam you read with the new filters.").
+        '</td></tr>';
+
+    $spam_filters = load_spam_filters();
+
+    foreach ($spam_filters as $Key => $Value) {
+        echo "<tr><th align=right nowrap>$Key</th>\n" .
+            '<td><input type=checkbox name="' .
+            $spam_filters[$Key]['prefname'] .
+            '_set"';
+        if ($spam_filters[$Key]['enabled']) {
+            echo ' CHECKED';
+        }
+        echo '> - ';
+        if ($spam_filters[$Key]['link']) {
+            echo '<a href="' .
+                 $spam_filters[$Key]['link'] .
+                 '" target="_blank">';
+        }
+        echo $spam_filters[$Key]['name'];
+        if ($spam_filters[$Key]['link']) {
+            echo '</a>';
+        }
+        echo '</td></tr><tr><td></td><td>' .
+            $spam_filters[$Key]['comment'] .
+            "</td></tr>\n";
+    }
+    echo '<tr><td colspan=2 align=center><input type=submit name="spam_submit" value="' . _("Save") . '"></td></tr>'.
+        '</table>'.
+        '</center>'.
+        '</form>';
+
+}
+
+if (! isset($action) || $action != 'spam') {
+
+    echo '<p align=center>[<a href="spamoptions.php?action=spam">' . _("Edit") . '</a>]' .
+         ' - [<a href="../../src/options.php">' . _("Done") . '</a>]</center><br><br>';
+    printf( _("Spam is sent to <b>%s</b>"), ($filters_spam_folder?$filters_spam_folder:_("[<i>not set yet</i>]") ) );
+    echo '<br>';
+    printf( _("Spam scan is limited to <b>%s</b>"), (($filters_spam_scan == 'new')?_("New Messages Only"):_("All Messages") ) );
+    echo '</p>'.
+        "<table border=0 cellpadding=3 cellspacing=0 align=center bgcolor=\"$color[0]\">";
+
+    $spam_filters = load_spam_filters();
+
+    foreach ($spam_filters as $Key => $Value) {
+        echo '<tr><th align=center>';
+
+        if ($spam_filters[$Key]['enabled']) {
+            echo _("ON");
+        } else {
+            echo _("OFF");
+        }
+
+        echo '</th><td>&nbsp;-&nbsp;</td><td>';
+
+        if ($spam_filters[$Key]['link']) {
+        echo '<a href="' .
+            $spam_filters[$Key]['link'] .
+            '" target="_blank">';
+        }
+
+        echo $spam_filters[$Key]['name'];
+        if ($spam_filters[$Key]['link']) {
+        echo '</a>';
+        }
+        echo "</td></tr>\n";
+    }
+    echo '</table>';
+}
 
-   if (isset($action) && $action == 'spam') {
-       $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-       $boxes = sqimap_mailbox_list($imapConnection);
-       sqimap_logout($imapConnection);
-       for ($i = 0; $i < count($boxes) && $filters_spam_folder == ''; $i++) {
-           if ($boxes[$i]['flags'][0] != 'noselect' &&
-               $boxes[$i]['flags'][1] != 'noselect' &&
-               $boxes[$i]['flags'][2] != 'noselect') {
-               $filters_spam_folder = $boxes[$i]['unformatted'];
-           }
-       }
-
-       echo '<form method=post action="spamoptions.php">'.
-           '<center>'.
-           '<table width=85% cellpadding=2 cellspacing=0 border=0>'.
-               '<tr>'.
-               '<th align=right nowrap>' . _("Move spam to:") . '</th>'.
-               '<td><select name="filters_spam_folder_set">';
-
-       for ($i = 0; $i < count($boxes); $i++) {
-           if (! in_array('noselect', $boxes[$i]['flags'])) {
-               $box = $boxes[$i]['unformatted'];
-               $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
-               if ($filters_spam_folder == $box)
-               echo "<OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
-               else
-               echo "<OPTION VALUE=\"$box\">$box2</OPTION>\n";
-           }
-       }
-       echo    '</select>'.
-           '</td>'.
-           '</tr>'.
-           '<tr><td></td><td>' .
-           _("Moving spam directly to the trash may not be a good idea at first, since messages from friends and mailing lists might accidentally be marked as spam. Whatever folder you set this to, make sure that it gets cleaned out periodically, so that you don't have an excessively large mailbox hanging around.") .
-           '</td></tr>'.
-           '<tr>'.
-               '<th align=right nowrap>' . _("What to Scan:") . '</th>'.
-               '<td><select name="filters_spam_scan_set">'.
-               '<option value=""';
-       if ($filters_spam_scan == '')
-           echo ' SELECTED';
-       echo '>' . _("All messages") . '</option>'.
-               '<option value="new"';
-       if ($filters_spam_scan == 'new')
-           echo ' SELECTED';
-       echo '>' . _("Only unread messages") . '</option>' .
-               '</select>'.
-           '</td>'.
-       '</tr>'.
-       '<tr>'.
-           '<td></td><td>'.
-           _("The more messages you scan, the longer it takes.  I would suggest that you scan only new messages.  If you make a change to your filters, I would set it to scan all messages, then go view my INBOX, then come back and set it to scan only new messages.  That way, your new spam filters will be applied and you'll scan even the spam you read with the new filters.").
-           '</td></tr>';
-
-       $spam_filters = load_spam_filters();
-
-       foreach ($spam_filters as $Key => $Value) {
-           echo "<tr><th align=right nowrap>$Key</th>\n" .
-               '<td><input type=checkbox name="' .
-               $spam_filters[$Key]['prefname'] .
-               '_set"';
-           if ($spam_filters[$Key]['enabled'])
-           echo ' CHECKED';
-           echo '> - ';
-           if ($spam_filters[$Key]['link']) {
-           echo '<a href="' .
-                   $spam_filters[$Key]['link'] .
-                   '" target="_blank">';
-           }
-           echo $spam_filters[$Key]['name'];
-           if ($spam_filters[$Key]['link']) {
-           echo '</a>';
-           }
-           echo '</td></tr><tr><td></td><td>' .
-               $spam_filters[$Key]['comment'] .
-               "</td></tr>\n";
-       }
-       echo '<tr><td colspan=2 align=center><input type=submit name="spam_submit" value="' . _("Save") . '"></td></tr>'.
-           '</table>'.
-           '</center>'.
-           '</form>';
-
-   }
-
-   if (! isset($action) || $action != 'spam') {
-
-       echo '<p align=center>[<a href="spamoptions.php?action=spam">' . _("Edit") . '</a>]' .
-   ' - [<a href="../../src/options.php">' . _("Done") . '</a>]</center><br><br>';
-       printf( _("Spam is sent to <b>%s</b>"), ($filters_spam_folder?$filters_spam_folder:_("[<i>not set yet</i>]") ) );
-       echo '<br>';
-       printf( _("Spam scan is limited to <b>%s</b>"), (($filters_spam_scan == 'new')?_("New Messages Only"):_("All Messages") ) );
-       echo '</p>'.
-           "<table border=0 cellpadding=3 cellspacing=0 align=center bgcolor=\"$color[0]\">";
-
-       $spam_filters = load_spam_filters();
-
-       foreach ($spam_filters as $Key => $Value) {
-           echo '<tr><th align=center>';
-
-           if ($spam_filters[$Key]['enabled']) {
-               echo _("ON");
-           } else {
-               echo _("OFF");
-           }
-
-           echo '</th><td>&nbsp;-&nbsp;</td><td>';
-
-           if ($spam_filters[$Key]['link']) {
-           echo '<a href="' .
-               $spam_filters[$Key]['link'] .
-               '" target="_blank">';
-           }
-
-           echo $spam_filters[$Key]['name'];
-           if ($spam_filters[$Key]['link']) {
-           echo '</a>';
-           }
-           echo "</td></tr>\n";
-       }
-       echo '</table>';
-   }
-
-?>
+?>