Removed dead orbz.org filters

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

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 170c7870a0121321b2fbaf915bc21d0ed1fbd147..66de18846056dd599a845869153efdd9a318fb4c 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -473,22 +473,6 @@ function load_spam_filters() {
     $filters['ORDB']['comment'] =
         _("FREE - ORDB was born when ORBS went off the air. It seems to have fewer false positives than ORBS did though.");
 
-    $filters['ORBZ Inputs']['prefname'] = 'filters_spam_orbz';
-    $filters['ORBZ Inputs']['name'] = 'ORBZ Inputs List';
-    $filters['ORBZ Inputs']['link'] = 'http://www.orbz.org/';
-    $filters['ORBZ Inputs']['dns'] = 'inputs.orbz.org';
-    $filters['ORBZ Inputs']['result'] = '127.0.0.2';
-    $filters['ORBZ Inputs']['comment'] =
-        _("FREE - Another ORBS replacement (just the INPUTS database used here).");
-
-    $filters['ORBZ Outputs']['prefname'] = 'filters_spam_orbz_outputs';
-    $filters['ORBZ Outputs']['name'] = 'ORBZ Outputs List';
-    $filters['ORBZ Outputs']['link'] = 'http://www.orbz.org/';
-    $filters['ORBZ Outputs']['dns'] = 'outputs.orbz.org';
-    $filters['ORBZ Outputs']['result'] = '127.0.0.2';
-    $filters['ORBZ Outputs']['comment'] =
-        _("FREE - Another ORBS replacement (just the OUTPUTS database used here).");
-
     $filters['FiveTen Direct']['prefname'] = 'filters_spam_fiveten_src';
     $filters['FiveTen Direct']['name'] = 'Five-Ten-sg.com Direct SPAM Sources';
     $filters['FiveTen Direct']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
@@ -704,4 +688,33 @@ function filter_swap($id1, $id2) {
         setPref($data_dir, $username, 'filter' . $id1, $SecondFilter);
     }
 }
+
+/* This update the filter rules when
+   renaming or deleting folders */
+function update_for_folder ($args) {
+    $old_folder = $args[0];
+       $new_folder = $args[2];
+       $action = $args[1];
+    global $plugins, $data_dir, $username;
+    $filters = array();
+    $filters = load_filters();
+    $filter_count = count($filters);
+    $p = 0;
+    for ($i=0;$i<$filter_count;$i++) {
+        if (!empty($filters)) {
+            if ($old_folder == $filters[$i]['folder']) {
+                if ($action == 'rename') {
+                    $filters[$i]['folder'] = $new_folder;
+                    setPref($data_dir, $username, 'filter'.$i,
+                    $filters[$i]['where'].','.$filters[$i]['what'].','.$new_folder);
+                }
+                elseif ($action == 'delete') {
+                    remove_filter($p);
+                    $p = $p-1;
+                }
+            }
+        $p++;
+        }
+    }
+}
 ?>