extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-07 14:39:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

sort group-addressbooks and other-user-addressbooks alphabetical

Browse Source
This commit is contained in:
Ralf Becker 2010-03-05 14:56:01 +00:00
parent ae32ac2a4e
commit 64ba772ab4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -267,7 +267,7 @@ class addressbook_bo extends addressbook_so
{ {
//echo "uicontacts::get_addressbooks($required,$include_all) grants="; _debug_array($this->grants); //echo "uicontacts::get_addressbooks($required,$include_all) grants="; _debug_array($this->grants);
$addressbooks = array(); $addressbooks = $to_sort = array();
if ($extra_label) $addressbooks[''] = $extra_label; if ($extra_label) $addressbooks[''] = $extra_label;
$addressbooks[$this->user] = lang('Personal'); $addressbooks[$this->user] = lang('Personal');
// add all group addressbooks the user has the necessary rights too // add all group addressbooks the user has the necessary rights too
@ -275,21 +275,32 @@ class addressbook_bo extends addressbook_so
{ {
if (($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g') if (($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
{ {
$addressbooks[$uid] = lang('Group %1',$GLOBALS['egw']->accounts->id2name($uid)); $to_sort[$uid] = lang('Group %1',$GLOBALS['egw']->accounts->id2name($uid));
} }
} }
if ($to_sort)
{
asort($to_sort);
$addressbooks += $to_sort;
}
if (($this->grants[0] & $required) == $required && !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) if (($this->grants[0] & $required) == $required && !$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
{ {
$addressbooks[0] = lang('Accounts'); $addressbooks[0] = lang('Accounts');
} }
// add all other user addressbooks the user has the necessary rights too // add all other user addressbooks the user has the necessary rights too
$to_sort = array();
foreach($this->grants as $uid => $rights) foreach($this->grants as $uid => $rights)
{ {
if ($uid != $this->user && ($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u') if ($uid != $this->user && ($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
{ {
$addressbooks[$uid] = $GLOBALS['egw']->common->grab_owner_name($uid); $to_sort[$uid] = $GLOBALS['egw']->common->grab_owner_name($uid);
} }
} }
if ($to_sort)
{
asort($to_sort);
$addressbooks += $to_sort;
}
if ($this->private_addressbook) if ($this->private_addressbook)
{ {
$addressbooks[$this->user.'p'] = lang('Private'); $addressbooks[$this->user.'p'] = lang('Private');