X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=philter%2Fphilter%2Finclude%2Frule.inc.php;h=402b1983704ee969d915dfcf5b1d899366b5da6f;hb=772509f32045e23e867b3520f04072301f040252;hp=9123b296242463929e49f0d830230d34d4909aec;hpb=b19786cae5cfa315f04cfbb7a9bef1c6471d4810;p=old-projects.git

diff --git a/philter/philter/include/rule.inc.php b/philter/philter/include/rule.inc.php
index 9123b29..402b198 100644
--- a/philter/philter/include/rule.inc.php
+++ b/philter/philter/include/rule.inc.php
@@ -51,8 +51,9 @@ class Rule {
         $left_joins = "";
         foreach($philter->config['action_plugins'] as $plug)
             $left_joins .= $plug->sql_get();
-        
-        $sql = mysql_query("SELECT * FROM actions WHERE actions.uid='$_uid' AND actions.rid='$_rid' ".$left_joins);
+       
+        $bd = bd()."actions";
+        $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid' ".$left_joins);
         
         while($t = mysql_fetch_assoc($sql))
             $this->actions[] = $philter->config['action_plugins'][$t['pid']]->sql_to_data($t);
@@ -65,7 +66,8 @@ class Rule {
         foreach($philter->config['match_plugins'] as $plug)
             $left_joins .= $plug->sql_get();
         
-        $sql = mysql_query("SELECT * FROM matches WHERE matches.uid='$_uid' AND matches.rid='$_rid' ".$left_joins);
+        $bd = bd()."matches";
+        $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid' ".$left_joins);
        
         if($_rid)
             while($t = mysql_fetch_assoc($sql))
@@ -79,7 +81,7 @@ class Rule {
         if($this->rank == $_new_rank)
             return;
         $this->rank = $_new_rank;
-        mysql_query("UPDATE rules SET rank='$_new_rank' WHERE uid='$_uid' AND rid='$_rid'");
+        mysql_query("UPDATE ".bd()."rules SET rank='$_new_rank' WHERE uid='$_uid' AND rid='$_rid'");
     }
 
     function to_string() {
@@ -89,9 +91,9 @@ class Rule {
     function sql_clean($_uid, $_rid) {
         global $philter;
 
-        mysql_query("DELETE FROM rules WHERE uid='$_uid' AND rid='$_rid'");
-        mysql_query("DELETE FROM actions WHERE uid='$_uid' AND rid='$_rid'");
-        mysql_query("DELETE FROM matches WHERE uid='$_uid' AND rid='$_rid'");
+        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)
@@ -108,7 +110,7 @@ class Rule {
 
         $this->sql_clean($_uid,$_rid);
 
-        mysql_query("INSERT INTO rules SET uid='$_uid',rid='$_rid',rank='{$this->rank}',flags='$flags',name='{$this->name}'");
+        mysql_query("INSERT INTO ".bd()."rules SET uid='$_uid',rid='$_rid',rank='{$this->rank}',flags='$flags',name='{$this->name}'");
 
         if($_rid) {
             foreach($this->matches as $match)