|
|
|
@ -26,7 +26,7 @@ if ($RCMAIL->action == 'group-expand') {
|
|
|
|
|
$members = array();
|
|
|
|
|
$abook->set_group($gid);
|
|
|
|
|
$abook->set_pagesize(1000); // TODO: limit number of group members by config
|
|
|
|
|
$result = $abook->list_records(array('name', 'firstname', 'surname', 'email'));
|
|
|
|
|
$result = $abook->list_records($RCMAIL->config->get('contactlist_fields'));
|
|
|
|
|
while ($result && ($sql_arr = $result->iterate())) {
|
|
|
|
|
foreach ((array)$sql_arr['email'] as $email) {
|
|
|
|
|
$members[] = format_email_recipient($email, rcube_addressbook::compose_list_name($sql_arr));
|
|
|
|
@ -64,7 +64,7 @@ if (!empty($book_types) && strlen($search)) {
|
|
|
|
|
$abook = $RCMAIL->get_address_book($id);
|
|
|
|
|
$abook->set_pagesize($MAXNUM);
|
|
|
|
|
|
|
|
|
|
if ($result = $abook->search(array('name', 'firstname', 'surname', 'email'), $search, $mode, true, true, 'email')) {
|
|
|
|
|
if ($result = $abook->search($RCMAIL->config->get('contactlist_fields'), $search, $mode, true, true, 'email')) {
|
|
|
|
|
while ($sql_arr = $result->iterate()) {
|
|
|
|
|
// Contact can have more than one e-mail address
|
|
|
|
|
$email_arr = (array)$abook->get_col_values('email', $sql_arr, true);
|
|
|
|
|