extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 08:23:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

- correctly set and empty some additional attributes like first name and email

Browse Source 
- validation group-members before setting them (false return from id2name, gives ldap-error otherwise)
This commit is contained in:
Ralf Becker 2006-06-07 17:58:20 +00:00
parent 5a84e151b2
commit c6b0c63725
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
phpgwapi/inc/class.accounts_ldap.inc.php
View File

@ -216,7 +216,8 @@ class accounts_backend
if ($old && !ldap_modify($this->ds,$dn,$to_write) ||
!$old && !ldap_add($this->ds,$dn,$to_write))
{
//echo ldap_error($this->ds); exit;
echo "ldap_".($old ? 'modify' : 'add')."(,$dn,".print_r($to_write,true).")\n";
echo ldap_error($this->ds);
return false;
}
if ($memberships) // setting the previous memberships of the renamed account
@ -396,9 +397,15 @@ class accounts_backend
$to_write['uidnumber'] = $data['account_id'];
$to_write['uid'] = $data['account_lid'];
$to_write['gidnumber'] = abs($data['account_primary_group']);
$to_write['givenname'] = $data['account_firstname'];
if (!$new_entry || $data['account_firstname'])
{
$to_write['givenname'] = $data['account_firstname'] ? $data['account_firstname'] : array();
}
$to_write['sn'] = $data['account_lastname'];
$to_write['mail'] = (string) $data['account_email'];
if (!$new_entry || $data['account_email'])
{
$to_write['mail'] = $data['account_email'] ? $data['account_email'] : array();
}
$to_write['cn'] = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
if (isset($data['account_passwd']) && $data['account_passwd'])
@ -739,12 +746,15 @@ class accounts_backend
foreach($members as $key => $member)
{
if (is_numeric($member))
if (is_numeric($member) && ($member = $this->id2name($member)))
{
$members[$key] = $this->id2name($member);
$members[$key] = $member;
}
}
ldap_modify($this->ds,'cn='.$cn.','.$this->group_context,array('memberUid' => array_values($members)));
if (!ldap_modify($this->ds,'cn='.$cn.','.$this->group_context,array('memberUid' => array_values(array_unique($members)))))
{
echo "ldap_modify(,'cn=$cn','$this->group_context',array('memberUid' => ".print_r(array_values(array_unique($members)),true)."))\n";
}
}
/**