Changeset 566b142 in github for program/include/rcube_contacts.php

Timestamp:

Apr 22, 2010 8:56:24 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

356a797b

Parents:

3e696da

Message:

• last commit fix + better performance with counters caching

File:

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

program/include/rcube_contacts.php

@@ -35 +35 @@
     private $search_fields;
     private $search_string;
+    private $cache;
     private $table_cols = array('name', 'email', 'firstname', 'surname', 'vcard');
   
@@ -70 +71 @@
     {
         $this->filter = $filter;
+        $this->cache = null;
     }
 
@@ -91 +93 @@
     {
         $this->group_id = $gid;
+        $this->cache = null;
     }
 
@@ -103 +106 @@
         $this->search_fields = null;
         $this->search_string = null;
+        $this->cache = null;
     }
   
@@ -166 +170 @@
             "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.")" : "") .
+                " AND c.user_id=?" .
+                ($this->group_id ? " AND m.contactgroup_id=?" : "").
+                ($this->filter ? " AND (".$this->filter.")" : "") .
             " ORDER BY c.name",
             $start_row,
@@ -213 +217 @@
         if (!is_array($fields))
             $fields = array($fields);
-      
+
         $add_where = array();
         foreach ($fields as $col) {
             if ($col == 'ID' || $col == $this->primary_key) {
                 $ids         = !is_array($value) ? explode(',', $value) : $value;
-                $add_where[] = 'c.' . $this->primary_key.' IN ('.join(',', $ids).')';
+                $ids         = join(',', array_map(array($this->db, 'quote'), $ids));
+                $add_where[] = 'c.' . $this->primary_key.' IN ('.$ids.')';
             }
             else if ($strict)
@@ -245 +250 @@
     function count()
     {
-        return new rcube_result_set($this->_count(), ($this->list_page-1) * $this->page_size);
+        $count = isset($this->cache['count']) ? $this->cache['count'] : $this->_count();
+    
+        return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
     }
 
@@ -273 +280 @@
 
         $sql_arr = $this->db->fetch_assoc($sql_result);
-        return (int) $sql_arr['rows'];
+
+        $this->cache['count'] = (int) $sql_arr['rows'];
+
+        return $this->cache['count'];
     }
 
@@ -357 +367 @@
             $this->add_to_group($this->group_id, $insert_id);
 
+        $this->cache = null;
+
         return $insert_id;
     }
@@ -417 +429 @@
     function delete($ids)
     {
-        if (is_array($ids))
-            $ids = join(',', $ids);
+        if (!is_array($ids))
+            $ids = explode(',', $ids);
 
         $ids = join(',', array_map(array($this->db, 'quote'), $ids));
@@ -431 +443 @@
         );
 
+        $this->cache = null;
+
         return $this->db->affected_rows();
     }
@@ -441 +455 @@
     {
         $this->db->query("DELETE FROM {$this->db_name} WHERE user_id=?", $this->user_id);
+        $this->cache = null;
         return $this->db->affected_rows();
     }
@@ -486 +501 @@
             $gid
         );
+
+        $this->cache = null;
 
         return $this->db->affected_rows();