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

Merge branch 'roundcubemail-plugins-kolab-3.1' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab into roundcubemail-plugins-kolab-3.1

Browse source
This commit is contained in:
Thomas Bruederli 2014-01-15 16:38:02 +01:00
commit 62533e9241
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/kolab_auth/kolab_auth.php
View file

@ -401,12 +401,12 @@ class kolab_auth extends rcube_plugin
$_SESSION['user_roledns'] = (array)($record[$role_attr]); $_SESSION['user_roledns'] = (array)($record[$role_attr]);
} }
if (!empty($imap_attr) && !empty($record[$role_attr])) { if (!empty($imap_attr) && !empty($record[$imap_attr])) {
$default_host = $rcmail->config->get('default_host'); $default_host = $rcmail->config->get('default_host');
if (!empty($default_host)) { if (!empty($default_host)) {
rcube::write_log("errors", "Both default host and kolab_auth_mailhost set. Incompatible."); rcube::write_log("errors", "Both default host and kolab_auth_mailhost set. Incompatible.");
} else { } else {
$args['host'] = "tls://" . $record[$role_attr]; $args['host'] = "tls://" . $record[$imap_attr];
} }
} }