From 5e0fd45173aa10f6f373030801293e4cbeb8c8d2 Mon Sep 17 00:00:00 2001 From: ralf Date: Mon, 13 Feb 2023 23:16:26 +0100 Subject: [PATCH] fix found URL in multiget REPORT where reported as NOT found too, if number of URLs exceeds chunk-size of 500 --- addressbook/inc/class.addressbook_groupdav.inc.php | 2 +- api/src/CalDAV/Handler.php | 4 ++-- calendar/inc/class.calendar_groupdav.inc.php | 8 ++++---- infolog/inc/class.infolog_groupdav.inc.php | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php index 8b7caaaf46..eb8b43039e 100644 --- a/addressbook/inc/class.addressbook_groupdav.inc.php +++ b/addressbook/inc/class.addressbook_groupdav.inc.php @@ -205,7 +205,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler * @param array|boolean $start =false false=return all or array(start,num) * @return array with "files" array with values for keys path and props */ - function &propfind_callback($path, array $filter, $start=false) + function &propfind_callback($path, array &$filter, $start=false) { return $this->propfind_callback2($path, $filter, $start); } diff --git a/api/src/CalDAV/Handler.php b/api/src/CalDAV/Handler.php index b7cf467caa..90f0185bee 100644 --- a/api/src/CalDAV/Handler.php +++ b/api/src/CalDAV/Handler.php @@ -158,11 +158,11 @@ abstract class Handler * Propfind callback, if interator is used * * @param string $path - * @param array $filter + * @param array &$filter * @param array|boolean $start false=return all or array(start,num) * @return array with "files" array with values for keys path and props */ - function &propfind_callback($path, array $filter, $start) + function &propfind_callback($path, array &$filter, $start) { unset($path, $filter, $start); // not used, but required by function signature } diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index a6400fc988..215790d577 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -326,11 +326,11 @@ class calendar_groupdav extends Api\CalDAV\Handler * Callback for profind interator * * @param string $path - * @param array $filter + * @param array &$filter * @param array|boolean $start =false false=return all or array(start,num) * @return array with "files" array with values for keys path and props */ - function &propfind_callback($path,array $filter,$start=false) + function &propfind_callback($path, array &$filter, $start=false) { if ($this->debug) $starttime = microtime(true); @@ -344,7 +344,7 @@ class calendar_groupdav extends Api\CalDAV\Handler $filter['offset'] = $start[0]; $filter['num_rows'] = $start[1]; } - $requested_multiget_ids = (array)$filter['query'][self::$path_attr]; + $requested_multiget_ids =& $filter['query'][self::$path_attr]; $sync_collection = $filter['sync-collection']; $events =& $this->bo->search($filter); @@ -1787,4 +1787,4 @@ class calendar_groupdav extends Api\CalDAV\Handler } return $settings; } -} +} \ No newline at end of file diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php index 10e89b46b9..9f724994ca 100644 --- a/infolog/inc/class.infolog_groupdav.inc.php +++ b/infolog/inc/class.infolog_groupdav.inc.php @@ -227,11 +227,11 @@ class infolog_groupdav extends Api\CalDAV\Handler * Callback for profind interator * * @param string $path - * @param array $filter + * @param array &$filter * @param array|boolean $start =false false=return all or array(start,num) * @return array with "files" array with values for keys path and props */ - function &propfind_callback($path,array $filter,$start=false) + function &propfind_callback($path,array &$filter,$start=false) { if ($this->debug) $starttime = microtime(true); @@ -282,7 +282,7 @@ class infolog_groupdav extends Api\CalDAV\Handler $offset = 0; } - $requested_multiget_ids = (array)$filter[self::$path_attr]; + $requested_multiget_ids =& $filter[self::$path_attr]; $files = array(); // ToDo: add parameter to only return id & etag @@ -902,4 +902,4 @@ class infolog_groupdav extends Api\CalDAV\Handler ); return $settings; } -} +} \ No newline at end of file