From d3501be851fe00e02d56aedb69e0281a1d49a681 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 29 Jul 2020 17:39:40 +0200 Subject: [PATCH] reset the cookie internally in new API when abandoning paged results op Signed-off-by: Arthur Schiwon --- apps/user_ldap/lib/PagedResults/Php73.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/lib/PagedResults/Php73.php b/apps/user_ldap/lib/PagedResults/Php73.php index fffac35c27c..7e182e2eabc 100644 --- a/apps/user_ldap/lib/PagedResults/Php73.php +++ b/apps/user_ldap/lib/PagedResults/Php73.php @@ -82,6 +82,12 @@ class Php73 implements IAdapter { return $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? ''; } + private function resetCookie(int $linkId): void { + if (isset($this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'])) { + $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] = ''; + } + } + public function getRequestCallFunc(): ?string { return null; } @@ -94,6 +100,10 @@ class Php73 implements IAdapter { $this->linkData[$linkId]['requestArgs'] = []; $this->linkData[$linkId]['requestArgs']['pageSize'] = $pageSize; $this->linkData[$linkId]['requestArgs']['isCritical'] = $isCritical; + + if ($pageSize === 0) { + $this->resetCookie($linkId); + } } public function getRequestCallArgs($link): array { @@ -153,7 +163,7 @@ class Php73 implements IAdapter { 'oid' => LDAP_CONTROL_PAGEDRESULTS, 'value' => [ 'size' => $this->linkData[$linkId]['requestArgs']['pageSize'], - 'cookie' => $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '' + 'cookie' => $this->linkData[$linkId]['serverControls'][LDAP_CONTROL_PAGEDRESULTS]['value']['cookie'] ?? '', ] ]]; -- 2.39.5