Asynchronously expand contact groups + skip count queries in autocompletion mode + check for the existance of contactgroups table

5 files changed, 98 insertions, 36 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 77ebb28b6..f1e9d3fc9 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -298,10 +298,11 @@ class rcmail
 
     // We are using the DB address book
     if ($abook_type != 'ldap') {
+      $contacts = new rcube_contacts($this->db, null);
       $list['0'] = array(
         'id' => 0,
         'name' => rcube_label('personaladrbook'),
-        'groups' => true,
+        'groups' => $contacts->groups,
         'readonly' => false,
         'autocomplete' => in_array('sql', $autocomplete)
       );
@@ -324,7 +325,7 @@ class rcmail
     if ($writeable && !empty($list)) {
       foreach ($list as $idx => $item) {
         if ($item['readonly']) {
-	  unset($list[$idx]);
+          unset($list[$idx]);
         }
       }
     }
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index 4bc70a9ec..0946b05f2 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -39,7 +39,7 @@ class rcube_contacts extends rcube_addressbook
   /** public properties */
   var $primary_key = 'contact_id';
   var $readonly = false;
-  var $groups = true;
+  var $groups = false;
   var $list_page = 1;
   var $page_size = 10;
   var $group_id = 0;
@@ -58,6 +58,9 @@ class rcube_contacts extends rcube_addressbook
     $this->db_name = get_table_name('contacts');
     $this->user_id = $user;
     $this->ready = $this->db && !$this->db->is_error();
+    
+    if (in_array('contactgroups', $this->db->list_tables()))
+      $this->groups = true;
   }
 
 
@@ -113,6 +116,10 @@ class rcube_contacts extends rcube_addressbook
   function list_groups($search = null)
   {
     $results = array();
+    
+    if (!$this->groups)
+      return $results;
+      
     $sql_filter = $search ? "AND " . $this->db->ilike('name', '%'.$search.'%') : '';
 
     $sql_result = $this->db->query(
@@ -134,33 +141,34 @@ class rcube_contacts extends rcube_addressbook
   /**
    * List the current set of contact records
    *
-   * @param  array  List of cols to show
-   * @param  int    Only return this number of records, use negative values for tail
+   * @param  array   List of cols to show
+   * @param  int     Only return this number of records, use negative values for tail
+   * @param  boolean True to skip the count query (select only)
    * @return array  Indexed list of contact records, each a hash array
    */
-  function list_records($cols=null, $subset=0)
+  function list_records($cols=null, $subset=0, $nocount=false)
   {
     // count contacts for this user
-    $this->result = $this->count();
+    $this->result = $nocount ? new rcube_result_set(1) : $this->count();
     $sql_result = NULL;
 
     // get contacts from DB
     if ($this->result->count)
     {
       if ($this->group_id)
-        $join = "LEFT JOIN ".get_table_name('contactgroupmembers')." AS rcmgrouplinks".
-          " ON (rcmgrouplinks.contact_id=rcmcontacts.".$this->primary_key.")";
+        $join = "LEFT JOIN ".get_table_name('contactgroupmembers')." AS m".
+          " ON (m.contact_id=c.".$this->primary_key.")";
       
       $start_row = $subset < 0 ? $this->result->first + $this->page_size + $subset : $this->result->first;
       $length = $subset != 0 ? abs($subset) : $this->page_size;
       
       $sql_result = $this->db->limitquery(
-        "SELECT * FROM ".$this->db_name." AS rcmcontacts ".$join."
-         WHERE  rcmcontacts.del<>1
-         AND    rcmcontacts.user_id=?" .
-        ($this->group_id ? " AND rcmgrouplinks.contactgroup_id=?" : "").
+        "SELECT * FROM ".$this->db_name." AS c ".$join."
+         WHERE  c.del<>1
+         AND    c.user_id=?" .
+        ($this->group_id ? " AND m.contactgroup_id=?" : "").
         ($this->filter ? " AND (".$this->filter.")" : "") .
-        " ORDER BY rcmcontacts.name",
+        " ORDER BY c.name",
         $start_row,
         $length,
         $this->user_id,
@@ -176,6 +184,9 @@ class rcube_contacts extends rcube_addressbook
       $this->result->add($sql_arr);
     }
     
+    if ($nocount)
+      $this->result->count = count($this->result->records);
+    
     return $this->result;
   }
 
@@ -187,9 +198,10 @@ class rcube_contacts extends rcube_addressbook
    * @param string  Search value
    * @param boolean True for strict (=), False for partial (LIKE) matching
    * @param boolean True if results are requested, False if count only
+   * @param boolean True to skip the count query (select only)
    * @return Indexed list of contact records and 'count' value
    */
-  function search($fields, $value, $strict=false, $select=true)
+  function search($fields, $value, $strict=false, $select=true, $nocount=false)
   {
     if (!is_array($fields))
       $fields = array($fields);
@@ -212,7 +224,7 @@ class rcube_contacts extends rcube_addressbook
     {
       $this->set_search_set(join(' OR ', $add_where));
       if ($select)
-        $this->list_records();
+        $this->list_records(null, 0, $nocount);
       else
         $this->result = $this->count();
     }
@@ -229,16 +241,16 @@ class rcube_contacts extends rcube_addressbook
   function count()
   {
     if ($this->group_id)
-      $join = "LEFT JOIN ".get_table_name('contactgroupmembers')." AS rcmgrouplinks".
-        " ON (rcmgrouplinks.contact_id=rcmcontacts.".$this->primary_key.")";
+      $join = "LEFT JOIN ".get_table_name('contactgroupmembers')." AS m".
+        " ON (m.contact_id=c.".$this->primary_key.")";
       
     // count contacts for this user
     $sql_result = $this->db->query(
-      "SELECT COUNT(rcmcontacts.contact_id) AS rows
-       FROM ".$this->db_name." AS rcmcontacts ".$join."
-       WHERE  rcmcontacts.del<>1
-       AND    rcmcontacts.user_id=?".
-       ($this->group_id ? " AND rcmgrouplinks.contactgroup_id=?" : "").
+      "SELECT COUNT(c.contact_id) AS rows
+       FROM ".$this->db_name." AS c ".$join."
+       WHERE  c.del<>1
+       AND    c.user_id=?".
+       ($this->group_id ? " AND m.contactgroup_id=?" : "").
        ($this->filter ? " AND (".$this->filter.")" : ""),
       $this->user_id,
       $this->group_id);
diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php
index aca44c963..10aaabe4a 100644
--- a/program/include/rcube_mdb2.php
+++ b/program/include/rcube_mdb2.php
@@ -35,6 +35,8 @@
  */
 class rcube_mdb2
   {
+  private static $tables;
+  
   var $db_dsnw;               // DSN for write operations
   var $db_dsnr;               // DSN for read operations
   var $db_connected = false;  // Already connected ?
@@ -267,7 +269,7 @@ class rcube_mdb2
         $this->db_error_msg = $q->userinfo;
 
         raise_error(array('code' => 500, 'type' => 'db',
-	  'line' => __LINE__, 'file' => __FILE__,
+          'line' => __LINE__, 'file' => __FILE__,
           'message' => $this->db_error_msg), TRUE, TRUE);
         }
       else
@@ -394,6 +396,34 @@ class rcube_mdb2
 
 
   /**
+   * Wrapper for the SHOW TABLES command
+   *
+   * @return array List of all tables of the current database
+   */
+  function list_tables()
+  {
+    // get tables if not cached
+    if (!self::$tables) {
+      self::$tables = array();
+
+      switch ($this->db_provider) {
+        case 'sqlite':
+          $result = $this->db_handle->query("SELECT name FROM sqlite_master WHERE type='table'");
+          break;
+        default:
+          $result = $this->db_handle->query("SHOW TABLES");
+      }
+
+      if ($result !== false && !PEAR::isError($result))
+        while ($rec = $result->fetchRow(MDB2_FETCHMODE_ORDERED))
+          self::$tables[] = $rec[0];
+    }
+
+    return self::$tables;
+  }
+
+
+  /**
    * Formats input so it can be safely used in a query
    *
    * @param  mixed   Value to quote
diff --git a/program/js/app.js b/program/js/app.js
index 22eedf600..8c08e3ecf 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3238,9 +3238,11 @@ function rcube_webmail()
     var insert = '';
     
     // insert all members of a group
-    if (typeof this.env.contacts[id] == 'object' && this.env.contacts[id].members) {
-      for (var i=0; i < this.env.contacts[id].members.length; i++)
-        insert += this.env.contacts[id].members[i] + ', ';
+    if (typeof this.env.contacts[id] == 'object' && this.env.contacts[id].id) {
+      insert += this.env.contacts[id].name + ', ';
+      this.group2expand = $.extend({}, this.env.contacts[id]);
+      this.group2expand.input = this.ksearch_input;
+      this.http_request('group-expand', '_source='+urlencode(this.env.contacts[id].source)+'&_gid='+urlencode(this.env.contacts[id].id), false);
     }
     else if (typeof this.env.contacts[id] == 'string')
       insert = this.env.contacts[id] + ', ';
@@ -3252,6 +3254,14 @@ function rcube_webmail()
     if (this.ksearch_input.setSelectionRange)
       this.ksearch_input.setSelectionRange(cpos, cpos);
   };
+  
+  this.replace_group_recipients = function(id, recipients)
+  {
+    if (this.group2expand && this.group2expand.id == id) {
+      this.group2expand.input.value = this.group2expand.input.value.replace(this.group2expand.name, recipients);
+      this.group2expand = null;
+    }
+  };
 
   // address search processor
   this.ksearch_get_results = function()
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 1e56fb222..724f14af5 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -20,16 +20,28 @@
 */
 
 $MAXNUM = 15;
-$contacts = array();
 $book_types = (array) $RCMAIL->config->get('autocomplete_addressbooks', 'sql');
 
-if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, 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_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();
 
   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)) {
       while ($sql_arr = $result->iterate()) {
           $contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
           if (count($contacts) >= $MAXNUM)
@@ -40,15 +52,12 @@ if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, true))
     // also list matching contact groups
     if ($abook->groups) {
       foreach ($abook->list_groups($search) as $group) {
-        $members = array();
         $abook->reset();
         $abook->set_group($group['ID']);
-        $result = $abook->list_records(array('email','name'));
-        while ($result && ($sql_arr = $result->iterate()))
-          $members[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+        $result = $abook->count();
         
-        if (count($members)) {
-          $contacts[] = array('name' => $group['name'] . ' (' . rcube_label('group') . ')', 'members' => $members);
+        if ($result->count) {
+          $contacts[] = array('name' => $group['name'] . ' (' . intval($result->count) . ')', 'id' => $group['ID'], 'source' => $id);
           if (count($contacts) >= $MAXNUM)
             break;
         }