Changeset 3978 in subversion

Timestamp:

Sep 21, 2010 2:43:24 AM (3 years ago)

Author:

thomasb

Message:

Fix selection of read/write db connection

Location:

trunk/roundcubemail/program/include

Files:

• rcmail.php (modified) (1 diff)
• rcube_mdb2.php (modified) (5 diffs)

trunk/roundcubemail/program/include/rcmail.php

@@ -237 +237 @@
       $this->db->sqlite_initials = INSTALL_PATH . 'SQL/sqlite.initial.sql';
       $this->db->set_debug((bool)$config_all['sql_debug']);
-      $this->db->db_connect('w');
     }
 

trunk/roundcubemail/program/include/rcube_mdb2.php

@@ -31 +31 @@
  * @author     Thomas Bruederli <roundcube@gmail.com>
  * @author     Lukas Kahwe Smith <smith@pooteeweet.org>
- * @version    1.16
+ * @version    1.17
  * @link       http://pear.php.net/package/MDB2
  */
@@ -122 +122 @@
     function db_connect($mode)
     {
-        $this->db_mode = $mode;
-
         // Already connected
         if ($this->db_connected) {
             // no replication, current connection is ok
-            if ($this->db_dsnw == $this->db_dsnr)
+            if (empty($this->db_dsnr) || $this->db_dsnw == $this->db_dsnr)
                 return;
 
-            // connected to master, current connection is ok
+            // connected to read-write db, current connection is ok
             if ($this->db_mode == 'w')
                 return;
@@ -142 +140 @@
 
         $this->db_handle = $this->dsn_connect($dsn);
-        $this->db_connected = true;
+        $this->db_connected = !PEAR::isError($this->db_handle);
+        $this->db_mode = $mode;
     }
 
@@ -196 +195 @@
     function query()
     {
-        if (!$this->is_connected())
-            return null;
-
         $params = func_get_args();
         $query = array_shift($params);
@@ -243 +239 @@
 
         $this->db_connect($mode);
+
+        // check connection before proceeding
+        if (!$this->is_connected())
+            return null;
 
         if ($this->db_provider == 'sqlite')