Imported Upstream version 0.5

[roundcube.git] / program / steps / mail / autocomplete.inc

diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 46915672d47019678eb400f948f13e8ed1d7802f..70072910c7e917b563843561a56bff423a529e46 100644 (file)
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/autocomplete.inc                                   |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2008-2009, RoundCube Dev Team                           |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2010, Roundcube Dev Team                           |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,33 +15,73 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: $
+ $Id: autocomplete.inc 3989 2010-09-25 13:03:53Z alec $
 
 */
 
 $MAXNUM = 15;
-$contacts = array();
 $book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
 
-if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_POST, true)) {
+if ($RCMAIL->action == 'group-expand') {
+  $abook = $RCMAIL->get_address_book(get_input_value('_source', RCUBE_INPUT_GPC));
+  if ($gid = get_input_value('_gid', RCUBE_INPUT_GPC)) {
+    $members = array();
+    $abook->set_group($gid);
+    $abook->set_pagesize(1000);  // TODO: limit number of group members by config
+    $result = $abook->list_records(array('email','name'));
+    while ($result && ($sql_arr = $result->iterate()))
+      $members[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+
+    $OUTPUT->command('replace_group_recipients', $gid, join(', ', $members));
+  }
+}
+else if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, true)) {
+  $contacts = array();
+  $books_num = count($book_types);
 
   foreach ($book_types as $id) {
     $abook = $RCMAIL->get_address_book($id);
     $abook->set_pagesize($MAXNUM);
 
-    if ($result = $abook->search(array('email','name'), $search)) {
+    if ($result = $abook->search(array('email','name'), $search, false, true, true, 'email')) {
       while ($sql_arr = $result->iterate()) {
-          $contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
-         if (count($contacts) >= $MAXNUM)
+        $contact = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+        // when we've got more than one book, we need to skip duplicates
+        if ($books_num == 1 || !in_array($contact, $contacts)) {
+          $contacts[] = $contact;
+          if (count($contacts) >= $MAXNUM)
             break 2;
+        }
+      }
+    }
+
+    // also list matching contact groups
+    if ($abook->groups) {
+      foreach ($abook->list_groups($search) as $group) {
+        $abook->reset();
+        $abook->set_group($group['ID']);
+        $result = $abook->count();
+
+        if ($result->count) {
+          $contacts[] = array('name' => $group['name'] . ' (' . intval($result->count) . ')', 'id' => $group['ID'], 'source' => $id);
+          if (count($contacts) >= $MAXNUM)
+            break;
+        }
       }
     }
   }
-  
-  sort($contacts);
+
+  usort($contacts, 'contact_results_sort');
 }
 
 $OUTPUT->command('ksearch_query_results', $contacts, $search);
 $OUTPUT->send();
 
-?>
+
+function contact_results_sort($a, $b)
+{
+  $name_a = is_array($a) ? $a['name'] : $a;
+  $name_b = is_array($b) ? $b['name'] : $b;
+  return strcoll(trim($name_a, '" '), trim($name_b, '" '));
+}
+