don't show recurring msg when pages result was turned off

and only as debug level otherwise.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index b6674cf0332ecf99bab5e8c2f032f979fdeb7ad7..06ccbd23ac63d8d7c640da5f70f3cce761ac11b7 100644 (file)
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -1059,8 +1059,11 @@ class Access extends LDAPUtility implements IUserTools {
                                $this->pagedSearchedSuccessful = true;
                        }
                } else {
-                       if(!is_null($limit)) {
-                               \OCP\Util::writeLog('user_ldap', 'Paged search was not available', \OCP\Util::INFO);
+                       if(!is_null($limit) && intval($this->connection->ldapPagingSize) !== 0) {
+                               \OC::$server->getLogger()->debug(
+                                       'Paged search was not available',
+                                       [ 'app' => 'user_ldap' ]
+                               );
                        }
                }
                /* ++ Fixing RHDS searches with pages with zero results ++

diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
index 5b5991e499578a9b5b059c088682268a0ea42be3..1fbb8e3df1fecf4168a5d9dbed37de3c3d0d1cbe 100644 (file)
--- a/apps/user_ldap/lib/Connection.php
+++ b/apps/user_ldap/lib/Connection.php
@@ -46,7 +46,7 @@ use OC\ServerNotAvailableException;
  * @property boolean turnOnPasswordChange
  * @property boolean hasPagedResultSupport
  * @property string[] ldapBaseUsers
- * @property int|string ldapPagingSize holds an integer
+ * @property int|null ldapPagingSize holds an integer
  * @property bool|mixed|void ldapGroupMemberAssocAttr
  * @property string ldapUuidUserAttribute
  * @property string ldapUuidGroupAttribute