nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-25 17:46:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes to privacy model for freebusy.

Browse Source
This commit is contained in:
Andrew McMillan 2006-12-25 22:14:50 +13:00
parent b3551c9091
commit 1d7fbb4bee
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inc/caldav-REPORT.php
View File

@ -234,7 +234,10 @@ if ( $free_busy_query ) {
if ( isset( $report[0]['end'] ) ) {
$where .= "AND dtstart <= ".qpg($report[0]['end'])."::timestamp with time zone ";
}
$where .= " AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) ";
$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
$busy = array();
$busy_tentative = array();

3
inc/freebusy-GET.php
View File

@ -13,6 +13,9 @@ else {
$where .= "AND (dtend >= '$start'::timestamp with time zone OR calculate_later_timestamp('$start'::timestamp with time zone,dtend,rrule) >= '$start'::timestamp with time zone) ";
$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
$busy = array();
$busy_tentative = array();