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

setting account_fullname, to get id2name($uid,account_fullname) working for groups in LDAP too

Browse Source
This commit is contained in:
Ralf Becker 2011-01-02 21:53:04 +00:00
parent 4b93e5c0c5
commit 4915952262
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,6 +447,7 @@ class accounts_ldap
'account_type' => 'g', 'account_type' => 'g',
'account_firstname' => $data['cn'][0], 'account_firstname' => $data['cn'][0],
'account_lastname' => lang('Group'), 'account_lastname' => lang('Group'),
'account_fullname' => lang('Group').' '.$data['cn'][0],
'groupOfNames' => in_array('groupOfNames',$data['objectclass']), 'groupOfNames' => in_array('groupOfNames',$data['objectclass']),
'account_email' => $data['mail'][0], 'account_email' => $data['mail'][0],
); );
@ -716,20 +717,20 @@ class accounts_ldap
{ {
if ($key !== 'count') $fullSet[$entry['uid'][0]] = $entry[$order][0]; if ($key !== 'count') $fullSet[$entry['uid'][0]] = $entry[$order][0];
} }
if (is_numeric($param['type'])) // return only group-members if (is_numeric($param['type'])) // return only group-members
{ {
$relevantAccounts = array(); $relevantAccounts = array();
$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid')); $sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
$group = ldap_get_entries($this->ds, $sri); $group = ldap_get_entries($this->ds, $sri);
if (isset($group[0]['memberuid'])) if (isset($group[0]['memberuid']))
{ {
$fullSet = array_intersect_key($fullSet, array_flip($group[0]['memberuid'])); $fullSet = array_intersect_key($fullSet, array_flip($group[0]['memberuid']));
} }
} }
$totalcount = count($fullSet); $totalcount = count($fullSet);
$sortFn = $param['sort'] == 'DESC' ? 'arsort' : 'asort'; $sortFn = $param['sort'] == 'DESC' ? 'arsort' : 'asort';
$sortFn($fullSet); $sortFn($fullSet);
$relevantAccounts = is_numeric($start) ? array_slice(array_keys($fullSet), $start, $offset) : array_keys($fullSet); $relevantAccounts = is_numeric($start) ? array_slice(array_keys($fullSet), $start, $offset) : array_keys($fullSet);
@ -1095,7 +1096,7 @@ class accounts_ldap
$forward = $this->group_mail_classes[$objectclass]; $forward = $this->group_mail_classes[$objectclass];
if (is_array($forward)) list($forward,$extra_attr) = $forward; if (is_array($forward)) list($forward,$extra_attr) = $forward;
if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid; if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
$to_write[$forward] = array(); $to_write[$forward] = array();
foreach($members as $key => $member) foreach($members as $key => $member)
{ {