From 0c109685615e7543921e02c98f82328c2837a6c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Barrois?= Date: Sun, 10 Oct 2010 01:24:39 +0200 Subject: [PATCH] Fix ids_from_emails (errors when invalid @x.org emails were given). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- include/emails.inc.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/emails.inc.php b/include/emails.inc.php index 4fdbacf..9b1f5a4 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -123,7 +123,10 @@ function ids_from_mails(array $emails) } // Connect emails with uids foreach ($domain_mails as $email => $user) { - $uids[$email] = $domain_uids[$user]; + // Some 'domain' emails might be invalid. + if (array_key_exists($user, $domain_uids)) { + $uids[$email] = $domain_uids[$user]; + } } // Look up user ids for addresses in our alias domain @@ -142,7 +145,9 @@ function ids_from_mails(array $emails) } // Connect emails with uids foreach ($alias_mails as $email => $user) { - $uids[$email] = $alias_uids[$user]; + if (array_key_exists($user, $alias_uids)) { + $uids[$email] = $alias_uids[$user]; + } } // Look up user ids for other addresses in the email redirection list -- 2.1.4