First cleanup pass - indention

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1842 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 6eb1881ce63e557dc925e015cadf97559eebe56c..c09562ebbc6e6815356b5b0062b501cfc942b6c6 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -46,18 +46,18 @@
             if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) {
                 $size = $regs[1];
                 if ($imap_general_debug) {
             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";
+                    echo "<small><tt><font color=\"#CC0000\">Size is $size</font></tt></small><br>\n";

                 }
 
                 $total_size = 0;
                 do {
                 }
 
                 $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);
+                    $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;
                 } while ($total_size < $size);
 
                 $size = 0;


@@ -72,10 +72,13 @@
         $response = $regs[1];
         $message = trim($regs[2]);
 
         $response = $regs[1];
         $message = trim($regs[2]);
 

-        if ($imap_general_debug) echo '--<br>';
+        if ($imap_general_debug) {
+            echo '--<br>';
+        }

 
 

-        if ($handle_errors == false)
+        if ($handle_errors == false) {

             return $data;
             return $data;

+        }

 
         if ($response == 'NO') {
             // ignore this error from m$ exchange, it is not fatal (aka bug)
 
         if ($response == 'NO') {
             // ignore this error from m$ exchange, it is not fatal (aka bug)


@@ -112,28 +115,30 @@
             // Also check if we are forced to use a separate IMAP connection
             if ((!isset($imap_stream) && !isset($imapConnection)) ||
                 $UseSeparateImapConnection) {
             // 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;
+                    $stream = sqimap_login($username, $key, $imapServerAddress,
+                                           $imapPort, 10);
+                    $previously_connected = false;

             } elseif (isset($imapConnection)) {
                 $stream = $imapConnection;
                 $previously_connected = true;
             } else {
                 $previously_connected = true;
             } elseif (isset($imapConnection)) {
                 $stream = $imapConnection;
                 $previously_connected = true;
             } else {
                 $previously_connected = true;

-        $stream = $imap_stream;
+                $stream = $imap_stream;

             }
 
             if (sqimap_get_num_messages($stream, 'INBOX') > 0) {
                 // Filter spam from inbox before we sort them into folders
             }
 
             if (sqimap_get_num_messages($stream, 'INBOX') > 0) {
                 // Filter spam from inbox before we sort them into folders

-                if ($AllowSpamFilters)
-                spam_filters($stream);
+                if ($AllowSpamFilters) {
+                    spam_filters($stream);
+                }

 
                 // Sort into folders
                 user_filters($stream);
             }
 
 
                 // Sort into folders
                 user_filters($stream);
             }
 

-            if (!$previously_connected)
+            if (!$previously_connected) {

                 sqimap_logout($stream);
                 sqimap_logout($stream);

+            }

         }
     }
 
         }
     }
 


@@ -152,17 +157,17 @@
                 *  If it's "TO OR CC", we have to do two searches, one for TO
                 *  and the other for 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']);
+                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
             } else {
                 /*
                 *  If it's a normal TO, CC, SUBJECT, or FROM, then handle it

-            *  normally.
+                *  normally.

                 */
                 */

-            filter_search_and_delete($imap_stream, $filters[$i]['where'],
-            $filters[$i]['what'], $filters[$i]['folder']);
+                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
             }
         }
         // Clean out the mailbox whether or not auto_expunge is on


@@ -182,11 +187,11 @@
                     substr($read[$r], 0, 8) != '* SEARCH'; $r++) {}
         if ($response == 'OK') {
             $ids = explode(' ', $read[$r]);
                     substr($read[$r], 0, 8) != '* SEARCH'; $r++) {}
         if ($response == 'OK') {
             $ids = explode(' ', $read[$r]);

-        if (sqimap_mailbox_exists($imap, $where_to)) {
+            if (sqimap_mailbox_exists($imap, $where_to)) {

                 for ($j=2; $j < count($ids); $j++) {
                 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');
+                    $id = trim($ids[$j]);
+                    sqimap_messages_copy ($imap, $id, $id, $where_to);
+                    sqimap_messages_flag ($imap, $id, $id, 'Deleted');

                 }
             }
         }
                 }
             }
         }


@@ -205,8 +210,9 @@
         $run = 0;
 
         foreach ($filters as $Key=> $Value) {
         $run = 0;
 
         foreach ($filters as $Key=> $Value) {

-            if ($Value['enabled'])
+            if ($Value['enabled']) {

                 $run ++;
                 $run ++;

+            }

         }
 
         // short-circuit
         }
 
         // short-circuit


@@ -221,10 +227,12 @@
         fputs($imap_stream, 'A3999 FETCH 1:* (FLAGS BODY.PEEK[HEADER.FIELDS ' .
               "(RECEIVED)])\r\n");
 
         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);
+        $read = filters_sqimap_read_data ($imap_stream, 'A3999', true,
+                                          $response, $message);

 
 

-        if ($response != 'OK')
+        if ($response != 'OK') {

             return;
             return;

+        }

 
         $i = 0;
         while ($i < count($read)) {
 
         $i = 0;
         while ($i < count($read)) {


@@ -248,37 +256,38 @@
                 }
             }
 
                 }
             }
 

-        // 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)
+            // 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] != '*' &&
             // 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))
-                {
+                     $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))) {
 
                 // 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
+                    // 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 ($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 ($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
+                                }

                             }
                             }

-                       // If we've checked one IP and YourHop is just a space
-                       if ($SpamFilters_YourHop == ' ') {
-                          break;  // don't check any more
-                       }
-                        }

                         }
                     }
                 }
                         }
                     }
                 }


@@ -287,11 +296,11 @@
 
             // Lookie!  It's spam!  Yum!
             if ($IsSpam) {
 
             // Lookie!  It's spam!  Yum!
             if ($IsSpam) {

-                if (sqimap_mailbox_exists ($imap_stream, $filters_spam_folder)) {
+                if (sqimap_mailbox_exists($imap_stream, $filters_spam_folder)) {

                     sqimap_messages_copy ($imap_stream, $MsgNum, $MsgNum,
                     sqimap_messages_copy ($imap_stream, $MsgNum, $MsgNum,

-                $filters_spam_folder);
+                                          $filters_spam_folder);

                     sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum,
                     sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum,

-                'Deleted');
+                                          'Deleted');

                 }
             } else {
             }
                 }
             } else {
             }


@@ -310,13 +319,14 @@
         foreach ($filters as $key => $value) {
             if ($filters[$key]['enabled']) {
                 if ($filters[$key]['dns']) {
         foreach ($filters as $key => $value) {
             if ($filters[$key]['enabled']) {
                 if ($filters[$key]['dns']) {

-            $filter_revip = $d . '.' . $c . '.' . $b . '.' . $a . '.' .
+                    $filter_revip = $d . '.' . $c . '.' . $b . '.' . $a . '.' .

                                     $filters[$key]['dns'];
                     if (strlen($SpamFilters_DNScache[$filter_revip]) == 0) {
                                     $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']) {
+                        $SpamFilters_DNScache[$filter_revip] =
+                                               gethostbyname($filter_revip);
+                    }
+                    if ($SpamFilters_DNScache[$filter_revip] ==
+                        $filters[$key]['result']) {

                         return 1;
                     }
                 }
                         return 1;
                     }
                 }


@@ -346,7 +356,7 @@
         $filters['MAPS RBL']['dns'] = 'blackholes.mail-abuse.org';
         $filters['MAPS RBL']['result'] = '127.0.0.2';
         $filters['MAPS RBL']['comment'] =
         $filters['MAPS RBL']['dns'] = 'blackholes.mail-abuse.org';
         $filters['MAPS RBL']['result'] = '127.0.0.2';
         $filters['MAPS RBL']['comment'] =

-    _("COMMERCIAL - This list contains servers that are verified spam senders. It is a pretty reliable list to scan spam from.");
+            _("COMMERCIAL - This list contains servers that are verified spam senders. It is a pretty reliable list to scan spam from.");

 
         $filters['MAPS RSS']['prefname'] = 'filters_spam_maps_rss';
         $filters['MAPS RSS']['name'] = 'MAPS Relay Spam Stopper';
 
         $filters['MAPS RSS']['prefname'] = 'filters_spam_maps_rss';
         $filters['MAPS RSS']['name'] = 'MAPS Relay Spam Stopper';


@@ -354,7 +364,7 @@
         $filters['MAPS RSS']['dns'] = 'relays.mail-abuse.org';
         $filters['MAPS RSS']['result'] = '127.0.0.2';
         $filters['MAPS RSS']['comment'] =
         $filters['MAPS RSS']['dns'] = 'relays.mail-abuse.org';
         $filters['MAPS RSS']['result'] = '127.0.0.2';
         $filters['MAPS RSS']['comment'] =

-    _("COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to be relayed through their system will be banned with this.  Another good one to use.");
+            _("COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to be relayed through their system will be banned with this.  Another good one to use.");

 
         $filters['MAPS DUL']['prefname'] = 'filters_spam_maps_dul';
         $filters['MAPS DUL']['name'] = 'MAPS Dial-Up List';
 
         $filters['MAPS DUL']['prefname'] = 'filters_spam_maps_dul';
         $filters['MAPS DUL']['name'] = 'MAPS Dial-Up List';


@@ -362,7 +372,7 @@
         $filters['MAPS DUL']['dns'] = 'dialups.mail-abuse.org';
         $filters['MAPS DUL']['result'] = '127.0.0.3';
         $filters['MAPS DUL']['comment'] =
         $filters['MAPS DUL']['dns'] = 'dialups.mail-abuse.org';
         $filters['MAPS DUL']['result'] = '127.0.0.3';
         $filters['MAPS DUL']['comment'] =

-    _("COMMERCIAL - Dial-up users are often filtered out since they should use their ISP's mail servers to send mail.  Spammers typically get a dial-up account and send spam directly from there.");
+            _("COMMERCIAL - Dial-up users are often filtered out since they should use their ISP's mail servers to send mail.  Spammers typically get a dial-up account and send spam directly from there.");

 
         $filters['MAPS RBLplus-RBL']['prefname'] = 'filters_spam_maps_rblplus_rbl';
         $filters['MAPS RBLplus-RBL']['name'] = 'MAPS RBL+ RBL List';
 
         $filters['MAPS RBLplus-RBL']['prefname'] = 'filters_spam_maps_rblplus_rbl';
         $filters['MAPS RBLplus-RBL']['name'] = 'MAPS RBL+ RBL List';


@@ -370,7 +380,7 @@
         $filters['MAPS RBLplus-RBL']['dns'] = 'rbl-plus.mail-abuse.org';
         $filters['MAPS RBLplus-RBL']['result'] = '127.0.0.2';
         $filters['MAPS RBLplus-RBL']['comment'] =
         $filters['MAPS RBLplus-RBL']['dns'] = 'rbl-plus.mail-abuse.org';
         $filters['MAPS RBLplus-RBL']['result'] = '127.0.0.2';
         $filters['MAPS RBLplus-RBL']['comment'] =

-    _("COMMERCIAL - RBL+ Blackhole entries.");
+            _("COMMERCIAL - RBL+ Blackhole entries.");

 
         $filters['MAPS RBLplus-RSS']['prefname'] = 'filters_spam_maps_rblplus_rss';
         $filters['MAPS RBLplus-RSS']['name'] = 'MAPS RBL+ List RSS entries';
 
         $filters['MAPS RBLplus-RSS']['prefname'] = 'filters_spam_maps_rblplus_rss';
         $filters['MAPS RBLplus-RSS']['name'] = 'MAPS RBL+ List RSS entries';


@@ -378,7 +388,7 @@
         $filters['MAPS RBLplus-RSS']['dns'] = 'rbl-plus.mail-abuse.org';
         $filters['MAPS RBLplus-RSS']['result'] = '127.0.0.2';
         $filters['MAPS RBLplus-RSS']['comment'] =
         $filters['MAPS RBLplus-RSS']['dns'] = 'rbl-plus.mail-abuse.org';
         $filters['MAPS RBLplus-RSS']['result'] = '127.0.0.2';
         $filters['MAPS RBLplus-RSS']['comment'] =

-    _("COMMERCIAL - RBL+ OpenRelay entries.");
+            _("COMMERCIAL - RBL+ OpenRelay entries.");

 
         $filters['MAPS RBLplus-DUL']['prefname'] = 'filters_spam_maps_rblplus_dul';
         $filters['MAPS RBLplus-DUL']['name'] = 'MAPS RBL+ List DUL entries';
 
         $filters['MAPS RBLplus-DUL']['prefname'] = 'filters_spam_maps_rblplus_dul';
         $filters['MAPS RBLplus-DUL']['name'] = 'MAPS RBL+ List DUL entries';


@@ -386,7 +396,7 @@
         $filters['MAPS RBLplus-DUL']['dns'] = 'rbl-plus.mail-abuse.org';
         $filters['MAPS RBLplus-DUL']['result'] = '127.0.0.3';
         $filters['MAPS RBLplus-DUL']['comment'] =
         $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.");
+            _("COMMERCIAL - RBL+ Dial-up entries.");

 
         $filters['Osirusoft Relays']['prefname'] = 'filters_spam_maps_osirusoft_relay';
         $filters['Osirusoft Relays']['name'] = 'Osirusoft Relay List';
 
         $filters['Osirusoft Relays']['prefname'] = 'filters_spam_maps_osirusoft_relay';
         $filters['Osirusoft Relays']['name'] = 'Osirusoft Relay List';


@@ -394,7 +404,7 @@
         $filters['Osirusoft Relays']['dns'] = 'relays.osirusoft.com';
         $filters['Osirusoft Relays']['result'] = '127.0.0.2';
         $filters['Osirusoft Relays']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_maps_osirusoft_dul';
         $filters['Osirusoft DUL']['name'] = 'Osirusoft Dialup List';


@@ -402,7 +412,7 @@
         $filters['Osirusoft DUL']['dns'] = 'relays.osirusoft.com';
         $filters['Osirusoft DUL']['result'] = '127.0.0.3';
         $filters['Osirusoft DUL']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_maps_osirusoft_rc';
         $filters['Osirusoft Spam Source']['name'] = 'Osirusoft Confirmed Spam Source List';


@@ -410,7 +420,7 @@
         $filters['Osirusoft Spam Source']['dns'] = 'relays.osirusoft.com';
         $filters['Osirusoft Spam Source']['result'] = '127.0.0.4';
         $filters['Osirusoft Spam Source']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_maps_osirusoft_sh';
         $filters['Osirusoft Smart Host']['name'] = 'Osirusoft Smart Host List';


@@ -418,7 +428,7 @@
         $filters['Osirusoft Smart Host']['dns'] = 'relays.osirusoft.com';
         $filters['Osirusoft Smart Host']['result'] = '127.0.0.5';
         $filters['Osirusoft Smart Host']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_maps_osirusoft_ss';
         $filters['Osirusoft SPAMware']['name'] = 'Osirusoft Spamware Developers List';


@@ -426,7 +436,7 @@
         $filters['Osirusoft SPAMware']['dns'] = 'relays.osirusoft.com';
         $filters['Osirusoft SPAMware']['result'] = '127.0.0.6';
         $filters['Osirusoft SPAMware']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_maps_osirusoft_sl';
         $filters['Osirusoft Unc. OptIn']['name'] = 'Osirusoft Unconfirmed OptIn Server List';


@@ -434,7 +444,7 @@
         $filters['Osirusoft Unc. OptIn']['dns'] = 'relays.osirusoft.com';
         $filters['Osirusoft Unc. OptIn']['result'] = '127.0.0.7';
         $filters['Osirusoft Unc. OptIn']['comment'] =
         $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.");
+            _("FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt users in without confirmation.");

 
         $filters['ORDB']['prefname'] = 'filters_spam_ordb';
         $filters['ORDB']['name'] = 'Open Relay Database List';
 
         $filters['ORDB']['prefname'] = 'filters_spam_ordb';
         $filters['ORDB']['name'] = 'Open Relay Database List';


@@ -442,7 +452,7 @@
         $filters['ORDB']['dns'] = 'relays.ordb.org';
         $filters['ORDB']['result'] = '127.0.0.2';
         $filters['ORDB']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_orbz';
         $filters['ORBZ Inputs']['name'] = 'ORBZ Inputs List';


@@ -450,7 +460,7 @@
         $filters['ORBZ Inputs']['dns'] = 'inputs.orbz.org';
         $filters['ORBZ Inputs']['result'] = '127.0.0.2';
         $filters['ORBZ Inputs']['comment'] =
         $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).");
+            _("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']['prefname'] = 'filters_spam_orbz_outputs';
         $filters['ORBZ Outputs']['name'] = 'ORBZ Outputs List';


@@ -458,7 +468,7 @@
         $filters['ORBZ Outputs']['dns'] = 'outputs.orbz.org';
         $filters['ORBZ Outputs']['result'] = '127.0.0.2';
         $filters['ORBZ Outputs']['comment'] =
         $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).");
+            _("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']['prefname'] = 'filters_spam_fiveten_src';
         $filters['FiveTen Direct']['name'] = 'Five-Ten-sg.com Direct SPAM Sources';


@@ -466,7 +476,7 @@
         $filters['FiveTen Direct']['dns'] = 'blackholes.five-ten-sg.com';
         $filters['FiveTen Direct']['result'] = '127.0.0.2';
         $filters['FiveTen Direct']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_fiveten_dul';
         $filters['FiveTen DUL']['name'] = 'Five-Ten-sg.com DUL Lists';


@@ -474,7 +484,7 @@
         $filters['FiveTen DUL']['dns'] = 'blackholes.five-ten-sg.com';
         $filters['FiveTen DUL']['result'] = '127.0.0.3';
         $filters['FiveTen DUL']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_fiveten_oi';
         $filters['FiveTen Unc. OptIn']['name'] = 'Five-Ten-sg.com Unconfirmed OptIn Lists';


@@ -482,7 +492,7 @@
         $filters['FiveTen Unc. OptIn']['dns'] = 'blackholes.five-ten-sg.com';
         $filters['FiveTen Unc. OptIn']['result'] = '127.0.0.4';
         $filters['FiveTen Unc. OptIn']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_fiveten_oth';
         $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com Other Misc. Servers';


@@ -490,31 +500,31 @@
         $filters['FiveTen Others']['dns'] = 'blackholes.five-ten-sg.com';
         $filters['FiveTen Others']['result'] = '127.0.0.5';
         $filters['FiveTen Others']['comment'] =
         $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.");
+            _("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']['prefname'] = 'filters_spam_dorks';
         $filters['Dorkslayers']['name'] = 'Dorkslayers Lists';


@@ -522,7 +532,7 @@
         $filters['Dorkslayers']['dns'] = 'orbs.dorkslayers.com';
         $filters['Dorkslayers']['result'] = '127.0.0.2';
         $filters['Dorkslayers']['comment'] =
         $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.");
+            _("FREE - Dorkslayers appears to include only really bad open relays outside the US to avoid being sued. Interestingly enough, their website recommends you NOT use their service.");

 
         $filters['ORBL']['prefname'] = 'filters_spam_orbl';
         $filters['ORBL']['name'] = 'ORBL Lists';
 
         $filters['ORBL']['prefname'] = 'filters_spam_orbl';
         $filters['ORBL']['name'] = 'ORBL Lists';


@@ -530,7 +540,7 @@
         $filters['ORBL']['dns'] = 'or.orbl.org';
         $filters['ORBL']['result'] = '127.0.0.2';
         $filters['ORBL']['comment'] =
         $filters['ORBL']['dns'] = 'or.orbl.org';
         $filters['ORBL']['result'] = '127.0.0.2';
         $filters['ORBL']['comment'] =

-    _("FREE - ORBL is another ORBS spinoff formed after ORBS shut down. May be SLOOOOOOW!");
+            _("FREE - ORBL is another ORBS spinoff formed after ORBS shut down. May be SLOOOOOOW!");

 
         $filters['ORBZ-UK Inputs']['prefname'] = 'filters_spam_orbzuk_in';
         $filters['ORBZ-UK Inputs']['name'] = 'ORBZ-UK Inputs Lists';
 
         $filters['ORBZ-UK Inputs']['prefname'] = 'filters_spam_orbzuk_in';
         $filters['ORBZ-UK Inputs']['name'] = 'ORBZ-UK Inputs Lists';


@@ -538,7 +548,7 @@
         $filters['ORBZ-UK Inputs']['dns'] = 'orbz.gst-group.co.uk';
         $filters['ORBZ-UK Inputs']['result'] = '127.0.0.3';
         $filters['ORBZ-UK Inputs']['comment'] =
         $filters['ORBZ-UK Inputs']['dns'] = 'orbz.gst-group.co.uk';
         $filters['ORBZ-UK Inputs']['result'] = '127.0.0.3';
         $filters['ORBZ-UK Inputs']['comment'] =

-    _("FREE - orbz.gst-group.co.uk - Inputs only.");
+            _("FREE - orbz.gst-group.co.uk - Inputs only.");

 
         $filters['ORBZ-UK Outputs']['prefname'] = 'filters_spam_orbzuk_out';
         $filters['ORBZ-UK Outputs']['name'] = 'ORBZ-UK Outputs Lists';
 
         $filters['ORBZ-UK Outputs']['prefname'] = 'filters_spam_orbzuk_out';
         $filters['ORBZ-UK Outputs']['name'] = 'ORBZ-UK Outputs Lists';


@@ -546,7 +556,7 @@
         $filters['ORBZ-UK Outputs']['dns'] = 'orbz.gst-group.co.uk';
         $filters['ORBZ-UK Outputs']['result'] = '127.0.0.2';
         $filters['ORBZ-UK Outputs']['comment'] =
         $filters['ORBZ-UK Outputs']['dns'] = 'orbz.gst-group.co.uk';
         $filters['ORBZ-UK Outputs']['result'] = '127.0.0.2';
         $filters['ORBZ-UK Outputs']['comment'] =

-    _("FREE - orbz.gst-group.co.uk - Outputs only.");
+            _("FREE - orbz.gst-group.co.uk - Outputs only.");

 
         $filters['ORBZ-UK Postmaster']['prefname'] = 'filters_spam_orbzuk_pst';
         $filters['ORBZ-UK Postmaster']['name'] = 'ORBZ-UK Postmaster Bouncer Lists';
 
         $filters['ORBZ-UK Postmaster']['prefname'] = 'filters_spam_orbzuk_pst';
         $filters['ORBZ-UK Postmaster']['name'] = 'ORBZ-UK Postmaster Bouncer Lists';


@@ -554,7 +564,7 @@
         $filters['ORBZ-UK Postmaster']['dns'] = 'orbz.gst-group.co.uk';
         $filters['ORBZ-UK Postmaster']['result'] = '127.0.0.9';
         $filters['ORBZ-UK Postmaster']['comment'] =
         $filters['ORBZ-UK Postmaster']['dns'] = 'orbz.gst-group.co.uk';
         $filters['ORBZ-UK Postmaster']['result'] = '127.0.0.9';
         $filters['ORBZ-UK Postmaster']['comment'] =

-    _("FREE - orbz.gst-group.co.uk - mailservers that refuse or bounce email addressed to postmaster@<theirdomain>.");
+            _("FREE - orbz.gst-group.co.uk - mailservers that refuse or bounce email addressed to postmaster@<theirdomain>.");

 
         $filters['SPAMcop']['prefname'] = 'filters_spam_spamcop';
         $filters['SPAMcop']['name'] = 'SPAM Cop Lists';
 
         $filters['SPAMcop']['prefname'] = 'filters_spam_spamcop';
         $filters['SPAMcop']['name'] = 'SPAM Cop Lists';


@@ -562,7 +572,7 @@
         $filters['SPAMcop']['dns'] = 'bl.spamcop.net';
         $filters['SPAMcop']['result'] = '127.0.0.2';
         $filters['SPAMcop']['comment'] =
         $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).");
+            _("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,
 
         foreach ($filters as $Key => $Value) {
             $filters[$Key]['enabled'] = getPref($data_dir, $username,