Include groups in contacts search on mail compose (#1489082)

3 files changed, 71 insertions, 42 deletions

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index e1cdbc238..9d7aa30cf 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/func.inc                                           |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -2073,3 +2073,54 @@ function rcmail_message_import_form($attrib = array())
 
     return html::div($attrib, $out);
 }
+
+/**
+ * Add groups from the given address source to the address book widget
+ */
+function rcmail_compose_contact_groups($abook, $source_id, $search = null, $search_mode = 0)
+{
+    global $RCMAIL, $OUTPUT;
+
+    $jsresult = array();
+    foreach ($abook->list_groups($search, $search_mode) as $group) {
+        $abook->reset();
+        $abook->set_group($group['ID']);
+        $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) {
+                $row_id = 'G'.$group['ID'];
+                $jsresult[$row_id] = format_email_recipient($email, $group['name']);
+                $OUTPUT->command('add_contact_row', $row_id, array(
+                    'contactgroup' => html::span(array('title' => $email), rcube::Q($group['name']))), 'group');
+            }
+        }
+        // make virtual groups clickable to list their members
+        else if ($group_prop['virtual']) {
+            $row_id = 'G'.$group['ID'];
+            $OUTPUT->command('add_contact_row', $row_id, array(
+                'contactgroup' => html::a(array(
+                    'href' => '#list',
+                    'rel' => $group['ID'],
+                    'title' => $RCMAIL->gettext('listgroup'),
+                    'onclick' => sprintf("return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)",
+                                    rcmail_output::JS_OBJECT_NAME, $source_id, $group['ID']),
+                ), rcube::Q($group['name']) . ' ' . html::span('action', '»'))),
+                'group',
+                array('ID' => $group['ID'], 'name' => $group['name'], 'virtual' => true));
+        }
+        // show group with count
+        else if (($result = $abook->count()) && $result->count) {
+            $row_id = 'E'.$group['ID'];
+            $jsresult[$row_id] = $group['name'];
+            $OUTPUT->command('add_contact_row', $row_id, array(
+                'contactgroup' => rcube::Q($group['name'] . ' (' . intval($result->count) . ')')), 'group');
+        }
+    }
+
+    $abook->reset();
+    $abook->set_group(0);
+
+    return $jsresult;
+}
diff --git a/program/steps/mail/list_contacts.inc b/program/steps/mail/list_contacts.inc
index 46f81353a..0ee81135b 100644
--- a/program/steps/mail/list_contacts.inc
+++ b/program/steps/mail/list_contacts.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/list_contacts.inc                                  |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,15 +23,22 @@ $afields       = $RCMAIL->config->get('contactlist_fields');
 $addr_sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
 $page_size     = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));
 $list_page     = max(1, intval($_GET['_page']));
+$jsresult      = array();
 
 // Use search result
 if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
     $search  = (array)$_SESSION['search'][$_REQUEST['_search']];
+    $sparam = $_SESSION['search_params']['id'] == $_REQUEST['_search'] ? $_SESSION['search_params']['data'] : array();
 
     // get records from all sources
     foreach ($search as $s => $set) {
         $CONTACTS = $RCMAIL->get_address_book($s);
 
+        // list matching groups of this source (on page one)
+        if ($sparam[1] && $CONTACTS->groups && $list_page == 1) {
+            $jsresult += rcmail_compose_contact_groups($CONTACTS, $s, $sparam[1], (int)$RCMAIL->config->get('addressbook_search_mode'));
+        }
+
         // reset page
         $CONTACTS->set_page(1);
         $CONTACTS->set_pagesize(9999);
@@ -78,44 +85,7 @@ else {
         }
         // list groups of this source (on page one)
         else if ($CONTACTS->groups && $CONTACTS->list_page == 1) {
-            foreach ($CONTACTS->list_groups() as $group) {
-                $CONTACTS->reset();
-                $CONTACTS->set_group($group['ID']);
-                $group_prop = $CONTACTS->get_group($group['ID']);
-
-                // group (distribution list) with email address(es)
-                if ($group_prop['email']) {
-                    foreach ((array)$group_prop['email'] as $email) {
-                        $row_id = 'G'.$group['ID'];
-                        $jsresult[$row_id] = format_email_recipient($email, $group['name']);
-                        $OUTPUT->command('add_contact_row', $row_id, array(
-                            'contactgroup' => html::span(array('title' => $email), rcube::Q($group['name']))), 'group');
-                    }
-                }
-                // make virtual groups clickable to list their members
-                else if ($group_prop['virtual']) {
-                    $row_id = 'G'.$group['ID'];
-                    $OUTPUT->command('add_contact_row', $row_id, array(
-                        'contactgroup' => html::a(array(
-                            'href' => '#list',
-                            'rel' => $row['ID'],
-                            'title' => $RCMAIL->gettext('listgroup'),
-                            'onclick' => sprintf("return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)", rcmail_output::JS_OBJECT_NAME, $source, $group['ID']),
-                        ), rcube::Q($group['name']) . ' ' . html::span('action', '»'))),
-                        'group',
-                        array('ID' => $group['ID'], 'name' => $group['name'], 'virtual' => true));
-                }
-                // show group with count
-                else if (($result = $CONTACTS->count()) && $result->count) {
-                    $row_id = 'E'.$group['ID'];
-                    $jsresult[$row_id] = $group['name'];
-                    $OUTPUT->command('add_contact_row', $row_id, array(
-                        'contactgroup' => rcube::Q($group['name'] . ' (' . intval($result->count) . ')')), 'group');
-                }
-            }
-
-            $CONTACTS->reset();
-            $CONTACTS->set_group(0);
+            $jsresult = rcmail_compose_contact_groups($CONTACTS, $source);
         }
 
         // get contacts for this user
diff --git a/program/steps/mail/search_contacts.inc b/program/steps/mail/search_contacts.inc
index 4d5abf9ef..d56581695 100644
--- a/program/steps/mail/search_contacts.inc
+++ b/program/steps/mail/search_contacts.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/search_contacts.inc                                |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
+ | Copyright (C) 2013-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -27,12 +27,18 @@ $afields       = $RCMAIL->config->get('contactlist_fields');
 $page_size     = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));
 $records       = array();
 $search_set    = array();
+$jsresult      = array();
 
 foreach ($sources as $s) {
     $source = $RCMAIL->get_address_book($s['id']);
     $source->set_page(1);
     $source->set_pagesize(9999);
 
+    // list matching groups of this source
+    if ($source->groups) {
+        $jsresult += rcmail_compose_contact_groups($source, $s['id'], $search, $search_mode);
+    }
+
     // get contacts count
     $result = $source->search($afields, $search, $search_mode, true, true, 'email');
 
@@ -53,6 +59,8 @@ foreach ($sources as $s) {
     unset($result);
 }
 
+$group_count = count($jsresult);
+
 // sort the records
 ksort($records, SORT_LOCALE_STRING);
 
@@ -98,7 +106,7 @@ if (!empty($result) && $result->count > 0) {
     $OUTPUT->command('set_env', 'source', '');
     $OUTPUT->command('unselect_directory');
 }
-else {
+else if (!$group_count) {
     $OUTPUT->show_message('nocontactsfound', 'notice');
 }