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

Fix bug handling multiple prop-filter clauses.

Browse Source
This commit is contained in:
Andrew McMillan 2011-06-03 13:43:25 -07:00
parent 06dcb0b166
commit 5e3ed8dedc
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$propertyname = $v->GetAttribute("name");
switch( $propertyname ) {
case 'PERCENT-COMPLETE':
$property = 'percent_complete';
$subproperty = 'percent_complete';
break;
case 'UID':
@ -224,7 +224,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
case 'DTEND':
case 'DUE':
case 'PRIORITY':
$property = strtolower($propertyname);
$subproperty = strtolower($propertyname);
break;
case 'COMPLETED': /** @todo this should be moved into the properties supported in SQL. */
@ -233,11 +233,13 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
dbg_error_log("calquery", "Could not handle 'prop-filter' on %s in SQL", $propertyname );
continue;
}
$subfilter = $v->GetContent();
$success = SqlFilterFragment( $subfilter, $components, $property, $parameter );
if ( $success === false ) continue; else {
$sql .= $success['sql'];
$params = array_merge( $params, $success['params'] );
if ( isset($subproperty) ) {
$subfilter = $v->GetContent();
$success = SqlFilterFragment( $subfilter, $components, $subproperty, $parameter );
if ( $success === false ) continue; else {
$sql .= $success['sql'];
$params = array_merge( $params, $success['params'] );
}
}
break;