Changeset 2463 in subversion

Timestamp:

May 9, 2009 4:07:10 PM (4 years ago)

Author:

alec

Message:

• Fix session handling on non-session SQL query error (#1485734)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_mdb2.php (modified) (3 diffs)
• program/include/session.inc (modified) (4 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix session handling on non-session SQL query error (#1485734)
 - Fix html editor mode setting when reopening draft message (#1485834)
 - Added quick search box menu (#1484304)

trunk/roundcubemail/program/include/rcube_mdb2.php

@@ -179 +179 @@
 
   /**
+   * Connection state checker
+   *
+   * @param  boolean  True if in connected state
+   */
+  function is_connected()
+    {
+    return PEAR::isError($this->db_handle) ? false : true;
+    }
+
+
+  /**
    * Execute a SQL query
    *
@@ -188 +199 @@
   function query()
     {
+    if (!$this->is_connected())
+      return NULL;
+    
     $params = func_get_args();
     $query = array_shift($params);
@@ -361 +375 @@
   function _fetch_row($result, $mode)
     {
-    if ($result === FALSE || PEAR::isError($result))
+    if ($result === FALSE || PEAR::isError($result) || !$this->is_connected())
       return FALSE;
 

trunk/roundcubemail/program/include/session.inc

@@ -40 +40 @@
   $DB = rcmail::get_instance()->get_dbh();
   
-  if ($DB->is_error()) {
-    return false;
-  }
-  
   $sql_result = $DB->query(
     "SELECT vars, ip, " . $DB->unixtimestamp('changed') . " AS changed
@@ -67 +63 @@
   $DB = rcmail::get_instance()->get_dbh();
   
-  if ($DB->is_error()) {
-    return false;
-  }
-
   $sql_result = $DB->query(
     "SELECT 1 FROM " . get_table_name('session') . "
@@ -106 +98 @@
   $DB = $rcmail->get_dbh();
   
-  if ($DB->is_error()) {
-    return false;
-  }
-
   $DB->query("DELETE FROM " . get_table_name('session') . " WHERE sess_id=?", $key);
 
@@ -121 +109 @@
   $rcmail = rcmail::get_instance();
   $DB = $rcmail->get_dbh();
-
-  if ($DB->is_error()) {
-    return false;
-  }
 
   // just delete all expired sessions