Changeset c0297f4 in github for program/include/rcube_contacts.php

Timestamp:

Mar 31, 2010 11:23:22 AM (3 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

64d855c

Parents:

3baa72a

Message:

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

File:

• program/include/rcube_contacts.php (modified) (10 diffs)

program/include/rcube_contacts.php

@@ -40 +40 @@
   var $primary_key = 'contact_id';
   var $readonly = false;
-  var $groups = true;
+  var $groups = false;
   var $list_page = 1;
   var $page_size = 10;
@@ -59 +59 @@
     $this->user_id = $user;
     $this->ready = $this->db && !$this->db->is_error();
+    
+    if (in_array('contactgroups', $this->db->list_tables()))
+      $this->groups = true;
   }
 
@@ -114 +117 @@
   {
     $results = array();
+    
+    if (!$this->groups)
+      return $results;
+      
     $sql_filter = $search ? "AND " . $this->db->ilike('name', '%'.$search.'%') : '';
 
@@ -135 +142 @@
    * 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;
 
@@ -149 +157 @@
     {
       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;
@@ -156 +164 @@
       
       $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,
@@ -177 +185 @@
     }
     
+    if ($nocount)
+      $this->result->count = count($this->result->records);
+    
     return $this->result;
   }
@@ -188 +199 @@
    * @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))
@@ -213 +225 @@
       $this->set_search_set(join(' OR ', $add_where));
       if ($select)
-        $this->list_records();
+        $this->list_records(null, 0, $nocount);
       else
         $this->result = $this->count();
@@ -230 +242 @@
   {
     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,