Changeset 3668 in subversion

Timestamp:

May 26, 2010 5:25:24 AM (3 years ago)

Author:

thomasb

Message:

Allow derived classes of rcube_contacts to override table and sequence names

File:

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

trunk/roundcubemail/program/include/rcube_contacts.php

@@ -29 +29 @@
 {
     // protected for backward compat. with some plugins
-    // maybe changed in the future
+    // deprecated: re-implement $this->get_table_name() instead
     protected $db_name = '';
+    protected $db_groups = '';
+    protected $db_groupmembers = '';
+    
     private $db = null;
     private $user_id = 0;
@@ -59 +62 @@
     {
         $this->db = $dbconn;
-        $this->db_name = get_table_name('contacts');
+        $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();
@@ -128 +134 @@
 
         $sql_result = $this->db->query(
-            "SELECT * FROM ".get_table_name('contactgroups').
+            "SELECT * FROM ".$this->db_groups.
             " WHERE del<>1".
             " AND user_id=?".
@@ -166 +172 @@
 
         if ($this->group_id)
-            $join = " LEFT JOIN ".get_table_name('contactgroupmembers')." AS m".
+            $join = " LEFT JOIN ".$this->db_groupmembers." AS m".
                 " ON (m.contact_id = c.".$this->primary_key.")";
 
@@ -283 +289 @@
     {
         if ($this->group_id)
-            $join = " LEFT JOIN ".get_table_name('contactgroupmembers')." AS m".
+            $join = " LEFT JOIN ".$this->db_groupmembers." AS m".
                 " ON (m.contact_id=c.".$this->primary_key.")";
 
@@ -380 +386 @@
             );
 
-            $insert_id = $this->db->insert_id('contacts');
+            $insert_id = $this->db->insert_id($this->get_sequence_name('contacts'));
         }
 
@@ -494 +500 @@
 
         $this->db->query(
-            "INSERT INTO ".get_table_name('contactgroups').
+            "INSERT INTO ".$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('contactgroups'))
+        if ($insert_id = $this->db->insert_id($this->get_sequence_name('contactgroups')))
             $result = array('id' => $insert_id, 'name' => $name);
 
@@ -516 +522 @@
         // flag group record as deleted
         $sql_result = $this->db->query(
-            "UPDATE ".get_table_name('contactgroups').
+            "UPDATE ".$this->db_groups.
             " SET del=1, changed=".$this->db->now().
             " WHERE contactgroup_id=?",
@@ -541 +547 @@
 
         $sql_result = $this->db->query(
-            "UPDATE ".get_table_name('contactgroups').
+            "UPDATE ".$this->db_groups.
             " SET name=?, changed=".$this->db->now().
             " WHERE contactgroup_id=?",
@@ -567 +573 @@
         foreach ($ids as $contact_id) {
             $sql_result = $this->db->query(
-                "SELECT 1 FROM ".get_table_name('contactgroupmembers').
+                "SELECT 1 FROM ".$this->db_groupmembers.
                 " WHERE contactgroup_id=?".
                     " AND contact_id=?",
@@ -576 +582 @@
             if (!$this->db->num_rows($sql_result)) {
                 $this->db->query(
-                    "INSERT INTO ".get_table_name('contactgroupmembers').
+                    "INSERT INTO ".$this->db_groupmembers.
                     " (contactgroup_id, contact_id, created)".
                     " VALUES (?, ?, ".$this->db->now().")",
@@ -607 +613 @@
 
         $sql_result = $this->db->query(
-            "DELETE FROM ".get_table_name('contactgroupmembers').
+            "DELETE FROM ".$this->db_groupmembers.
             " WHERE contactgroup_id=?".
                 " AND contact_id IN ($ids)",
@@ -630 +636 @@
         do {
             $sql_result = $this->db->query(
-                "SELECT 1 FROM ".get_table_name('contactgroups').
+                "SELECT 1 FROM ".$this->db_groups.
                 " WHERE del<>1".
                     " AND user_id=?".
@@ -645 +651 @@
     }
 
+
+    /**
+     * 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);
+    }
+
 }