From abd19f0f2786e2a4af05eac109871ce75f8882d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= Date: Thu, 11 Mar 2010 07:45:57 +0000 Subject: [PATCH] Differentiate GroupDAV collections --- calendar/inc/class.calendar_groupdav.inc.php | 3 +++ infolog/inc/class.infolog_groupdav.inc.php | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index 6965d8d7fd..13032477f2 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -114,6 +114,9 @@ class calendar_groupdav extends groupdav_handler 'daywise' => false, 'date_format' => 'server', ); + + if ($path != '/calendar/') $cal_filters['filter'] = 'owner'; + /* if ($this->client_shared_uid_exceptions) { diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php index fd6f958ea3..04dd27909f 100644 --- a/infolog/inc/class.infolog_groupdav.inc.php +++ b/infolog/inc/class.infolog_groupdav.inc.php @@ -75,6 +75,15 @@ class infolog_groupdav extends groupdav_handler $myself = ($user == $GLOBALS['egw_info']['user']['account_id']); + if ($path == '/infolog/') + { + $task_filter= 'open'; + } + else + { + $task_filter= 'own' . ($myself?'':'-open'); + } + if ($options['filters']) { @@ -124,8 +133,8 @@ class infolog_groupdav extends groupdav_handler if (($tasks =& $this->bo->search($params=array( 'order' => 'info_datemodified', 'sort' => 'DESC', - 'filter' => ($myself ? 'own' : 'own'), // filter my: entries user is responsible for, - // filter own: entries the user own or is responsible for + 'filter' => $task_filter, // filter my: entries user is responsible for, + // filter own: entries the user own or is responsible for 'date_format' => 'server', 'col_filter' => $filter, ))))