Add a fourth antispam level for mailing lists

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1096 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index bb29706..0cccce6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@ New:
         - Add a vcard of all the contacts                                  -FRU
         - Fix timestamp in RSS feed                                        -FRU
 
+    * Lists:
+        - Add the fourth antispam level (moderate and drop)                -FRU
+
     * Events:
         - Add author and event id in RSS feed                              -FRU
 

diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index 36245de..bb2353d 100755 (executable)
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -657,11 +657,15 @@ def get_bogo_level(userdesc, perms, vhost, listname):
             return 0
         if mlist.header_filter_rules == []:
             return 0
-        action = mlist.header_filter_rules[0][1]
-        if action == mm_cfg.HOLD:
-            return 1
-        if action == mm_cfg.DISCARD:
+        try:
+            action = mlist.header_filter_rules[1][1]
             return 2
+        except:
+            action = mlist.header_filter_rules[0][1]
+            if action == mm_cfg.HOLD:
+                return 1
+            if action == mm_cfg.DISCARD:
+                return 3
     except:
         return 0
 
@@ -677,6 +681,9 @@ def set_bogo_level(userdesc, perms, vhost, listname, level):
         if int(level) is 1:
             hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.HOLD, False))
         elif int(level) is 2:
+            hfr.append(('X-Spam-Flag: Yes, tests=bogofilter, spamicity=(0\.999999|1\.000000)', mm_cfg.DISCARD, False))
+            hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.HOLD, False))
+        elif int(level) is 3:
             hfr.append(('X-Spam-Flag: Yes, tests=bogofilter', mm_cfg.DISCARD, False))
         if mlist.header_filter_rules != hfr:
             mlist.Lock()

diff --git a/templates/listes/options.tpl b/templates/listes/options.tpl
index 32a4ea9..a0469c8 100644 (file)
--- a/templates/listes/options.tpl
+++ b/templates/listes/options.tpl
@@ -130,8 +130,14 @@ Tu n'es pas administrateur de la liste, mais du site.
       <td>
         <em><a name='antispam' id='antispam'></a>que faire des mails marqués « [spam probable] » ?</em><br />
         <input type='radio' name='bogo_level' value='0' {if !$bogo_level}checked='checked'{/if} /> les laisser passer<br />
-        <input type='radio' name='bogo_level' value='1' {if $bogo_level eq 1}checked='checked'{/if} /> les envoyer aux modérateurs pour approbation<br />
-        <input type='radio' name='bogo_level' value='2' {if $bogo_level eq 2}checked='checked'{/if} /> les supprimer
+        <input type='radio' name='bogo_level' value='1' {if $bogo_level eq 1}checked='checked'{/if} /> les envoyer aux modérateurs pour approbation...<br />
+        <input type='radio' name='bogo_level' value='2' {if $bogo_level eq 2}checked='checked'{/if} /> ... après suppression des plus probables*<br />
+        <input type='radio' name='bogo_level' value='3' {if $bogo_level eq 3}checked='checked'{/if} /> tous les supprimer
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2" class="smaller">
+        *La troisième option permet de supprimer automatique les spams sûr à plus de 99,9999% qui sont peu susceptibles de produire des faux-positifs.
       </td>
     </tr>
   </table>