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

Ignore address_book_type setting when checking for global addressbooks

Browse source
This commit is contained in:
Aleksander Machniak 2019-04-16 12:50:20 +02:00
parent 4ad016bce4
commit 12ce9fd4c7
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/kolab_addressbook/kolab_addressbook.php
View file

@ -831,10 +831,9 @@ class kolab_addressbook extends rcube_plugin
} }
$ldap_public = $this->rc->config->get('ldap_public'); $ldap_public = $this->rc->config->get('ldap_public');
$abook_type = $this->rc->config->get('address_book_type');
// Hide option if there's no global addressbook // Hide option if there's no global addressbook
if (empty($ldap_public) || $abook_type != 'ldap') { if (empty($ldap_public)) {
return $args; return $args;
} }
@ -1126,9 +1125,8 @@ class kolab_addressbook extends rcube_plugin
// Make sure any global addressbooks are defined // Make sure any global addressbooks are defined
if ($abook_prio == 0 || $abook_prio == 2) { if ($abook_prio == 0 || $abook_prio == 2) {
$ldap_public = $this->rc->config->get('ldap_public'); $ldap_public = $this->rc->config->get('ldap_public');
$abook_type = $this->rc->config->get('address_book_type');
if (empty($ldap_public) || $abook_type != 'ldap') { if (empty($ldap_public)) {
$abook_prio = 1; $abook_prio = 1;
} }
} }