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

Fix SQL syntax error if is-not-defined is used as a prop-filter.

Browse Source
This commit is contained in:
Tobias Brox 2023-01-28 08:56:38 +01:00 committed by Andrew Ruthven
parent 533d407196
commit 6e6ff6b115
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
$not_defined = ""; $not_defined = "";
switch( $tag ) { switch( $tag ) {
case 'urn:ietf:params:xml:ns:caldav:is-not-defined': case 'urn:ietf:params:xml:ns:caldav:is-not-defined':
$not_defined = "not-"; // then fall through to IS-DEFINED case $not_defined = "not"; // then fall through to IS-DEFINED case
case 'urn:ietf:params:xml:ns:caldav:is-defined': case 'urn:ietf:params:xml:ns:caldav:is-defined':
if ( isset( $parameter ) ) { if ( isset( $parameter ) ) {
$need_post_filter = true; $need_post_filter = true;
@ -114,7 +114,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
default: default:
$property_defined_match = "LIKE '_%'"; // i.e. contains a single character or more $property_defined_match = "LIKE '_%'"; // i.e. contains a single character or more
} }
$sql .= sprintf( "AND %s %s%s ", $property, $not_defined, $property_defined_match ); $sql .= sprintf( "AND %s %s %s ", $property, $not_defined, $property_defined_match );
} }
break; break;