summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hoffend <dh@dotlan.net>2015-04-11 09:29:44 (GMT)
committerDaniel Hoffend <dh@dotlan.net>2015-04-11 09:30:28 (GMT)
commit620985d0f1482bc11e5a592ee82531332544877f (patch)
treeeff200adcb137c804fda8bd89c4017741176197a
parent0d2f804e66e4bda71d483bdfaaa1f3729818c982 (diff)
downloadroundcubemail-plugins-kolab-620985d0f1482bc11e5a592ee82531332544877f.tar.gz
set default delegation filter to include mail addresses of shared mailboxes
-rw-r--r--plugins/kolab_delegation/config.inc.php.dist2
-rw-r--r--plugins/kolab_delegation/kolab_delegation_engine.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/kolab_delegation/config.inc.php.dist b/plugins/kolab_delegation/config.inc.php.dist
index efa47e6..12e04d5 100644
--- a/plugins/kolab_delegation/config.inc.php.dist
+++ b/plugins/kolab_delegation/config.inc.php.dist
@@ -2,7 +2,7 @@
// This will overwrite defined LDAP filter
// Note: LDAP addressbook defined for kolab_auth plugin is used
-$config['kolab_delegation_filter'] = '(objectClass=kolabInetOrgPerson)';
+$config['kolab_delegation_filter'] = '(|(objectClass=kolabInetOrgPerson)(&(objectclass=kolabsharedfolder)(kolabFolderType=mail)))';
// Delegates field (from fieldmap configuration) to get delegates list
// Note: This is a field name, not LDAP attribute name
diff --git a/plugins/kolab_delegation/kolab_delegation_engine.php b/plugins/kolab_delegation/kolab_delegation_engine.php
index be16cf6..88e4563 100644
--- a/plugins/kolab_delegation/kolab_delegation_engine.php
+++ b/plugins/kolab_delegation/kolab_delegation_engine.php
@@ -223,7 +223,7 @@ class kolab_delegation_engine
}
// Default filter of LDAP queries
- $this->ldap_filter = $this->rc->config->get('kolab_delegation_filter', '(objectClass=kolabInetOrgPerson)');
+ $this->ldap_filter = $this->rc->config->get('kolab_delegation_filter', '(|(objectClass=kolabInetOrgPerson)(&(objectclass=kolabsharedfolder)(kolabFolderType=mail)))');
// Name of the LDAP field for delegates list
$this->ldap_delegate_field = $this->rc->config->get('kolab_delegation_delegate_field', 'kolabDelegate');
// Encoded LDAP DN of current user, set on login by kolab_auth plugin