Changeset 3670 in subversion for trunk/roundcubemail/program/include/rcube_contacts.php

Timestamp:

May 26, 2010 7:56:47 AM (3 years ago)

Author:

alec

Message:

• Redesigned how rcube_contacts handles table names

File:

• trunk/roundcubemail/program/include/rcube_contacts.php (modified) (20 diffs)

trunk/roundcubemail/program/include/rcube_contacts.php

@@ -29 +29 @@
 {
     // protected for backward compat. with some plugins
-    // deprecated: re-implement $this->get_table_name() instead
-    protected $db_name = '';
-    protected $db_groups = '';
-    protected $db_groupmembers = '';
-    
+    protected $db_name = 'contacts';
+    protected $db_groups = 'contactgroups';
+    protected $db_groupmembers = 'contactgroupmembers';
+
     private $db = null;
     private $user_id = 0;
@@ -43 +42 @@
     private $table_cols = array('name', 'email', 'firstname', 'surname', 'vcard');
 
-    /** public properties */
+    // public properties
     var $primary_key = 'contact_id';
     var $readonly = false;
@@ -62 +61 @@
     {
         $this->db = $dbconn;
-        $this->db_name = $this->get_table_name('contacts');
-        $this->db_groups = $this->get_table_name('contactgroups');
-        $this->db_groupmembers = $this->get_table_name('contactgroupmembers');
-        
         $this->user_id = $user;
         $this->ready = $this->db && !$this->db->is_error();
@@ -134 +129 @@
 
         $sql_result = $this->db->query(
-            "SELECT * FROM ".$this->db_groups.
+            "SELECT * FROM ".get_table_name($this->db_groups).
             " WHERE del<>1".
             " AND user_id=?".
@@ -172 +167 @@
 
         if ($this->group_id)
-            $join = " LEFT JOIN ".$this->db_groupmembers." AS m".
+            $join = " LEFT JOIN ".get_table_name($this->db_groupmembers)." AS m".
                 " ON (m.contact_id = c.".$this->primary_key.")";
 
         $sql_result = $this->db->limitquery(
-            "SELECT * FROM ".$this->db_name." AS c" .
+            "SELECT * FROM ".get_table_name($this->db_name)." AS c" .
             $join .
             " WHERE c.del<>1" .
@@ -289 +284 @@
     {
         if ($this->group_id)
-            $join = " LEFT JOIN ".$this->db_groupmembers." AS m".
+            $join = " LEFT JOIN ".get_table_name($this->db_groupmembers)." AS m".
                 " ON (m.contact_id=c.".$this->primary_key.")";
 
@@ -295 +290 @@
         $sql_result = $this->db->query(
             "SELECT COUNT(c.contact_id) AS rows".
-            " FROM ".$this->db_name." AS c".
+            " FROM ".get_table_name($this->db_name)." AS c".
                 $join.
             " WHERE c.del<>1".
@@ -337 +332 @@
 
         $this->db->query(
-            "SELECT * FROM ".$this->db_name.
+            "SELECT * FROM ".get_table_name($this->db_name).
             " WHERE contact_id=?".
                 " AND user_id=?".
@@ -381 +376 @@
         if (!$existing->count && !empty($a_insert_cols)) {
             $this->db->query(
-                "INSERT INTO ".$this->db_name.
+                "INSERT INTO ".get_table_name($this->db_name).
                 " (user_id, changed, del, ".join(', ', $a_insert_cols).")".
                 " VALUES (".intval($this->user_id).", ".$this->db->now().", 0, ".join(', ', $a_insert_values).")"
             );
 
-            $insert_id = $this->db->insert_id($this->get_sequence_name('contacts'));
+            $insert_id = $this->db->insert_id($this->db_name);
         }
 
@@ -432 +427 @@
         if (!empty($write_sql)) {
             $this->db->query(
-                "UPDATE ".$this->db_name.
+                "UPDATE ".get_table_name($this->db_name).
                 " SET changed=".$this->db->now().", ".join(', ', $write_sql).
                 " WHERE contact_id=?".
@@ -462 +457 @@
         // flag record as deleted
         $this->db->query(
-            "UPDATE ".$this->db_name.
+            "UPDATE ".get_table_name($this->db_name).
             " SET del=1, changed=".$this->db->now().
             " WHERE user_id=?".
@@ -480 +475 @@
     function delete_all()
     {
-        $this->db->query("DELETE FROM {$this->db_name} WHERE user_id=?", $this->user_id);
+        $this->db->query("DELETE FROM ".get_table_name($this->db_name)." WHERE user_id = ?", $this->user_id);
         $this->cache = null;
         return $this->db->affected_rows();
@@ -500 +495 @@
 
         $this->db->query(
-            "INSERT INTO ".$this->db_groups.
+            "INSERT INTO ".get_table_name($this->db_groups).
             " (user_id, changed, name)".
             " VALUES (".intval($this->user_id).", ".$this->db->now().", ".$this->db->quote($name).")"
         );
 
-        if ($insert_id = $this->db->insert_id($this->get_sequence_name('contactgroups')))
+        if ($insert_id = $this->db->insert_id($this->db_groups))
             $result = array('id' => $insert_id, 'name' => $name);
 
@@ -522 +517 @@
         // flag group record as deleted
         $sql_result = $this->db->query(
-            "UPDATE ".$this->db_groups.
+            "UPDATE ".get_table_name($this->db_groups).
             " SET del=1, changed=".$this->db->now().
             " WHERE contactgroup_id=?",
@@ -547 +542 @@
 
         $sql_result = $this->db->query(
-            "UPDATE ".$this->db_groups.
+            "UPDATE ".get_table_name($this->db_groups).
             " SET name=?, changed=".$this->db->now().
             " WHERE contactgroup_id=?",
@@ -573 +568 @@
         foreach ($ids as $contact_id) {
             $sql_result = $this->db->query(
-                "SELECT 1 FROM ".$this->db_groupmembers.
+                "SELECT 1 FROM ".get_table_name($this->db_groupmembers).
                 " WHERE contactgroup_id=?".
                     " AND contact_id=?",
@@ -582 +577 @@
             if (!$this->db->num_rows($sql_result)) {
                 $this->db->query(
-                    "INSERT INTO ".$this->db_groupmembers.
+                    "INSERT INTO ".get_table_name($this->db_groupmembers).
                     " (contactgroup_id, contact_id, created)".
                     " VALUES (?, ?, ".$this->db->now().")",
@@ -613 +608 @@
 
         $sql_result = $this->db->query(
-            "DELETE FROM ".$this->db_groupmembers.
+            "DELETE FROM ".get_table_name($this->db_groupmembers).
             " WHERE contactgroup_id=?".
                 " AND contact_id IN ($ids)",
@@ -636 +631 @@
         do {
             $sql_result = $this->db->query(
-                "SELECT 1 FROM ".$this->db_groups.
+                "SELECT 1 FROM ".get_table_name($this->db_groups).
                 " WHERE del<>1".
                     " AND user_id=?".
@@ -651 +646 @@
     }
 
-
-    /**
-     * Wrapper for global get_table_name() which can be re-implemented
-     * by a derived class
-     */
-    protected function get_table_name($table)
-    {
-        return get_table_name($table);
-    }
-
-    /**
-     * Wrapper for global get_sequence_name() which can be re-implemented
-     * by a derived class
-     */
-    protected function get_sequence_name($table)
-    {
-        return get_sequence_name($table);
-    }
-
 }