summaryrefslogtreecommitdiff
path: root/plugins/kolab_delegation
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2014-08-18 12:29:29 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2014-08-18 12:29:29 (GMT)
commite4100366b5bf28d28015d883d4c50f03bf1bc529 (patch)
treed987ecce7f1e9c1a3c150744b0878473d8b5fa31 /plugins/kolab_delegation
parent824db716b4b6f08ca649d5a2a88a77c87f062e10 (diff)
downloadroundcubemail-plugins-kolab-e4100366b5bf28d28015d883d4c50f03bf1bc529.tar.gz
Fix delegatee deletion if configured field name equals attribute name
Fix so delegate field name might be omitted in kolab_auth plugin config (#3400)
Diffstat (limited to 'plugins/kolab_delegation')
-rw-r--r--plugins/kolab_delegation/kolab_delegation_engine.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/kolab_delegation/kolab_delegation_engine.php b/plugins/kolab_delegation/kolab_delegation_engine.php
index cb906d9..e346b10 100644
--- a/plugins/kolab_delegation/kolab_delegation_engine.php
+++ b/plugins/kolab_delegation/kolab_delegation_engine.php
@@ -240,6 +240,7 @@ class kolab_delegation_engine
$this->ldap_org_field = $this->rc->config->get('kolab_auth_organization');
$ldap->set_filter($this->ldap_filter);
+ $ldap->extend_fieldmap(array($this->ldap_delegate_field => $this->ldap_delegate_field));
return $ldap;
}
@@ -533,7 +534,7 @@ class kolab_delegation_engine
}
// Get current user record
- $this->cache['user'] = $ldap->get_record($this->ldap_dn, true);
+ $this->cache['user'] = $ldap->get_record($this->ldap_dn);
}
return $parsed ? $this->parse_ldap_record($this->cache['user']) : $this->cache['user'];