mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-07 14:39:56 +01:00
account for importing meetings that end up having no participants.
This commit is contained in:
parent
ec20618965
commit
338c962e71
@ -1512,6 +1512,8 @@
|
||||
{
|
||||
// Check if the $user is one of the participants or has a read-grant from one of them
|
||||
//
|
||||
if (isset($event['participants']) && is_array($event['participants']))
|
||||
{
|
||||
foreach($event['participants'] as $uid => $accept)
|
||||
{
|
||||
if ($this->grants[$uid] & PHPGW_ACL_READ || $uid == $user)
|
||||
@ -1521,6 +1523,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($GLOBALS['phpgw']->accounts->get_type($owner) == 'g' && $needed == PHPGW_ACL_ADD)
|
||||
{
|
||||
@ -3118,6 +3121,8 @@
|
||||
);
|
||||
}
|
||||
|
||||
if (isset($event['participants']) && is_array($event['participants']))
|
||||
{
|
||||
$participants = array();
|
||||
foreach($event['participants'] as $user => $short_status)
|
||||
{
|
||||
@ -3126,6 +3131,7 @@
|
||||
$participants[$user] = $GLOBALS['phpgw']->common->grab_owner_name($user).' ('.$this->get_long_status($short_status).')';
|
||||
}
|
||||
}
|
||||
}
|
||||
$var['participants'] = Array(
|
||||
'field' => lang('Participants'),
|
||||
'data' => $participants
|
||||
|
@ -3452,6 +3452,8 @@
|
||||
|
||||
$vars['title']['tr_color'] = $this->theme['th_bg'];
|
||||
|
||||
if (isset($vars['participants']['data']) && is_array($vars['participants']['data']))
|
||||
{
|
||||
foreach($vars['participants']['data'] as $user => $str)
|
||||
{
|
||||
if ($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && ereg('^(.*) \((.*)\)$',$str,$parts))
|
||||
@ -3460,6 +3462,7 @@
|
||||
}
|
||||
}
|
||||
$vars['participants']['data'] = implode("<br>\n",$vars['participants']['data']);
|
||||
}
|
||||
|
||||
foreach($vars as $var)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user