From fbe54043cf598b19a753dc2b21a7ed558d23fd15 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Aug 2011 13:40:07 -0400
Subject: [PATCH] Fix folders drop-down list: descend into root folder (e.g. INBOX) even if part of the exception list
---
program/include/rcube_mdb2.php | 72 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php
index a68d1dd..b3976c3 100644
--- a/program/include/rcube_mdb2.php
+++ b/program/include/rcube_mdb2.php
@@ -44,6 +44,7 @@
var $db_error_msg = '';
private $debug_mode = false;
+ private $write_failure = false;
private $a_query_results = array('dummy');
private $last_res_id = 0;
private $tables;
@@ -83,7 +84,7 @@
'persistent' => $this->db_pconn,
'emulate_prepared' => $this->debug_mode,
'debug' => $this->debug_mode,
- 'debug_handler' => 'mdb2_debug_handler',
+ 'debug_handler' => array($this, 'debug_handler'),
'portability' => MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL);
if ($this->db_provider == 'pgsql') {
@@ -124,7 +125,7 @@
// Already connected
if ($this->db_connected) {
// connected to read-write db, current connection is ok
- if ($this->db_mode == 'w')
+ if ($this->db_mode == 'w' && !$this->write_failure)
return;
// no replication, current connection is ok for read and write
@@ -189,6 +190,16 @@
/**
+ * Is database replication configured?
+ * This returns true if dsnw != dsnr
+ */
+ function is_replicated()
+ {
+ return !empty($this->db_dsnr) && $this->db_dsnw != $this->db_dsnr;
+ }
+
+
+ /**
* Execute a SQL query
*
* @param string SQL query to execute
@@ -245,6 +256,10 @@
// Read or write ?
$mode = (strtolower(substr(trim($query),0,6)) == 'select') ? 'r' : 'w';
+ // don't event attempt to connect if previous write-operation failed
+ if ($this->write_failure && $mode == 'w')
+ return false;
+
$this->db_connect($mode);
// check connection before proceeding
@@ -277,6 +292,10 @@
$q->free();
}
}
+
+ // remember that write-operation failed
+ if ($mode == 'w' && ($result === false || PEAR::isError($result)))
+ $this->write_failure = true;
// add result, even if it's an error
return $this->_add_result($result);
@@ -600,6 +619,34 @@
}
}
+ /**
+ * Abstract SQL statement for value concatenation
+ *
+ * @return string SQL statement to be used in query
+ * @access public
+ */
+ function concat(/* col1, col2, ... */)
+ {
+ $func = '';
+ $args = func_get_args();
+
+ switch($this->db_provider) {
+ case 'mysql':
+ case 'mysqli':
+ $func = 'CONCAT';
+ $delim = ', ';
+ break;
+ case 'mssql':
+ case 'sqlsrv':
+ $delim = ' + ';
+ break;
+ default:
+ $delim = ' || ';
+ }
+
+ return $func . '(' . join($delim, $args) . ')';
+ }
+
/**
* Encodes non-UTF-8 characters in string/array/object (recursive)
@@ -740,16 +787,17 @@
'md5', 'rcube_sqlite_md5');
}
-} // 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 = sprintf('%s(%d): %s;',
- $scope, $db->db_index, rtrim($message, ';'));
- write_log('sql', $debug_output);
+ /**
+ * Debug handler for the MDB2
+ */
+ function debug_handler(&$db, $scope, $message, $context = array())
+ {
+ if ($scope != 'prepare') {
+ $debug_output = sprintf('%s(%d): %s;',
+ $scope, $db->db_index, rtrim($message, ';'));
+ write_log('sql', $debug_output);
+ }
}
-}
+} // end class rcube_db
--
Gitblit v1.9.1