summaryrefslogtreecommitdiff
path: root/plugins/kolab_delegation
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-05-16 08:34:32 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2014-05-16 08:34:32 (GMT)
commit115c4c54b75791d80f7ab620003f89f4b12501fb (patch)
tree7d70b060cdc1ea1e5c9c72c19faed95977fb6d3c /plugins/kolab_delegation
parentb415c512f00e8b60ddc079cd65fd610f4b612f16 (diff)
downloadroundcubemail-plugins-kolab-115c4c54b75791d80f7ab620003f89f4b12501fb.tar.gz
Rename kolab_auth_ldap::search() method because its signature doesn't match rcube_ldap_generic::search() and fails recursive calls in VLV search mode + add return parameter for results count
Diffstat (limited to 'plugins/kolab_delegation')
-rw-r--r--plugins/kolab_delegation/kolab_delegation_engine.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/kolab_delegation/kolab_delegation_engine.php b/plugins/kolab_delegation/kolab_delegation_engine.php
index ad96831..3d3bd33 100644
--- a/plugins/kolab_delegation/kolab_delegation_engine.php
+++ b/plugins/kolab_delegation/kolab_delegation_engine.php
@@ -202,7 +202,7 @@ class kolab_delegation_engine
return array();
}
- $list = $ldap->search($this->ldap_login_field, $login, 1);
+ $list = $ldap->dosearch($this->ldap_login_field, $login, 1);
if (count($list) == 1) {
$dn = key($list);
@@ -288,7 +288,7 @@ class kolab_delegation_engine
return array();
}
- $list = $ldap->search($this->ldap_delegate_field, $this->ldap_dn, 1);
+ $list = $ldap->dosearch($this->ldap_delegate_field, $this->ldap_dn, 1);
foreach ($list as $dn => $delegator) {
$delegator = $this->parse_ldap_record($delegator, $dn);
@@ -424,7 +424,7 @@ class kolab_delegation_engine
$fields = array_unique(array_filter(array_merge((array)$this->ldap_name_field, (array)$this->ldap_login_field)));
$users = array();
- $result = $ldap->search($fields, $search, $mode, (array)$this->ldap_login_field, $max);
+ $result = $ldap->dosearch($fields, $search, $mode, (array)$this->ldap_login_field, $max);
foreach ($result as $record) {
// skip self