Apply changes from trunk to 0.1-stable

1 files changed, 50 insertions, 2 deletions

diff --git a/program/include/rcube_mdb2.inc b/program/include/rcube_mdb2.inc
index 63d156a08..72d906664 100644
--- a/program/include/rcube_mdb2.inc
+++ b/program/include/rcube_mdb2.inc
@@ -48,6 +48,7 @@ class rcube_mdb2
   var $db_handle = 0;         // Connection handle
   var $db_error = false;
   var $db_error_msg = '';
+  var $debug_mode = false;
 
   var $a_query_results = array('dummy');
   var $last_res_id = 0;
@@ -94,8 +95,11 @@ class rcube_mdb2
   function dsn_connect($dsn)
     {
     // Use persistent connections if available
-    $dbh = MDB2::connect($dsn,
-      array('persistent' => $this->db_pconn,
+    $dbh = MDB2::connect($dsn, array(
+        'persistent' => $this->db_pconn,
+        'emulate_prepared' => $this->debug_mode,
+        'debug' => $this->debug_mode,
+        'debug_handler' => 'mdb2_debug_handler',
         'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL));
 
     if (MDB2::isError($dbh))
@@ -156,6 +160,21 @@ class rcube_mdb2
     }
 
 
+  /**
+   * Activate/deactivate debug mode
+   *
+   * @param boolean True if SQL queries should be logged
+   */
+  function set_debug($dbg = true)
+  {
+    $this->debug_mode = $dbg;
+    if ($this->db_connected)
+    {
+      $this->db_handle->setOption('debug', $dbg);
+      $this->db_handle->setOption('emulate_prepared', $dbg);
+    }
+  }
+
     
   /**
    * Getter for error state
@@ -413,6 +432,22 @@ class rcube_mdb2
     return $this->db_handle->quoteIdentifier($str);
     }
 
+  /**
+   * Escapes a string
+   *
+   * @param  string  The string to be escaped
+   * @return string  The escaped string
+   * @access public
+   * @since  0.1.1
+   */
+  function escapeSimple($str)
+    {
+    if (!$this->db_handle)
+      $this->db_connect('r');
+   
+    return $this->db_handle->escape($str);
+    }
+
 
   /**
    * Return SQL function for current time and date
@@ -569,4 +604,17 @@ class rcube_mdb2
 
   }  // end class rcube_db
 
+
+/* this is our own debug handler for the MDB2 connection */
+function mdb2_debug_handler(&$db, $scope, $message, $context = array())
+{
+  if ($scope != 'prepare')
+  {
+    $debug_output = $scope . '('.$db->db_index.'): ';
+    $debug_output .= $message . $db->getOption('log_line_break');
+    write_log('sqllog', $debug_output);
+  }
+}
+
+
 ?>