Changed default value for SpamFilters_YourHop

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

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 52f5dfae5622dbd02b255b76100b426eb8b43c1d..6eb1881ce63e557dc925e015cadf97559eebe56c 100644 (file)
--- 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
+                       }
                         }
                         }
                     }

diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 06790a758348968d6faf7318cacc746acb2ceaec..b8d71946d902f3e7c8cc950e719b49140b02a85a 100644 (file)
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -52,6 +52,10 @@
            '<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);