From f0b77ba6ee05dd28da60dc8b299fdd4a9fdca8bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Mon, 29 Jun 2009 15:08:59 +0200 Subject: [PATCH] Bugfix MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- include/emails.inc.php | 6 ++---- modules/axletter/axletter.inc.php | 7 ++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/emails.inc.php b/include/emails.inc.php index 9905a73..d6e885f 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -109,8 +109,7 @@ function ids_from_mails(array $emails) // Look up user ids for addresses in domain if (count($domain_mails)) { - $domain_users = array(); - $domain_users = array_map('XDB::escape', array_keys($domain_mails)); + $domain_users = array_map(array('XDB', 'escape'), array_keys($domain_mails)); $list = implode(',', $domain_users); $res = XDB::query("SELECT alias, id FROM aliases @@ -142,8 +141,7 @@ function ids_from_mails(array $emails) // Look up user ids for other addresses in the email redirection list if (count($other_mails)) { - $other_users = array(); - $other_users = array_map('XDB::escape', $other_mails); + $other_users = array_map(array('XDB', 'escape'), $other_mails); $list = implode(',', $other_users); $res = XDB::query("SELECT email, uid FROM emails diff --git a/modules/axletter/axletter.inc.php b/modules/axletter/axletter.inc.php index 27b1d46..e238c41 100644 --- a/modules/axletter/axletter.inc.php +++ b/modules/axletter/axletter.inc.php @@ -205,7 +205,12 @@ class AXLetter extends MassMailer require_once("emails.inc.php"); $ids = ids_from_mails($this->_subset_to); $ids_list = implode(',', $ids); - $where[] = "ni.user_id IN ($ids_list)"; + if(count($ids_list) > 0) { + $where[] = "ni.user_id IN ($ids_list)"; + } else { + // No valid email + $where[] = "0"; + } } return implode(' AND ', $where); } -- 2.1.4