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

Fix an error in calendar-query handling of time-range queries.

Browse Source
This commit is contained in:
Andrew McMillan 2011-09-17 15:38:57 +12:00
parent af3478cd25
commit 67ccb2ae03
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/caldav-REPORT-calquery.php
View File

@ -147,14 +147,15 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
// $params[':time_range_end'] = $finish;
// }
if ( isset($start) && isset($finish) ) {
$sql .= ' AND (rrule IS NOT NULL OR dtstart IS NULL OR (dtstart < :time_range_end AND (dtend > :time_range_start ';
$sql .= ' OR (dtend IS NULL AND dtstart > :time_range_start)))) ';
$sql .= ' AND (rrule IS NOT NULL OR dtstart IS NULL';
$sql .= ' OR (dtstart < :time_range_end AND (dtend > :time_range_start ';
$sql .= ' OR (dtend IS NULL AND dtstart < :time_range_end)))) ';
$params[':time_range_start'] = $start;
$params[':time_range_end'] = $finish;
}
elseif ( isset($start) ) {
$sql .= ' AND (rrule IS NOT NULL OR dtstart IS NULL OR (dtend > :time_range_start ';
$sql .= ' OR (dtend IS NULL AND dtstart > :time_range_start))) ';
$sql .= ' AND (rrule IS NOT NULL OR dtstart IS NULL';
$sql .= ' OR (dtstart > :time_range_start)) ';
$params[':time_range_start'] = $start;
}
elseif ( isset($finish) ) {