Substitute variables in 'password_ldap_search_base' value

Aleksander Machniak

2013-11-08 393c868e8ed04f3aa57e335e6145592ff42a5ba0

Substitute variables in 'password_ldap_search_base' value

 plugins/password/drivers/ldap.php

@@ -146,7 +146,7 @@
            return '';
        }

        $base = $rcmail->config->get('password_ldap_search_base');
        $base   = self::substitute_vars($rcmail->config->get('password_ldap_search_base'));
        $filter = self::substitute_vars($rcmail->config->get('password_ldap_search_filter'));
        $options = array (
            'scope' => 'sub',

 plugins/password/drivers/ldap_simple.php

@@ -187,6 +187,8 @@

        $search_base   = $rcmail->config->get('password_ldap_search_base');
        $search_filter = $rcmail->config->get('password_ldap_search_filter');

        $search_base   = rcube_ldap_password::substitute_vars($search_base);
        $search_filter = rcube_ldap_password::substitute_vars($search_filter);

        $this->_debug("C: Search $search_base for $search_filter");