From: bbice Date: Wed, 27 Feb 2002 23:17:36 +0000 (+0000) Subject: Fixed removing SPAM filter preferences and added ability to hide commercial SPAM... X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=51199e7adde194811d012066a13bf077960f44fd Fixed removing SPAM filter preferences and added ability to hide commercial SPAM filters git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2521 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php index 11f09332..170c7870 100644 --- a/plugins/filters/filters.php +++ b/plugins/filters/filters.php @@ -349,55 +349,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'; diff --git a/plugins/filters/setup.php b/plugins/filters/setup.php index 96bd4ee2..1de252da 100644 --- a/plugins/filters/setup.php +++ b/plugins/filters/setup.php @@ -56,6 +56,15 @@ $AllowSpamFilters = true; global $SpamFilters_YourHop; $SpamFilters_YourHop = ' '; +/* + * Some of the SPAM filters are COMMERCIAL and require a fee. If your users + * select them and you're not allowed to use them, it will make SPAM filtering + * very slow. If you don't want them to even be offered to the users, you + * set SpamFilters_ShowCommercial to false. + */ +global $SpamFilters_ShowCommercial; +$SpamFilters_ShowCommercial = true; + /* * A cache of IPs we've already checked or are known bad boys or good boys * ie. $SpamFilters_DNScache["210.54.220.18"] = true; diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php index 8ad5bc50..b0a179ed 100644 --- a/plugins/filters/spamoptions.php +++ b/plugins/filters/spamoptions.php @@ -43,6 +43,8 @@ if (isset($spam_submit)) { if ( isset( $$input ) ) { setPref( $data_dir, $username, $spam_filters[$Key]['prefname'], $$input); + } else { + removePref($data_dir, $username, $spam_filters[$Key]['prefname']); } } } @@ -189,4 +191,4 @@ if (! isset($action) || $action != 'spam') { echo ''; } -?> \ No newline at end of file +?>