Fixed wrong sqimap_run_command call. The $sid is added inside
[squirrelmail.git] / plugins / filters / filters.php
index c8aa414cf53c83d94420fa929fe4558e509699f2..1300394e305c6cd54874544bad82ceb15eaf2251 100644 (file)
@@ -3,7 +3,7 @@
 /**
  * Message and Spam Filter Plugin
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This plugin filters your inbox into different folders based upon given
  * $Id$
  */
 
-function filters_sqimap_read_data ($imap_stream, $pre, $handle_errors, &$response, &$message) {
-    global $color, $squirrelmail_language, $imap_general_debug;
+function filters_SaveCache () {
+    global $data_dir, $SpamFilters_DNScache;
 
-    $data = array();
-    $size = 0;
+    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+');
+
+    foreach ($SpamFilters_DNScache as $Key=> $Value) {
+       $tstr = $Key . ',' . $Value['L'] . ',' . $Value['T'] . "\n";
+       fputs ($fp1, $tstr);
+    }
+    fclose($fp1);
+    flock($fp,LOCK_UN);
+    fclose($fp);
+}
+
+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];
+               }
+            }
 
-    do {
-        $read = fgets($imap_stream, 9096);
-        if (ereg("^$pre (OK|BAD|NO)(.*)$", $read, $regs)) {
-            break;  // found end of reply
+            flock($fp,LOCK_UN);
         }
+    }
+}
+
+function filters_bulkquery($filters_spam_scan, $filters, $read) {
+    global $SpamFilters_YourHop, $attachment_dir, $username,
+           $SpamFilters_DNScache, $SpamFilters_BulkQuery,
+           $SpamFilters_CacheTTL;
 
-        // Continue if needed for this single line
-        while (strpos($read, "\n") === false) {
-            $read .= fgets($imap_stream, 9096);
+    $IPs = array();
+    $i = 0;
+    while ($i < count($read)) {
+        // EIMS will give funky results
+        $Chunks = explode(' ', $read[$i]);
+        if ($Chunks[0] != '*') {
+            $i ++;
+            continue;
         }
+        $MsgNum = $Chunks[1];
 
-        $data[] = $read;
+        $i ++;
 
-        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";
+        // 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")) {
+            // Check to see if this line is the right "Received from" line
+            // to check
+            if (is_int(strpos($read[$i], $SpamFilters_YourHop))) {
+                $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);
+                        $IP = $Chunks[3] . '.' . $Chunks[2] . '.' .
+                              $Chunks[1] . '.' . $Chunks[0];
+                        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 == ' ') {
+                            break;  // don't check any more
+                        }
+                    }
+                }
             }
+            $i ++;
+        }
+    }
 
-            $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();
+    if (count($IPs) > 0) {
+        $rbls = array();
+        foreach ($filters as $key => $value) {
+            if ($filters[$key]['enabled']) {
+                if ($filters[$key]['dns']) {
+                    $rbls[$filters[$key]['dns']] = true;
                 }
-                $data[] = $read;
-                $total_size += strlen($read);
-            } while ($total_size < $size);
+            }
+        }
 
-            $size = 0;
+        $bqfil = $attachment_dir . $username . '-bq.in';
+        $fp = fopen($bqfil, 'w');
+        fputs ($fp, $SpamFilters_CacheTTL . "\n");
+        foreach ($rbls as $key => $value) {
+            fputs ($fp, '.' . $key . "\n");
         }
-        // For debugging purposes
-        if ($imap_general_debug) {
-            echo "<small><tt><font color=\"#CC0000\">$read</font></tt></small><br>\n";
-            flush();
+        fputs ($fp, "----------\n");
+        foreach ($IPs as $key => $value) {
+            fputs ($fp, $key . "\n");
         }
-    } while (true);
-
-    $response = $regs[1];
-    $message = trim($regs[2]);
-
-    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" .
-                 _("ERROR : Could not complete request.") .
-                 "</b><br>\n" .
-                 _("Reason Given: ") .
-                 $message . "</font><br>\n";
-            exit;
+        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();
         }
-    } 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;
+        unlink($bqfil);
     }
-
-    return $data;
 }
 
-
 function start_filters() {
-    global $mailbox, $username, $key, $imapServerAddress, $imapPort, $imap,
-        $imap_general, $filters, $imap_stream, $imapConnection,
-    $UseSeparateImapConnection, $AllowSpamFilters;
+    global $mailbox, $imapServerAddress, $imapPort, $imap,
+           $imap_general, $filters, $imap_stream, $imapConnection,
+           $UseSeparateImapConnection, $AllowSpamFilters;
+
+    sqgetGlobalVar('username', $username, SQ_SESSION);
+    sqgetGlobalVar('key',      $key,      SQ_COOKIE);
 
-    if ($mailbox == 'INBOX') {
+#    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)) ||
@@ -140,74 +198,114 @@ function start_filters() {
         if (!$previously_connected) {
             sqimap_logout($stream);
         }
-    }
+#    }
 }
 
-
 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');
 
     sqimap_mailbox_select($imap_stream, 'INBOX');
-
+    $id = array();
     // For every rule
-    for ($i=0; $i < count($filters); $i++) {
+    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.
             */
-            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']);
+            $id = filter_search_and_delete($imap_stream, 'TO',
+                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $id);
+            $id = filter_search_and_delete($imap_stream, 'CC',
+                  $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $id);
         } 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']);
+            $id = filter_search_and_delete($imap_stream, $filters[$i]['where'],
+                 $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $id);
         }
     }
     // 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');
+    if (count($id)) {
+        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);
+function filter_search_and_delete($imap, $where, $what, $where_to, $user_scan, 
+                                  $del_id) {
+    global $languages, $squirrelmail_language, $allow_charset_search, 
+           $uid_support, $imap_server_type;
+    if ($user_scan == 'new') {
+        $category = 'UNSEEN';
+    } else {
+        $category = 'ALL';
+    }
+
+    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 = trim($where . ' ' . $what[0]);
+        $what  = addslashes(trim($what[1]));
+    }
+
+    if ($imap_server_type == 'macosx') {    
+       $search_str .= ' ' . $where . ' ' . $what;
+    } else {
+       $search_str .= ' ' . $where . ' {' . strlen($what) . "}\r\n"
+                    . $what . "\r\n";
+    }
+
+    /* read data back from IMAP */
+    $read = sqimap_run_command($imap, $search_str, true, $response, $message, $uid_support);
 
     // This may have problems with EIMS due to it being goofy
 
-    for ($r=0; $r < count($read) &&
+    for ($r=0, $num = count($read); $r < $num &&
                 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++) {
+            for ($j=2, $num = count($ids); $j < $num; $j++) {
                 $id = trim($ids[$j]);
+                $del_id[] = $id;
                 sqimap_messages_copy ($imap, $id, $id, $where_to);
-                sqimap_messages_flag ($imap, $id, $id, 'Deleted');
+                sqimap_messages_flag ($imap, $id, $id, 'Deleted',false);
             }
         }
     }
+    return $del_id;
 }
 
 // These are the spam filters
 function spam_filters($imap_stream) {
-    global $data_dir, $username;
+    global $data_dir, $username, $uid_support;
     global $SpamFilters_YourHop;
     global $SpamFilters_DNScache;
+    global $SpamFilters_SharedCache;
+    global $SpamFilters_BulkQuery;
 
     $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();
+    }
+
     $run = 0;
 
     foreach ($filters as $Key=> $Value) {
@@ -225,16 +323,36 @@ function spam_filters($imap_stream) {
 
     // 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') {
+    if ($filters_spam_scan != 'new') {
+        $read = sqimap_run_command($imap_stream, 'FETCH 1:* (FLAGS BODY.PEEK[HEADER.FIELDS ' .
+            '(RECEIVED)])', true, $response, $message, $uid_support);
+    } else {
+        $read = sqimap_run_command($imap_stream, 'SEARCH UNSEEN', true, $response, $message, $uid_support);
+        if ($response != 'OK' || trim($read[0]) == '* SEARCH') {
+           $read = sqimap_run_command($imap_stream, 'FETCH 1:* (FLAGS BODY.PEEK[HEADER.FIELDS ' .
+            '(RECEIVED)])', true, $response, $message, $uid_support);
+        } else {
+            if (isset($read[0])) {
+                if (preg_match("/^\* SEARCH (.+)$/", $read[0], $regs)) {
+                    $search_array = preg_split("/ /", trim($regs[1]));
+                }
+            }
+           $msgs_str = sqimap_message_list_squisher($search_array);
+            $imap_query = 'FETCH '.$msgs_str;
+            $imap_query .= ' (FLAGS BODY.PEEK[HEADER.FIELDS ';
+            $imap_query .= '(RECEIVED)])';
+           $read = sqimap_run_command($imap_stream,$imap_query, true, $response, $message, $uid_support);
+        }
+    }
+    
+    if (isset($response) && $response != 'OK') {
         return;
     }
 
+    if (strlen($SpamFilters_BulkQuery) > 0) {
+       filters_bulkquery($filters_spam_scan, $filters, $read);
+    }
+
     $i = 0;
     while ($i < count($read)) {
         // EIMS will give funky results
@@ -248,14 +366,6 @@ function spam_filters($imap_stream) {
         $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
@@ -269,25 +379,23 @@ function spam_filters($imap_stream) {
             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
-                            }
+                $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
                         }
                     }
                 }
@@ -301,7 +409,7 @@ function spam_filters($imap_stream) {
                 sqimap_messages_copy ($imap_stream, $MsgNum, $MsgNum,
                                     $filters_spam_folder);
                 sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum,
-                                    'Deleted');
+                                    'Deleted', false);
             }
         } else {
         }
@@ -309,24 +417,37 @@ function spam_filters($imap_stream) {
 
     sqimap_mailbox_expunge($imap_stream, 'INBOX');
 
-    session_register('SpamFilters_DNScache');
-}
+    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
 function filters_spam_check_site($a, $b, $c, $d, &$filters) {
-    global $SpamFilters_DNScache;
+    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 (strlen($SpamFilters_DNScache[$filter_revip]) == 0) {
-                    $SpamFilters_DNScache[$filter_revip] =
-                                        gethostbyname($filter_revip);
+
+                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] ==
+                if ($SpamFilters_DNScache[$filter_revip]['L'] ==
                     $filters[$key]['result']) {
                     return 1;
                 }
@@ -338,6 +459,7 @@ function filters_spam_check_site($a, $b, $c, $d, &$filters) {
 
 function load_filters() {
     global $data_dir, $username;
+
     $filters = array();
     for ($i=0; $fltr = getPref($data_dir, $username, 'filter' . $i); $i++) {
         $ary = explode(',', $fltr);
@@ -349,55 +471,57 @@ function load_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.");
+    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.");
+
+        $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';
@@ -471,22 +595,6 @@ function load_spam_filters() {
     $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';
@@ -567,6 +675,134 @@ function load_spam_filters() {
     $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).");
 
+    $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['2mbit.com Open Relays']['prefname'] = 'filters_spam_2mb_or';
+    $filters['2mbit.com Open Relays']['name'] = '2mbit.com Open Relays List';
+    $filters['2mbit.com Open Relays']['link'] = 'http://www.2mbit.com/sbl.php';
+    $filters['2mbit.com Open Relays']['dns'] = 'blackholes.2mbit.com';
+    $filters['2mbit.com Open Relays']['result'] = '127.0.0.2';
+    $filters['2mbit.com Open Relays']['comment'] =
+        _("FREE - 2mbit.com Open Relays - Another list of Open Relays.");
+
+    $filters['2mbit.com SPAM Source']['prefname'] = 'filters_spam_2mb_ss';
+    $filters['2mbit.com SPAM Source']['name'] = '2mbit.com SPAM Source List';
+    $filters['2mbit.com SPAM Source']['link'] = 'http://www.2mbit.com/sbl.php';
+    $filters['2mbit.com SPAM Source']['dns'] = 'blackholes.2mbit.com';
+    $filters['2mbit.com SPAM Source']['result'] = '127.0.0.4';
+    $filters['2mbit.com SPAM Source']['comment'] =
+        _("FREE - 2mbit.com SPAM Source - List of Direct SPAM Sources.");
+
+    $filters['2mbit.com SPAM ISPs']['prefname'] = 'filters_spam_2mb_isp';
+    $filters['2mbit.com SPAM ISPs']['name'] = '2mbit.com SPAM-friendly ISP List';
+    $filters['2mbit.com SPAM ISPs']['link'] = 'http://www.2mbit.com/sbl.php';
+    $filters['2mbit.com SPAM ISPs']['dns'] = 'blackholes.2mbit.com';
+    $filters['2mbit.com SPAM ISPs']['result'] = '127.0.0.10';
+    $filters['2mbit.com SPAM ISPs']['comment'] =
+        _("FREE - 2mbit.com 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']);
@@ -598,4 +834,33 @@ function filter_swap($id1, $id2) {
         setPref($data_dir, $username, 'filter' . $id1, $SecondFilter);
     }
 }
+
+/* This update the filter rules when
+   renaming or deleting folders */
+function update_for_folder ($args) {
+    $old_folder = $args[0];
+        $new_folder = $args[2];
+        $action = $args[1];
+    global $plugins, $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++;
+        }
+    }
+}
 ?>