use global LDAP suffix from self service
This commit is contained in:
parent
47b946086f
commit
abd240899f
|
@ -129,13 +129,6 @@ class kolabUser extends baseModule {
|
||||||
'kolabDelegate' => _('Delegates'),
|
'kolabDelegate' => _('Delegates'),
|
||||||
'kolabInvitationPolicy' => _('Invitation policy')
|
'kolabInvitationPolicy' => _('Invitation policy')
|
||||||
);
|
);
|
||||||
// self service configuration settings
|
|
||||||
$return['selfServiceSettings'] = array(
|
|
||||||
array(
|
|
||||||
array('kind' => 'text', 'text' => '<b>' . _("Account suffix") . ': </b>'),
|
|
||||||
array('kind' => 'input', 'type' => 'text', 'name' => 'kolabUser_suffix'),
|
|
||||||
array('kind' => 'help', 'value' => 'suffix'))
|
|
||||||
);
|
|
||||||
// help Entries
|
// help Entries
|
||||||
$return['help'] = array(
|
$return['help'] = array(
|
||||||
'suffix' => array(
|
'suffix' => array(
|
||||||
|
@ -837,7 +830,7 @@ class kolabUser extends baseModule {
|
||||||
// delegates
|
// delegates
|
||||||
if (in_array('kolabDelegate', $fields)) {
|
if (in_array('kolabDelegate', $fields)) {
|
||||||
$delegates = array();
|
$delegates = array();
|
||||||
$sr = @ldap_search($_SESSION['ldapHandle'], escapeDN($this->selfServiceSettings->moduleSettings['kolabUser_suffix'][0]), '(&(objectClass=inetOrgPerson)(mail=*))', array('mail'));
|
$sr = @ldap_search($_SESSION['ldapHandle'], escapeDN($this->selfServiceSettings->LDAPSuffix), '(&(objectClass=inetOrgPerson)(mail=*))', array('mail'));
|
||||||
if ($sr) {
|
if ($sr) {
|
||||||
$result = ldap_get_entries($_SESSION['ldapHandle'], $sr);
|
$result = ldap_get_entries($_SESSION['ldapHandle'], $sr);
|
||||||
for ($i = 0; $i < $result['count']; $i++) {
|
for ($i = 0; $i < $result['count']; $i++) {
|
||||||
|
|
Loading…
Reference in New Issue