summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-10-10 20:15:46 +0000
committerthomascube <thomas@roundcube.net>2011-10-10 20:15:46 +0000
commitdc6c4f4a28652f428a507b0335f418749cdbc3bd (patch)
tree336545f4b595b555631569eb73b34ea5cf0a183f /program/steps/mail
parenta3148236ebaa7e61177e7186138997d136b88b3e (diff)
Contact groups can have direct email addresses => distribution lists; enable 'compose' command for the selected group
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/autocomplete.inc15
1 files changed, 12 insertions, 3 deletions
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index bbc7734e2..5b935ad2c 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -85,9 +85,18 @@ if (!empty($book_types) && strlen($search)) {
foreach ($abook->list_groups($search) as $group) {
$abook->reset();
$abook->set_group($group['ID']);
- $result = $abook->count();
-
- if ($result->count) {
+ $group_prop = $abook->get_group($group['ID']);
+
+ // group (distribution list) with email address(es)
+ if ($group_prop['email']) {
+ foreach ((array)$group_prop['email'] as $email) {
+ $contacts[] = format_email_recipient($email, $group['name']);
+ if (count($contacts) >= $MAXNUM)
+ break 2;
+ }
+ }
+ // show group with count
+ else if (($result = $abook->count()) && $result->count) {
$contacts[] = array('name' => $group['name'] . ' (' . intval($result->count) . ')', 'id' => $group['ID'], 'source' => $id);
if (count($contacts) >= $MAXNUM)
break;