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

account for importing meetings that end up having no participants.

Browse Source
This commit is contained in:
mgalgoci 2004-08-19 15:32:49 +00:00
parent ec20618965
commit 338c962e71
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.bocalendar.inc.php
View File

@ -1512,6 +1512,8 @@
{ {
// Check if the $user is one of the participants or has a read-grant from one of them // 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) foreach($event['participants'] as $uid => $accept)
{ {
if ($this->grants[$uid] & PHPGW_ACL_READ || $uid == $user) 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) 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(); $participants = array();
foreach($event['participants'] as $user => $short_status) 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).')'; $participants[$user] = $GLOBALS['phpgw']->common->grab_owner_name($user).' ('.$this->get_long_status($short_status).')';
} }
} }
}
$var['participants'] = Array( $var['participants'] = Array(
'field' => lang('Participants'), 'field' => lang('Participants'),
'data' => $participants 'data' => $participants

3
calendar/inc/class.uicalendar.inc.php
View File

@ -3452,6 +3452,8 @@
$vars['title']['tr_color'] = $this->theme['th_bg']; $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) foreach($vars['participants']['data'] as $user => $str)
{ {
if ($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && ereg('^(.*) \((.*)\)$',$str,$parts)) 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']); $vars['participants']['data'] = implode("<br>\n",$vars['participants']['data']);
}
foreach($vars as $var) foreach($vars as $var)
{ {