holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

applyed and modified ;-) patch #823867: more info about scheduling conflict: showing now all participants, from the conflicting events

Browse Source
This commit is contained in:
Ralf Becker 2003-11-03 19:51:04 +00:00
parent 43a72ad4a4
commit 068bf2cf5c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,14 +520,14 @@
$this->return_to = $data['return_to'];
}
function read_entry($id)
function read_entry($id,$ignore_acl=False)
{
if (is_array($id) && count($id) == 1) // xmlrpc
{
list(,$id) = each($id);
$xmlrpc = True;
}
if($this->check_perms(PHPGW_ACL_READ,$id))
if($ignore_acl || $this->check_perms(PHPGW_ACL_READ,$id))
{
$event = $this->so->read_entry($id);
if(!isset($event['participants'][$this->owner]) && $this->user_is_a_member($event,$this->owner))
@ -695,7 +695,7 @@
$l_recur_enddate = (@isset($params['recur_enddate']) && $params['recur_enddate']?$params['recur_enddate']:$_POST['recur_enddate']);
$send_to_ui = True;
if (!is_array($l_start) || !is_array($l_end)) // xmlrpc call
if ((!is_array($l_start) || !is_array($l_end)) && !isset($_GET['readsess'])) // xmlrpc call
{
$send_to_ui = False;

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

@ -2800,8 +2800,17 @@
$overlap = '';
for($i=0;$i<count($overlapping_events);$i++)
{
$overlapped_event = $this->bo->read_entry($overlapping_events[$i]);
$overlap .= '<li> ['.$GLOBALS['phpgw']->common->grab_owner_name($overlapped_event['owner']).'] '.$this->link_to_entry($overlapped_event,$month,$mday,$year);
$overlapped_event = $this->bo->read_entry($overlapping_events[$i],True);
$overlap .= '<li>'.$this->link_to_entry($overlapped_event,$month,$mday,$year);
$overlap .= '<ul>';
foreach($overlapped_event['participants'] as $id => $status)
{
$conflict = isset($event['participants'][$id]);
$overlap .= '<li>'.($conflict?'<b>':'').
$GLOBALS['phpgw']->common->grab_owner_name($id).
($conflict?'</b> - '.lang('Scheduling conflict'):'')."</li>\n";
}
$overlap .= "</ul>\n";
}
unset($GLOBALS['phpgw_info']['flags']['noheader']);