X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Ffilters%2Ffilters.php;h=6eb1881ce63e557dc925e015cadf97559eebe56c;hb=5e2e38954c46c4897499e7ce16654e8de5b15b52;hp=620bc06b1b6b2622f806173bd2fb45f90add8b61;hpb=cdbecc9ebc4c688a76c7fce150e50e39dd06660f;p=squirrelmail.git

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 620bc06b..6eb1881c 100644
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -274,6 +274,10 @@
                         $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
+			}
                         }
                         }
                     }
@@ -486,31 +490,31 @@
         $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 Others']['prefname'] = 'filters_spam_fiveten_ss';
-      $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com Single Stage 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.6';
-      $filters['FiveTen Others']['comment'] =
-'FREE - Five-Ten-sg.com - Single Stage servers.';
+    _("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 Others']['prefname'] = 'filters_spam_fiveten_supp';
-      $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com SPAM Support 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.7';
-      $filters['FiveTen Others']['comment'] =
-'FREE - Five-Ten-sg.com - SPAM Support 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 Others']['prefname'] = 'filters_spam_fiveten_wf';
-      $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com Web Form IPs';
-      $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.8';
-      $filters['FiveTen Others']['comment'] =
-'FREE - Five-Ten-sg.com - Web Form IPs.';
+      $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';