locales modifications. left joins are for a future release

diff --git a/philter/philter/include/plugin.inc.php b/philter/philter/include/plugin.inc.php
index 6d4f237..f4ddb87 100644 (file)
--- a/philter/philter/include/plugin.inc.php
+++ b/philter/philter/include/plugin.inc.php
@@ -26,9 +26,8 @@ class Plugin {
     /** gives the LEFT JOIN to add to the sql request to have all this plugin datas
      * @return  the LEFT JOIN string, "" if irrelevant
      */
-    function sql_get() { return ""; }
-
-    function sql_clean($_uid, $_rid) { }
+    // function sql_get() { return ""; }
+    // function sql_clean($_uid, $_rid) { }
     
     /** stores the data to the mysql database
      * @param   $_uid   the id of the filter

diff --git a/philter/philter/include/rule.inc.php b/philter/philter/include/rule.inc.php
index d03d888..41514b4 100644 (file)
--- a/philter/philter/include/rule.inc.php
+++ b/philter/philter/include/rule.inc.php
@@ -47,13 +47,13 @@ class Rule {
 
     function sql_get_actions($_uid, $_rid) {
         global $philter;
-
+        /*
         $left_joins = "";
         foreach($philter->config['action_plugins'] as $plug)
             $left_joins .= $plug->sql_get();
-       
+        */
         $bd = bd()."actions";
-        $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid' ".$left_joins);
+        $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid'");
         
         while($t = mysql_fetch_assoc($sql))
             $this->actions[] = $philter->config['action_plugins'][$t['pid']]->sql_to_data($t);
@@ -61,13 +61,15 @@ class Rule {
 
     function sql_get_matches($_uid, $_rid) {
         global $philter;
-        
+       
+        /*
         $left_joins = "";
         foreach($philter->config['match_plugins'] as $plug)
             $left_joins .= $plug->sql_get();
+        */
         
         $bd = bd()."matches";
-        $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid' ".$left_joins);
+        $sql = mysql_query("SELECT * FROM $bd WHERE $bd.uid='$_uid' AND $bd.rid='$_rid'");
        
         if($_rid)
             while($t = mysql_fetch_assoc($sql))

diff --git a/philter/philter/locales/philter.fr.inc.php b/philter/philter/locales/philter.fr.inc.php
index fcc6b2f..f77f961 100644 (file)
--- a/philter/philter/locales/philter.fr.inc.php
+++ b/philter/philter/locales/philter.fr.inc.php
@@ -45,9 +45,10 @@ $philter->config['i18n'] = Array(
         utilisateurs avancés, et peut être la source de perte de mails',
     'filter_sync' => 'Écrire le filtre ...',
     'filter_sync_txt' => '<p class="normal">Si tu es sartisfait de tes modifications, tu peux
-        installer ton filtre. <strong>Attention :</strong> cette opération est irréversible (à part
-        écrire un nouveau filtre bien sur).<br />
-        Sinon, tu peux annuler tes modifications et laisser le filtre inchangé</p>',
+        installer ton filtre.<br /><strong>Attention :</strong> cette opération est irréversible (à
+        part écrire un nouveau filtre bien sur).<br />Cett opération écrit effectivement le filtre
+        et le met en place immédiatement</p>
+        <p class="normal">Sinon, tu peux annuler tes modifications et laisser le filtre inchangé</p>',
     'filter_valid' => 'Valider ton filtre',
     'filter_cancel' => 'Annuler toutes tes modifications',
     'filter_title' => 'Règles de filtrage',