diff options
Diffstat (limited to 'program/lib/Roundcube')
| -rw-r--r-- | program/lib/Roundcube/rcube_ldap.php | 8 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_ldap_generic.php | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php index ef7e1b32d..36f766d84 100644 --- a/program/lib/Roundcube/rcube_ldap.php +++ b/program/lib/Roundcube/rcube_ldap.php @@ -205,8 +205,9 @@ class rcube_ldap extends rcube_addressbook } // initialize ldap wrapper object - $this->ldap = new rcube_ldap_generic($this->prop, true); + $this->ldap = new rcube_ldap_generic($this->prop); $this->ldap->set_cache($this->cache); + $this->ldap->set_debug($this->debug); $this->_connect(); } @@ -1459,11 +1460,14 @@ class rcube_ldap extends rcube_addressbook * Activate/deactivate debug mode * * @param boolean $dbg True if LDAP commands should be logged - * @access public */ function set_debug($dbg = true) { $this->debug = $dbg; + + if ($this->ldap) { + $this->ldap->set_debug($dbg); + } } diff --git a/program/lib/Roundcube/rcube_ldap_generic.php b/program/lib/Roundcube/rcube_ldap_generic.php index 16ca42af5..097ddafd5 100644 --- a/program/lib/Roundcube/rcube_ldap_generic.php +++ b/program/lib/Roundcube/rcube_ldap_generic.php @@ -76,10 +76,9 @@ class rcube_ldap_generic /** * Object constructor * - * @param array $p LDAP connection properties - * @param boolean $debug Enables debug mode + * @param array $p LDAP connection properties */ - function __construct($p, $debug = false) + function __construct($p) { $this->config = $p; @@ -88,8 +87,6 @@ class rcube_ldap_generic if (!is_array($p['hosts']) && !empty($p['host'])) $this->config['hosts'] = array($p['host']); - - $this->debug = $debug; } /** |