Thomas Bruederli
2015-07-31 2965a981b7ec22866fbdf2d567d87e2d068d3617
program/lib/Roundcube/rcube_ldap.php
@@ -283,13 +283,22 @@
                }
                // Get the pieces needed for variable replacement.
                if ($fu = $rcube->get_user_email())
                if ($fu = $rcube->get_user_email()) {
                    list($u, $d) = explode('@', $fu);
                else
                }
                else {
                    $d = $this->mail_domain;
                }
                $dc = 'dc='.strtr($d, array('.' => ',dc=')); // hierarchal domain string
                // resolve $dc through LDAP
                if (!empty($this->prop['domain_filter']) && !empty($this->prop['search_bind_dn']) &&
                        method_exists($this->ldap, 'domain_root_dn')) {
                    $this->ldap->bind($this->prop['search_bind_dn'], $this->prop['search_bind_pw']);
                    $dc = $this->ldap->domain_root_dn($d);
                }
                $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
                // Search for the dn to use to authenticate