X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Faxletter%2Faxletter.inc.php;h=b42ad353f5c858afb02781bc76ce5d702cfaf19d;hb=6713fc49bdc5e67e5243b4ac684eed9b3f00ef63;hp=d13985e9f663d489295028e93055fba2fe86ccc2;hpb=d1e6167749fdad08c81e23d09e1bbbf76e3b989b;p=platal.git

diff --git a/modules/axletter/axletter.inc.php b/modules/axletter/axletter.inc.php
index d13985e..b42ad35 100644
--- a/modules/axletter/axletter.inc.php
+++ b/modules/axletter/axletter.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -29,6 +29,7 @@ class AXLetter extends MassMailer
     public $_promo_max;
     public $_subset;
     public $_subset_to;
+    public $_subset_rm;
     public $_echeance;
     public $_date;
     public $_bits;
@@ -56,11 +57,11 @@ class AXLetter extends MassMailer
         }
         list($this->_id, $this->_shortname, $this->_title_mail, $this->_title,
              $this->_body, $this->_signature, $this->_promo_min, $this->_promo_max,
-             $this->_subset_to, $this->_echeance, $this->_date, $this->_bits) = $id;
+             $this->_subset_to, $this->_subset_rm, $this->_echeance, $this->_date, $this->_bits) = $id;
         if ($this->_date == '0000-00-00') {
             $this->_date = 0;
         }
-        $this->_subset_to = explode("\n", $this->_subset_to);
+        $this->_subset_to = ($this->_subset_to ? explode("\n", $this->_subset_to) : null);
         $this->_subset = (count($this->_subset_to) > 0);
     }
 
@@ -185,8 +186,12 @@ class AXLetter extends MassMailer
             require_once("emails.inc.php");
             $ids = ids_from_mails($this->_subset_to);
             $ids_list = implode(',', $ids);
-            if(count($ids_list) > 0) {
-                $where[] = "ni.user_id IN ($ids_list)";
+            if(count($ids) > 0) {
+                if ($this->_subset_rm) {
+                    $where[] = "ni.user_id NOT IN ($ids_list)";
+                } else {
+                    $where[] = "ni.user_id IN ($ids_list)";
+                }
             } else {
                 // No valid email
                 $where[] = "0";