diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/addressbook/mailto.inc | 32 | ||||
| -rw-r--r-- | program/steps/mail/autocomplete.inc | 15 |
2 files changed, 40 insertions, 7 deletions
diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc index 5996b9da7..99c022db2 100644 --- a/program/steps/addressbook/mailto.inc +++ b/program/steps/addressbook/mailto.inc @@ -21,6 +21,7 @@ $cids = rcmail_get_cids(); $mailto = array(); +$recipients = null; foreach ($cids as $source => $cid) { @@ -31,11 +32,34 @@ foreach ($cids as $source => $cid) $CONTACTS->set_page(1); $CONTACTS->set_pagesize(count($cid) + 2); // +2 to skip counting query $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid, false, true, true, 'email'); + } +} + +if (!empty($_REQUEST['_gid']) && isset($_REQUEST['_source'])) +{ + $source = get_input_value('_source', RCUBE_INPUT_GPC); + $CONTACTS = $RCMAIL->get_address_book($source); + + $group_id = get_input_value('_gid', RCUBE_INPUT_GPC); + $group_data = $CONTACTS->get_group($group_id); + + // group has an email address assigned: use that + if ($group_data['email']) { + $mailto[] = format_email_recipient($group_data['email'][0], $group_data['name']); + } + else if ($CONTACTS->ready) { + $CONTACTS->set_group($group_id); + $CONTACTS->set_page(1); + $CONTACTS->set_pagesize(200); // limit somehow + $recipients = $CONTACTS->list_records(); + } +} - while (is_object($recipients) && ($rec = $recipients->iterate())) { - $emails = $CONTACTS->get_col_values('email', $rec, true); - $mailto[] = format_email_recipient($emails[0], $rec['name']); - } +if ($recipients) +{ + while (is_object($recipients) && ($rec = $recipients->iterate())) { + $emails = $CONTACTS->get_col_values('email', $rec, true); + $mailto[] = format_email_recipient($emails[0], $rec['name']); } } 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; |