From abd240899fad4a3421bcea1977b986ac4e524123 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 9 Dec 2008 18:34:45 +0000 Subject: [PATCH] use global LDAP suffix from self service --- lam/lib/modules/kolabUser.inc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc index f99d1270..854545ac 100644 --- a/lam/lib/modules/kolabUser.inc +++ b/lam/lib/modules/kolabUser.inc @@ -129,13 +129,6 @@ class kolabUser extends baseModule { 'kolabDelegate' => _('Delegates'), 'kolabInvitationPolicy' => _('Invitation policy') ); - // self service configuration settings - $return['selfServiceSettings'] = array( - array( - array('kind' => 'text', 'text' => '' . _("Account suffix") . ':  '), - array('kind' => 'input', 'type' => 'text', 'name' => 'kolabUser_suffix'), - array('kind' => 'help', 'value' => 'suffix')) - ); // help Entries $return['help'] = array( 'suffix' => array( @@ -837,7 +830,7 @@ class kolabUser extends baseModule { // delegates if (in_array('kolabDelegate', $fields)) { $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) { $result = ldap_get_entries($_SESSION['ldapHandle'], $sr); for ($i = 0; $i < $result['count']; $i++) {