From b2ffe58f9ddf5a771f8e490cb6efc082c93d6fe4 Mon Sep 17 00:00:00 2001 From: Peter Kubica Date: Mon, 11 Mar 2019 10:00:05 +0100 Subject: [PATCH] Fix for: Password: De-duplicate ldap drivers code (#6669) --- plugins/password/drivers/ldap_simple.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/password/drivers/ldap_simple.php b/plugins/password/drivers/ldap_simple.php index 8e422543b..1a6e411ed 100644 --- a/plugins/password/drivers/ldap_simple.php +++ b/plugins/password/drivers/ldap_simple.php @@ -29,9 +29,9 @@ class rcube_ldap_simple_password { - private $debug = false; - private $user; - private $conn; + protected $debug = false; + protected $user; + protected $conn; public function save($curpass, $passwd) @@ -159,7 +159,7 @@ class rcube_ldap_simple_password $user_dn = $plugin['user_dn']; } else if ($user_dn = $rcmail->config->get('password_ldap_userDN_mask')) { - $user_dn = rcube_ldap_password::substitute_vars($user_dn); + $user_dn = self::substitute_vars($user_dn); } else { $user_dn = $this->search_userdn($rcmail, $ds); @@ -228,8 +228,8 @@ class rcube_ldap_simple_password $this->_debug("S: OK"); - $search_base = rcube_ldap_password::substitute_vars($search_base); - $search_filter = rcube_ldap_password::substitute_vars($search_filter); + $search_base = self::substitute_vars($search_base); + $search_filter = self::substitute_vars($search_filter); $this->_debug("C: Search $search_base for $search_filter"); @@ -282,7 +282,7 @@ class rcube_ldap_simple_password /** * Prints debug info to the log */ - private function _debug($str) + protected function _debug($str) { if ($this->debug) { rcube::write_log('ldap', $str);