aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/user_ldap/lib/LDAP.php3
-rw-r--r--apps/user_ldap/lib/PagedResults/IAdapter.php13
-rw-r--r--apps/user_ldap/lib/PagedResults/Php73.php16
3 files changed, 1 insertions, 31 deletions
diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php
index 28664b2dda6..028674e40cc 100644
--- a/apps/user_ldap/lib/LDAP.php
+++ b/apps/user_ldap/lib/LDAP.php
@@ -180,8 +180,7 @@ class LDAP implements ILDAPWrapper {
* {@inheritDoc}
*/
public function read($link, $baseDN, $filter, $attr) {
- $this->pagedResultsAdapter->setReadArgs($link, $baseDN, $filter, $attr);
- return $this->invokeLDAPMethod('read', ...$this->pagedResultsAdapter->getReadArgs($link));
+ return $this->invokeLDAPMethod('read', $link, $baseDN, $filter, $attr, 0, -1);
}
/**
diff --git a/apps/user_ldap/lib/PagedResults/IAdapter.php b/apps/user_ldap/lib/PagedResults/IAdapter.php
index 504dd7eaa9d..1627dcc1b29 100644
--- a/apps/user_ldap/lib/PagedResults/IAdapter.php
+++ b/apps/user_ldap/lib/PagedResults/IAdapter.php
@@ -82,19 +82,6 @@ interface IAdapter {
public function getSearchArgs($link): array;
/**
- * The adapter receives the parameters that were passed to a read
- * operation. Typically it wants to save the them for the call proper later
- * on.
- */
- public function setReadArgs($link, string $baseDN, string $filter, array $attr): void;
-
- /**
- * The adapter shall report which arguments shall be passed to the
- * ldap_read function.
- */
- public function getReadArgs($link): array;
-
- /**
* Returns the current paged results cookie
*
* @param resource|\LDAP\Connection $link LDAP resource
diff --git a/apps/user_ldap/lib/PagedResults/Php73.php b/apps/user_ldap/lib/PagedResults/Php73.php
index c9d12279937..bde2d9bcd83 100644
--- a/apps/user_ldap/lib/PagedResults/Php73.php
+++ b/apps/user_ldap/lib/PagedResults/Php73.php
@@ -123,22 +123,6 @@ class Php73 implements IAdapter {
return $this->linkData[$linkId]['searchArgs'];
}
- public function setReadArgs($link, string $baseDN, string $filter, array $attr): void {
- $linkId = $this->getLinkId($link);
- if (!isset($this->linkData[$linkId])) {
- $this->linkData[$linkId] = [];
- }
-
- $this->linkData[$linkId]['readArgs'] = func_get_args();
- $this->linkData[$linkId]['readArgs'][] = 0; // $attrsonly default
- $this->linkData[$linkId]['readArgs'][] = -1; // $sizelimit default
- }
-
- public function getReadArgs($link): array {
- $linkId = $this->getLinkId($link);
- return $this->linkData[$linkId]['readArgs'];
- }
-
protected function preparePagesResultsArgs(int $linkId, string $methodKey): void {
if (!isset($this->linkData[$linkId]['requestArgs'])) {
return;