From 068bf2cf5c329409de32b0cb47066f5250930d51 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 3 Nov 2003 19:51:04 +0000
Subject: [PATCH] applyed and modified ;-) patch #823867: more info about
 scheduling conflict: showing now all participants, from the conflicting
 events

---
 calendar/inc/class.bocalendar.inc.php |  6 +++---
 calendar/inc/class.uicalendar.inc.php | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php
index 638497aa58..65c2f95721 100755
--- a/calendar/inc/class.bocalendar.inc.php
+++ b/calendar/inc/class.bocalendar.inc.php
@@ -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;
 
diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php
index 0c3148a386..16aa5a75f6 100755
--- a/calendar/inc/class.uicalendar.inc.php
+++ b/calendar/inc/class.uicalendar.inc.php
@@ -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']);