Fixes axletter.
authorStéphane Jacob <sj@m4x.org>
Wed, 5 Aug 2009 12:44:23 +0000 (14:44 +0200)
committerStéphane Jacob <sj@m4x.org>
Wed, 5 Aug 2009 12:54:48 +0000 (14:54 +0200)
modules/axletter.php
modules/axletter/axletter.inc.php

index b1f3a86..b27dc7d 100644 (file)
@@ -102,7 +102,7 @@ class AXLetterModule extends PLModule
             $res = XDB::query("SELECT * FROM axletter WHERE FIND_IN_SET('new', bits)");
             if ($res->numRows()) {
                 extract($res->fetchOneAssoc(), EXTR_OVERWRITE);
-                $subset_to = explode("\n", $subset);
+                $subset_to = ($subset ? explode("\n", $subset) : null);
                 $subset = (count($subset_to) > 0);
                 $saved = true;
             } else  {
@@ -163,7 +163,7 @@ class AXLetterModule extends PLModule
                 XDB::execute("REPLACE INTO  axletter
                                        SET  id = {?}, short_name = {?}, subject = {?}, title = {?}, body = {?},
                                             signature = {?}, promo_min = {?}, promo_max = {?}, echeance = {?}, subset = {?}",
-                             $id, $short_name, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance, $subset ? implode("\n", $subset_to): null);
+                             $id, $short_name, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance, $subset ? implode("\n", $subset_to) : null);
                 if (!$saved) {
                     global $globals;
                     $mailer = new PlMailer();
index e238c41..d85d25f 100644 (file)
@@ -60,7 +60,7 @@ class AXLetter extends MassMailer
         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);
     }
 
@@ -205,7 +205,7 @@ 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) {
+            if(count($ids) > 0) {
                 $where[] = "ni.user_id IN ($ids_list)";
             } else {
                 // No valid email