From: Pierre Habouzit <madcoder@debian.org>
Date: Thu, 11 Sep 2003 13:00:17 +0000 (+0000)
Subject: disabling an extension linked to the left_join capability one preselection
X-Git-Tag: procmail~26
X-Git-Url: http://git.polytechnique.org/?p=old-projects.git;a=commitdiff_plain;h=208a7308b6dc0b9ce2855fef86e0e837ad829c09

disabling an extension linked to the left_join capability one preselection
    little bug
---

diff --git a/philter/philter/include/form_filter.inc.php b/philter/philter/include/form_filter.inc.php
index 49aac89..41eb266 100644
--- a/philter/philter/include/form_filter.inc.php
+++ b/philter/philter/include/form_filter.inc.php
@@ -8,7 +8,8 @@ if(count($_POST)) {                             // a FORM has been submitted
             uasort($filter->rules, 'rule_cmp');
         } elseif($_POST['order']['action']=='delete' && !empty($_POST['order']['select'])) {
             $filter->delete_rule($_POST['order']['select']);
-            $_POST['order']['select'] = min(count($filter->rules),$_POST['order']['select']);
+            $max = count($filter->rules) - (isset($filter->rules[0]) ? 1 : 0);
+            $_POST['order']['select'] = min($max,$_POST['order']['select']);
         }
     if(!empty($_POST['rule']))
         if(!$filter->handle_form())
diff --git a/philter/philter/include/rule.inc.php b/philter/philter/include/rule.inc.php
index 41514b4..f31c20e 100644
--- a/philter/philter/include/rule.inc.php
+++ b/philter/philter/include/rule.inc.php
@@ -96,10 +96,12 @@ class Rule {
         mysql_query("DELETE FROM ".bd()."rules WHERE uid='$_uid' AND rid='$_rid'");
         mysql_query("DELETE FROM ".bd()."actions WHERE uid='$_uid' AND rid='$_rid'");
         mysql_query("DELETE FROM ".bd()."matches WHERE uid='$_uid' AND rid='$_rid'");
+        /*
         foreach($philter->config['action_plugins'] as $plug)
             $plug->sql_clean($_uid, $_rid);
         foreach($philter->config['match_plugins'] as $plug)
             $plug->sql_clean($_uid, $_rid);
+        */
     }
     
     function sql_store($_uid, $_rid) {