nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-20 01:44:15 +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

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

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