Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set 'global' before 'sql'

Browse source
This commit is contained in:
Aleksander Machniak (Kolab Systems) 2011-06-18 21:10:00 +02:00
parent 2f22542893
commit 942ecc743a
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plugins/kolab_core/rcube_kolab.php
View file

@ -33,6 +33,18 @@ class rcube_kolab
$rcmail = rcmail::get_instance(); $rcmail = rcmail::get_instance();
// get password of logged user
$pwd = $rcmail->decrypt($_SESSION['password']);
// load ldap credentials from local config
$conf['kolab'] = (array) $rcmail->config->get('kolab');
// Set global Horde config (e.g. Cache settings)
if (!empty($conf['kolab']['global'])) {
$conf = array_merge($conf, $conf['kolab']['global']);
unset($conf['kolab']['global']);
}
// Set Horde configuration (for cache db) // Set Horde configuration (for cache db)
$dsnw = MDB2::parseDSN($rcmail->config->get('db_dsnw')); $dsnw = MDB2::parseDSN($rcmail->config->get('db_dsnw'));
$dsnr = MDB2::parseDSN($rcmail->config->get('db_dsnr')); $dsnr = MDB2::parseDSN($rcmail->config->get('db_dsnr'));
@ -46,18 +58,6 @@ class rcube_kolab
$conf['sql']['splitread'] = true; $conf['sql']['splitread'] = true;
} }
// get password of logged user
$pwd = $rcmail->decrypt($_SESSION['password']);
// load ldap credentials from local config
$conf['kolab'] = (array) $rcmail->config->get('kolab');
// Set global Horde config (e.g. Cache settings)
if (!empty($conf['kolab']['global'])) {
$conf = array_merge($conf, $conf['kolab']['global']);
unset($conf['kolab']['global']);
}
// Re-set LDAP/IMAP host config // Re-set LDAP/IMAP host config
$ldap = array('server' => 'ldap://' . $_SESSION['imap_host'] . ':389'); $ldap = array('server' => 'ldap://' . $_SESSION['imap_host'] . ':389');
$imap = array('server' => $_SESSION['imap_host'], 'port' => $_SESSION['imap_port']); $imap = array('server' => $_SESSION['imap_host'], 'port' => $_SESSION['imap_port']);