String bug fix

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

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index eb0640d..0307969 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -1,10 +1,8 @@
 <?php
    /*
-    *  Message and Spam Filter Plugin 
-    *  By Luke Ehresman <luke@squirrelmail.org>
-    *     Tyler Akins
-    *     Brent Bice
-    *  (c) 2000 (GNU GPL - see ../../COPYING)
+    * Message and Spam Filter Plugin 
+    * Copyright (c) 1999-2001 The Squirrelmail Development Team
+    * Licensed under the GNU GPL. For full terms see the file COPYING.
     *
     *  This plugin filters your inbox into different folders based upon given
     *  criteria.  It is most useful for people who are subscibed to mailing lists
@@ -22,6 +20,8 @@
     *
     *  Also view plugins/README.plugins for more information.
     *
+    * $Id$    
+    *
     */
     
    function start_filters() {
@@ -203,14 +203,14 @@
               }
               $i ++;
           }
-         
-         // Lookie!  It's spam!  Yum!
+
+          // 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_copy ($imap_stream, $MsgNum, $MsgNum,
+                                        $filters_spam_folder);
                   sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum, 
-                    'Deleted');
+                                        'Deleted');
               }
           }
       }
@@ -269,7 +269,7 @@ _("COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to
       $filters['MAPS DUL']['link'] = 'http://www.mail-abuse.org/dul/';
       $filters['MAPS DUL']['dns'] = 'dialups.mail-abuse.org';
       $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']['prefname'] = 'filters_spam_maps_rblplus';
       $filters['MAPS RBLplus']['name'] = 'MAPS RBL+ List';
@@ -283,7 +283,7 @@ _("COMMERCIAL - RBL+ is a combination of RSS, DUL, and RBL.");
       $filters['Osirusoft']['link'] = 'http://relays.osirusoft.com/';
       $filters['Osirusoft']['dns'] = 'relays.osirusoft.com';
       $filters['Osirusoft']['comment'] =
-_("FREE - Osirusoft - Very thorough, but also rejects replies from many ISP\'s abuse@domain.name email messages for some reason.");
+_("FREE - Osirusoft - Very thorough, but also rejects replies from many ISP's abuse@domain.name email messages for some reason.");
 
       $filters['ORDB']['prefname'] = 'filters_spam_ordb';
       $filters['ORDB']['name'] = 'Open Relay Database List';
@@ -304,7 +304,7 @@ _("FREE - Another ORBS replacement (just the INPUTS database used here).");
       $filters['Five-Ten']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
       $filters['Five-Ten']['dns'] = 'blackholes.five-ten-sg.com';
       $filters['Five-Ten']['comment'] =
-_("FREE - Five-Ten-sg.com has SPAM source, OpenRelay, and and Dialup IPs.");
+_("FREE - Five-Ten-sg.com has SPAM source, OpenRelay, and Dialup IPs.");
       
       $filters['Dorkslayers']['prefname'] = 'filters_spam_dorks';
       $filters['Dorkslayers']['name'] = 'Dorkslayers Lists';
@@ -318,7 +318,7 @@ _("FREE - Dorkslayers appears to include only really bad open relays outside the
       $filters['ORBL']['link'] = 'http://www.orbl.org';
       $filters['ORBL']['dns'] = 'or.orbl.org';
       $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']['prefname'] = 'filters_spam_orbzuk';
       $filters['ORBZ-UK']['name'] = 'ORBZ-UK Lists';