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

cardquery: query limit can be used independently of any query filter

Browse Source
This commit is contained in:
Florian Schlichting 2017-04-09 00:23:35 +02:00
parent 76e540fb0a
commit a16dfc7c41
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/caldav-REPORT-cardquery.php
View File

@ -51,7 +51,6 @@ if ( count($qry_filters) == 0 ) {
$qry_filters = false;
}
$qry_limit = -1; // everything
$qry_filters_combination='OR';
if ( is_array($qry_filters) ) {
$filters_parent = $xmltree->GetPath('/urn:ietf:params:xml:ns:carddav:addressbook-query/urn:ietf:params:xml:ns:carddav:filter');
@ -60,11 +59,12 @@ if ( is_array($qry_filters) ) {
if ( $filters_parent->GetAttribute("test") == 'allof' ) {
$qry_filters_combination='AND';
}
}
$limits = $xmltree->GetPath('/urn:ietf:params:xml:ns:carddav:addressbook-query/urn:ietf:params:xml:ns:carddav:limit/urn:ietf:params:xml:ns:carddav:nresults');
if ( count($limits) == 1) {
$qry_limit = intval($limits[0]->GetContent());
}
$qry_limit = -1; // everything
$limits = $xmltree->GetPath('/urn:ietf:params:xml:ns:carddav:addressbook-query/urn:ietf:params:xml:ns:carddav:limit/urn:ietf:params:xml:ns:carddav:nresults');
if ( count($limits) == 1) {
$qry_limit = intval($limits[0]->GetContent());
}
/**