Permalink
Browse files

- Add %dc variable support in base_dn/bind_dn config (#1486779)

  • Loading branch information...
1 parent d7a5dfa commit f7676544788ff47cd51e99256f6d44ed436b05aa @alecpl alecpl committed Jun 20, 2010
Showing with 6 additions and 3 deletions.
  1. +1 −0 CHANGELOG
  2. +1 −0 config/main.inc.php.dist
  3. +4 −3 program/include/rcube_ldap.php
View
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Add %dc variable support in base_dn/bind_dn config (#1486779)
- Add button to hide/unhide the preview pane (#1484215)
- Fix no-cache headers on https to prevent content caching by proxies (#1486798)
- Fix attachment filenames broken with TNEF decoder using long filenames (#1486795)
View
@@ -409,6 +409,7 @@ $rcmail_config['ldap_public']['Verisign'] = array(
// address, uses the username_domain value if not an email address.
// %u - The username prior to the '@'.
// %d - The domain name after the '@'.
+ // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
'base_dn' => '',
'bind_dn' => '',
'bind_pass' => '',
@@ -132,13 +132,14 @@ function connect()
// Get the pieces needed for variable replacement.
$fu = $RCMAIL->user->get_username();
list($u, $d) = explode('@', $fu);
-
+ $dc = 'dc='.strtr($d, array('.' => ',dc=')); // hierarchal domain string
+
// Replace the bind_dn and base_dn variables.
- $replaces = array('%fu' => $fu, '%u' => $u, '%d' => $d);
+ $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
$this->prop['bind_dn'] = strtr($this->prop['bind_dn'], $replaces);
$this->prop['base_dn'] = strtr($this->prop['base_dn'], $replaces);
}
-
+
if (!empty($this->prop['bind_dn']) && !empty($this->prop['bind_pass']))
$this->ready = $this->bind($this->prop['bind_dn'], $this->prop['bind_pass']);
}

0 comments on commit f767654

Please sign in to comment.