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

do not report VTODO in freebusy (fixes: #267)

Browse Source 
RFC 4791 clearly states in 7.10:
    Only VEVENT components without a TRANSP property or with the TRANSP
    property set to OPAQUE, and VFREEBUSY components SHOULD be considered
    in generating the free busy time information.

Looking at fa67ef987e, this used to be VFREEBUSY until the refactoring, and
0886-REPORT-freebusy.test still had that.

Apparently we're not (yet) considering VAVAILABILITY (RFC 7953) here.
This commit is contained in:
Florian Schlichting 2022-10-04 08:47:53 +02:00
parent b3b2ccc6c0
commit f44a996432
10 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/freebusy-functions.php
View File

@ -24,7 +24,7 @@ function get_freebusy( $path_match, $range_start, $range_end, $bin_privs = null
$where .= " (calendar_item.first_instance_start <= :end AND (:start <= calendar_item.last_instance_end OR calendar_item.last_instance_end IS NULL)) ";
$where .= " OR (calendar_item.first_instance_start IS NULL AND rrule_event_overlaps( dtstart, dtend, rrule, :start, :end)) ";
$where .= ") ";
$where .= "AND caldav_data.caldav_type IN ( 'VEVENT', 'VTODO' ) ";
$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 collection.is_calendar AND collection.schedule_transp = 'opaque' ";

3
testing/tests/regression-suite/0832-freebusy.result
View File

@ -1,6 +1,6 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
Content-Length: 14764
Content-Length: 14720
Content-Type: text/calendar;charset=UTF-8
BEGIN:VCALENDAR
@ -11,7 +11,6 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:correct
DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z
FREEBUSY:20061003T210000Z/20061003T220000Z

3
testing/tests/regression-suite/0836-freebusy.result
View File

@ -1,6 +1,6 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
Content-Length: 14764
Content-Length: 14720
Content-Type: text/calendar;charset=UTF-8
BEGIN:VCALENDAR
@ -11,7 +11,6 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:correct
DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z
FREEBUSY:20061003T210000Z/20061003T220000Z

3
testing/tests/regression-suite/0837-freebusy.result
View File

@ -1,6 +1,6 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
Content-Length: 14764
Content-Length: 14720
Content-Type: text/calendar;charset=UTF-8
BEGIN:VCALENDAR
@ -11,7 +11,6 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:correct
DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z
FREEBUSY:20061003T210000Z/20061003T220000Z

1
testing/tests/regression-suite/0880-Freebusy-POST.result
View File

@ -14,7 +14,6 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:20081021T110000Z
DTEND:20081106T110000Z
FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20081021T180000Z/20081022T040000Z
FREEBUSY:20081022T180000Z/20081023T040000Z
FREEBUSY:20081022T184500Z/20081022T193000Z

3
testing/tests/regression-suite/0885-GET-freebusy.result
View File

@ -1,6 +1,6 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
Content-Length: 14764
Content-Length: 14720
Content-Type: text/calendar;charset=UTF-8
BEGIN:VCALENDAR
@ -11,7 +11,6 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:correct
DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z
FREEBUSY:20061003T210000Z/20061003T220000Z

1
testing/tests/regression-suite/0887-POST-freebusy.result
View File

@ -14,7 +14,6 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:correct
DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20060930T210000Z/20060930T220000Z
FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z

3
testing/tests/regression-suite/0888-GET-freebusy.result
View File

@ -1,6 +1,6 @@
HTTP/1.1 200 OK
Date: Dow, 01 Jan 2000 00:00:00 GMT
Content-Length: 14764
Content-Length: 14720
Content-Type: text/calendar;charset=UTF-8
BEGIN:VCALENDAR
@ -11,7 +11,6 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:correct
DTEND:correct
FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20061001T210000Z/20061001T220000Z
FREEBUSY:20061002T210000Z/20061002T220000Z
FREEBUSY:20061003T210000Z/20061003T220000Z

2
testing/tests/regression-suite/0889-POST-freebusy.result
View File

@ -14,7 +14,6 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:20001021T110000Z
DTEND:20101106T110000Z
FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20051231T110000Z/20060101T110000Z
FREEBUSY:20060101T220000Z/20060101T230000Z
FREEBUSY:20060102T220000Z/20060102T230000Z
@ -3759,7 +3758,6 @@ FREEBUSY:20051207T070000Z/20051207T130000Z
FREEBUSY:20051208T070000Z/20051208T130000Z
FREEBUSY:20051209T070000Z/20051209T130000Z
FREEBUSY:20051212T070000Z/20051212T130000Z
FREEBUSY:20060322T104500Z/20060321T230000Z
FREEBUSY:20060324T110000Z/20060324T140000Z
FREEBUSY:20060405T070000Z/20060405T220000Z
FREEBUSY:20060406T070000Z/20060406T220000Z

1
testing/tests/regression-suite/0963-POST-freebusy-private.result
View File

@ -14,7 +14,6 @@ BEGIN:VFREEBUSY
DTSTAMP:yyyymmddThhmmssZ
DTSTART:20080730T110000Z
DTEND:20080803T110000Z
FREEBUSY:20031231T230000Z/20100217T000000Z
FREEBUSY:20080730T190000Z/20080731T050000Z
FREEBUSY:20080730T194500Z/20080730T203000Z
FREEBUSY:20080730T210000Z/20080730T220000Z