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

calendar_bo::list_cals() returns now array no longer indexed by account names, as this overwrites identical account names with the last one

Browse Source 
also do NOT return no longer existing account, which are eg. still included in acl
This commit is contained in:
Ralf Becker 2011-03-24 09:26:39 +00:00
parent baccd759bf
commit ad287e8664
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/inc/class.calendar_activesync.inc.php
View File

@ -77,9 +77,10 @@ class calendar_activesync implements activesync_plugin_write
$cals = $cals ? explode(',',$cals) : array('P'); // implicit default of 'P' $cals = $cals ? explode(',',$cals) : array('P'); // implicit default of 'P'
$folderlist = array(); $folderlist = array();
foreach ($this->calendar->list_cals() as $label => $entry) foreach ($this->calendar->list_cals() as $entry)
{ {
$account_id = $entry['grantor']; $account_id = $entry['grantor'];
$label = $entry['name'];
if (in_array('A',$cals) || in_array($account_id,$cals) || if (in_array('A',$cals) || in_array($account_id,$cals) ||
$account_id == $GLOBALS['egw_info']['user']['account_id'] && in_array('P',$cals) || $account_id == $GLOBALS['egw_info']['user']['account_id'] && in_array('P',$cals) ||
$account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G',$cals)) $account_id == $GLOBALS['egw_info']['user']['account_primary_group'] && in_array('G',$cals))
@ -1098,12 +1099,12 @@ END:VTIMEZONE
{ {
if (!isset($this->calendar)) $this->calendar = new calendar_boupdate(); if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();
foreach ($this->calendar->list_cals() as $label => $entry) foreach ($this->calendar->list_cals() as $entry)
{ {
$account_id = $entry['grantor']; $account_id = $entry['grantor'];
if ($account_id != $GLOBALS['egw_info']['user']['account_id']) if ($account_id != $GLOBALS['egw_info']['user']['account_id'])
{ {
$cals[$account_id] = $label; $cals[$account_id] = $entry['name'];
} }
} }
} }

42
calendar/inc/class.calendar_bo.inc.php
View File

@ -1391,11 +1391,11 @@ class calendar_bo
if ($end_m == 24*60-1) ++$duration; if ($end_m == 24*60-1) ++$duration;
$duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : ''); $duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
$timespan = $t = $GLOBALS['egw']->common->formattime(sprintf('%02d',$start_m/60),sprintf('%02d',$start_m%60)); $timespan = $t = common::formattime(sprintf('%02d',$start_m/60),sprintf('%02d',$start_m%60));
if ($both) // end-time too if ($both) // end-time too
{ {
$timespan .= ' - '.$GLOBALS['egw']->common->formattime(sprintf('%02d',$end_m/60),sprintf('%02d',$end_m%60)); $timespan .= ' - '.common::formattime(sprintf('%02d',$end_m/60),sprintf('%02d',$end_m%60));
// dont double am/pm if they are the same in both times // dont double am/pm if they are the same in both times
if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2)) if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2))
{ {
@ -1545,8 +1545,11 @@ class calendar_bo
*/ */
function _list_cals_add($id,&$users,&$groups) function _list_cals_add($id,&$users,&$groups)
{ {
$name = $GLOBALS['egw']->common->grab_owner_name($id); $name = common::grab_owner_name($id);
$egw_name = $GLOBALS['egw']->accounts->id2name($id); if (!($egw_name = $GLOBALS['egw']->accounts->id2name($id)))
{
return; // do not return no longer existing accounts which eg. still mentioned in acl
}
if (($type = $GLOBALS['egw']->accounts->get_type($id)) == 'g') if (($type = $GLOBALS['egw']->accounts->get_type($id)) == 'g')
{ {
$arr = &$groups; $arr = &$groups;
@ -1555,7 +1558,7 @@ class calendar_bo
{ {
$arr = &$users; $arr = &$users;
} }
$arr[$name] = Array( $arr[] = array(
'grantor' => $id, 'grantor' => $id,
'value' => ($type == 'g' ? 'g_' : '') . $id, 'value' => ($type == 'g' ? 'g_' : '') . $id,
'name' => $name, 'name' => $name,
@ -1566,7 +1569,7 @@ class calendar_bo
/** /**
* generate list of user- / group-calendars for the selectbox in the header * generate list of user- / group-calendars for the selectbox in the header
* *
* @return array alphabeticaly sorted array with groups first and then users: $name => array('grantor'=>$id,'value'=>['g_'.]$id,'name'=>$name) * @return array alphabeticaly sorted array with users first and then groups: array('grantor'=>$id,'value'=>['g_'.]$id,'name'=>$name)
*/ */
function list_cals() function list_cals()
{ {
@ -1575,7 +1578,7 @@ class calendar_bo
{ {
$this->_list_cals_add($id,$users,$groups); $this->_list_cals_add($id,$users,$groups);
} }
if ($memberships = $GLOBALS['egw']->accounts->membership($GLOBALS['egw_info']['user']['account_id'])) if (($memberships = $GLOBALS['egw']->accounts->membership($GLOBALS['egw_info']['user']['account_id'])))
{ {
foreach($memberships as $group_info) foreach($memberships as $group_info)
{ {
@ -1590,17 +1593,22 @@ class calendar_bo
} }
} }
} }
foreach ($groups as $name => $group) usort($users,array($this,'name_cmp'));
{ usort($groups,array($this,'name_cmp'));
foreach ($users as $user)
{
if ($user['sname'] == $group['sname']) unset($groups[$name]);
}
}
uksort($users,'strnatcasecmp');
uksort($groups,'strnatcasecmp');
return $users + $groups; // users first and then groups, both alphabeticaly return array_merge($users, $groups); // users first and then groups, both alphabeticaly
}
/**
* Compare function for sort by value of key 'name'
*
* @param array $a
* @param array $b
* @return int
*/
function name_cmp(array $a, array $b)
{
return strnatcasecmp($a['name'], $b['name']);
} }
/** /**