nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-26 02:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow null dtstart to match any range, as per Scheduling Draft.

Browse Source
This commit is contained in:
Andrew McMillan 2011-09-14 11:27:15 +12:00
parent 963de077d8
commit bc1e264c6b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,18 +157,18 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
// $params[':time_range_end'] = $finish; // $params[':time_range_end'] = $finish;
// } // }
if ( isset($start) && isset($finish) ) { if ( isset($start) && isset($finish) ) {
$sql .= ' AND (rrule IS NOT NULL OR (dtstart < :time_range_end AND (dtend > :time_range_start '; $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 .= ' OR (dtend IS NULL AND dtstart > :time_range_start)))) ';
$params[':time_range_start'] = $start; $params[':time_range_start'] = $start;
$params[':time_range_end'] = $finish; $params[':time_range_end'] = $finish;
} }
elseif ( isset($start) ) { elseif ( isset($start) ) {
$sql .= ' AND (rrule IS NOT NULL OR (dtend > :time_range_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 .= ' OR (dtend IS NULL AND dtstart > :time_range_start))) ';
$params[':time_range_start'] = $start; $params[':time_range_start'] = $start;
} }
elseif ( isset($finish) ) { elseif ( isset($finish) ) {
$sql .= ' AND (rrule IS NOT NULL OR dtstart < :time_range_end) '; $sql .= ' AND (rrule IS NOT NULL OR dtstart IS NULL OR dtstart < :time_range_end) ';
$params[':time_range_end'] = $finish; $params[':time_range_end'] = $finish;
} }
$need_range_filter = array(new RepeatRuleDateTime($start),new RepeatRuleDateTime($finish)); $need_range_filter = array(new RepeatRuleDateTime($start),new RepeatRuleDateTime($finish));