Removing the shut down DSBL blocklists. Thanks to Martin Jalakas for the report ...

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

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 957af368c65eb6ec4d227755c9faaec28e0d60e8..4c829a591f1ce4481f50390382dcf61508de59d7 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -318,6 +318,7 @@ Version 1.5.2 - SVN
   - In SMTP, when we EHLO with an IP, wrap it in brackets (#2793154).
   - Bug Report plugin not handling multiple same key capabilities (thread/auth)
     (#2796007).
+  - Removed the shut down DSBL blocklists (#2796734).
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 568abfee564084ea8580bee1435f563b3d5cd961..5e150b0ef5f74585010610dff9507d5680bc8bf9 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -840,30 +840,6 @@ function load_spam_filters() {
     $filters['NJABL DUL']['comment'] =
         _("FREE, for now - Not Just Another Blacklist - Dial-up IPs.");
 
-    $filters['Conf DSBL.ORG Relay']['prefname'] = 'filters_spam_dsbl_conf_ss';
-    $filters['Conf DSBL.ORG Relay']['name'] = 'DSBL.org Confirmed Relay List';
-    $filters['Conf DSBL.ORG Relay']['link'] = 'http://www.dsbl.org/';
-    $filters['Conf DSBL.ORG Relay']['dns'] = 'list.dsbl.org';
-    $filters['Conf DSBL.ORG Relay']['result'] = '127.0.0.2';
-    $filters['Conf DSBL.ORG Relay']['comment'] =
-        _("FREE - Distributed Sender Boycott List - Confirmed Relays");
-
-    $filters['Conf DSBL.ORG Multi-Stage']['prefname'] = 'filters_spam_dsbl_conf_ms';
-    $filters['Conf DSBL.ORG Multi-Stage']['name'] = 'DSBL.org Confirmed Multi-Stage Relay List';
-    $filters['Conf DSBL.ORG Multi-Stage']['link'] = 'http://www.dsbl.org/';
-    $filters['Conf DSBL.ORG Multi-Stage']['dns'] = 'multihop.dsbl.org';
-    $filters['Conf DSBL.ORG Multi-Stage']['result'] = '127.0.0.2';
-    $filters['Conf DSBL.ORG Multi-Stage']['comment'] =
-        _("FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays");
-
-    $filters['UN-Conf DSBL.ORG']['prefname'] = 'filters_spam_dsbl_unc';
-    $filters['UN-Conf DSBL.ORG']['name'] = 'DSBL.org UN-Confirmed Relay List';
-    $filters['UN-Conf DSBL.ORG']['link'] = 'http://www.dsbl.org/';
-    $filters['UN-Conf DSBL.ORG']['dns'] = 'unconfirmed.dsbl.org';
-    $filters['UN-Conf DSBL.ORG']['result'] = '127.0.0.2';
-    $filters['UN-Conf DSBL.ORG']['comment'] =
-        _("FREE - Distributed Sender Boycott List - UN-Confirmed Relays");
-
     foreach ($filters as $Key => $Value) {
         $filters[$Key]['enabled'] = (bool)getPref($data_dir, $username, $filters[$Key]['prefname']);
     }

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index 400cd80a9c2d86d6984b1c21b7c96c83757fe068..ce170687826253ecd5690179868abf291b0f4d23 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: SquirrelMail DEVEL\n"
 "Report-Msgid-Bugs-To: SquirrelMail Internationalization <squirrelmail-"
 "i18n@lists.sourceforge.net>\n"
-"POT-Creation-Date: 2009-05-15 16:47+0200\n"
+"POT-Creation-Date: 2009-05-26 13:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <squirrelmail-i18n@lists.sourceforge.net>\n"
@@ -2974,15 +2974,6 @@ msgstr ""
 msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
 msgstr ""
 
-msgid "FREE - Distributed Sender Boycott List - Confirmed Relays"
-msgstr ""
-
-msgid "FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays"
-msgstr ""
-
-msgid "FREE - Distributed Sender Boycott List - UN-Confirmed Relays"
-msgstr ""
-
 msgid "WARNING! You must enter something to search for."
 msgstr ""