From f8aecfc746a4ece38e2004aa7f2533287ad56e61 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 28 Dec 2006 13:05:56 +1300 Subject: [PATCH] PRIVATE is more private than CONFIDENTIAL after discussion... --- inc/caldav-REPORT.php | 2 +- inc/freebusy-GET.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/caldav-REPORT.php b/inc/caldav-REPORT.php index 2f73ca0b..acaf0711 100644 --- a/inc/caldav-REPORT.php +++ b/inc/caldav-REPORT.php @@ -237,7 +237,7 @@ if ( $free_busy_query ) { $where .= "AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) "; $where .= "AND (calendar_item.transp != 'TRANSPARENT' OR calendar_item.transp IS NULL) "; // $where .= "AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL) "; - $where .= "AND (calendar_item.class != 'CONFIDENTIAL' OR calendar_item.class IS NULL OR get_permissions($session->user_no,caldav_data.user_no) ~ 'A') "; // Must have 'all' permissions to see confidential items + $where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL OR get_permissions($session->user_no,caldav_data.user_no) ~ 'A') "; // Must have 'all' permissions to see confidential items $busy = array(); $busy_tentative = array(); diff --git a/inc/freebusy-GET.php b/inc/freebusy-GET.php index 3fbf2f1b..5b580c9f 100644 --- a/inc/freebusy-GET.php +++ b/inc/freebusy-GET.php @@ -15,7 +15,7 @@ $where .= "AND dtstart <= '$finish'::timestamp with time zone "; $where .= "AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) "; $where .= "AND (calendar_item.transp != 'TRANSPARENT' OR calendar_item.transp IS NULL) "; // $where .= "AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL) "; -$where .= "AND (calendar_item.class != 'CONFIDENTIAL' OR calendar_item.class IS NULL OR get_permissions($session->user_no,caldav_data.user_no) ~ 'A') "; // Must have 'all' permissions to see confidential items +$where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL OR get_permissions($session->user_no,caldav_data.user_no) ~ 'A') "; // Must have 'all' permissions to see confidential items $busy = array(); $busy_tentative = array();