Make kolab ldap server configurable

This commit is contained in:
Thomas Bruederli 2011-05-21 12:43:31 +02:00
parent 1543f1444e
commit bff88b8cd5
2 changed files with 4 additions and 3 deletions

View file

@ -1,6 +1,8 @@
<?php <?php
// Sample configuration for Kolab LDAP binding used by Kolab_Storage // Sample configuration for Kolab LDAP binding used by Kolab_Storage
//$rcmail_config['kolab']['ldap']['server'] = '<defaults to imap_host>';
$rcmail_config['kolab']['ldap']['basedn'] = 'dc=kolabserver,dc=local'; $rcmail_config['kolab']['ldap']['basedn'] = 'dc=kolabserver,dc=local';
$rcmail_config['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=kolabserver,dc=local'; $rcmail_config['kolab']['ldap']['phpdn'] = 'cn=nobody,cn=internal,dc=kolabserver,dc=local';
$rcmail_config['kolab']['ldap']['phppw'] = '<ldap-pwd-goes-here>'; $rcmail_config['kolab']['ldap']['phppw'] = '<ldap-pwd-goes-here>';

View file

@ -34,9 +34,8 @@ class rcube_kolab
// load ldap credentials from local config // load ldap credentials from local config
$conf['kolab'] = $rcmail->config->get('kolab'); $conf['kolab'] = $rcmail->config->get('kolab');
$conf['kolab']['ldap']['server'] = 'ldap://' . $_SESSION['imap_host'] . ':389'; $conf['kolab']['ldap'] += array('server' => 'ldap://' . $_SESSION['imap_host'] . ':389');
$conf['kolab']['imap']['server'] = $_SESSION['imap_host']; $conf['kolab']['imap'] = array('server' => $_SESSION['imap_host'], 'port' => $_SESSION['imap_port']);
$conf['kolab']['imap']['port'] = $_SESSION['imap_port'];
// pass the current IMAP authentication credentials to the Horde auth system // pass the current IMAP authentication credentials to the Horde auth system
self::$horde_auth = Auth::singleton('kolab'); self::$horde_auth = Auth::singleton('kolab');