X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fmail%2Fautocomplete.inc;h=7769ec87db2ce8d349fdbbfec2c9de03083e611c;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=70072910c7e917b563843561a56bff423a529e46;hpb=4212156c5c79d2f58342feb0d3ed1893f177bcab;p=roundcube.git

diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 7007291..7769ec8 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -5,7 +5,8 @@
  | program/steps/mail/autocomplete.inc                                   |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2010, Roundcube Dev Team                           |
+ | Copyright (C) 2008-2011, Roundcube Dev Team                           |
+ | Copyright (C) 2011, Kolab Systems AG                                  |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,13 +16,10 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: autocomplete.inc 3989 2010-09-25 13:03:53Z alec $
+ $Id: autocomplete.inc 5426 2011-11-15 10:50:30Z alec $
 
 */
 
-$MAXNUM = 15;
-$book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
-
 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)) {
@@ -29,41 +27,99 @@ if ($RCMAIL->action == 'group-expand') {
     $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']);
+    while ($result && ($sql_arr = $result->iterate())) {
+      foreach ((array)$sql_arr['email'] as $email)
+        $members[] = format_email_recipient($email, $sql_arr['name']);
+    }
 
-    $OUTPUT->command('replace_group_recipients', $gid, join(', ', $members));
+    $separator = trim($RCMAIL->config->get('recipients_separator', ',')) . ' ';
+    $OUTPUT->command('replace_group_recipients', $gid, join($separator, array_unique($members)));
   }
+
+  $OUTPUT->send();
 }
-else if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, true)) {
-  $contacts = array();
+
+
+$MAXNUM = (int) $RCMAIL->config->get('autocomplete_max', 15);
+$mode   = (int) $RCMAIL->config->get('addressbook_search_mode');
+$single = (bool) $RCMAIL->config->get('autocomplete_single');
+$search = get_input_value('_search', RCUBE_INPUT_GPC, true);
+$source = get_input_value('_source', RCUBE_INPUT_GPC);
+$sid    = get_input_value('_id', RCUBE_INPUT_GPC);
+
+if (strlen($source))
+  $book_types = array($source);
+else
+  $book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
+
+if (!empty($book_types) && strlen($search)) {
+  $contacts  = array();
+  $sort_keys = array();
   $books_num = count($book_types);
+  $search_lc = mb_strtolower($search);
 
   foreach ($book_types as $id) {
     $abook = $RCMAIL->get_address_book($id);
     $abook->set_pagesize($MAXNUM);
 
-    if ($result = $abook->search(array('email','name'), $search, false, true, true, 'email')) {
+    if ($result = $abook->search(array('email','name'), $search, $mode, true, true, 'email')) {
       while ($sql_arr = $result->iterate()) {
-        $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;
+        // Contact can have more than one e-mail address
+        $email_arr = (array)$abook->get_col_values('email', $sql_arr, true);
+        $email_cnt = count($email_arr);
+        $idx = 0;
+        foreach ($email_arr as $email) {
+          if (empty($email)) {
+            continue;
+          }
+
+          $contact = format_email_recipient($email, $sql_arr['name']);
+
+          // skip entries that don't match
+          if ($email_cnt > 1 && strpos(mb_strtolower($contact), $search_lc) === false) {
+            continue;
+          }
+
+          // skip duplicates
+          if (!in_array($contact, $contacts)) {
+            $contacts[]  = $contact;
+            $sort_keys[] = sprintf('%s %03d', $sql_arr['name'] , $idx++);
+
+            if (count($contacts) >= $MAXNUM)
+              break 2;
+          }
+
+          // skip redundant entries (show only first email address)
+          if ($single) {
+            break;
+          }
         }
       }
     }
 
     // also list matching contact groups
-    if ($abook->groups) {
+    if ($abook->groups && count($contacts) < $MAXNUM) {
       foreach ($abook->list_groups($search) as $group) {
         $abook->reset();
         $abook->set_group($group['ID']);
-        $result = $abook->count();
+        $group_prop = $abook->get_group($group['ID']);
+
+        // group (distribution list) with email address(es)
+        if ($group_prop['email']) {
+            $idx = 0;
+            foreach ((array)$group_prop['email'] as $email) {
+                $contacts[]  = format_email_recipient($email, $group['name']);
+                $sort_keys[] = sprintf('%s %03d', $group['name'] , $idx++);
+
+                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);
+          $sort_keys[] = $group['name'];
 
-        if ($result->count) {
-          $contacts[] = array('name' => $group['name'] . ' (' . intval($result->count) . ')', 'id' => $group['ID'], 'source' => $id);
           if (count($contacts) >= $MAXNUM)
             break;
         }
@@ -71,17 +127,16 @@ else if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, tr
     }
   }
 
-  usort($contacts, 'contact_results_sort');
+  if (count($contacts)) {
+    // sort contacts index
+    asort($sort_keys, SORT_LOCALE_STRING);
+    // re-sort contacts according to index
+    foreach ($sort_keys as $idx => $val) {
+      $sort_keys[$idx] = $contacts[$idx];
+    }
+    $contacts = array_values($sort_keys);
+  }
 }
 
-$OUTPUT->command('ksearch_query_results', $contacts, $search);
+$OUTPUT->command('ksearch_query_results', $contacts, $search, $sid);
 $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, '" '));
-}
-