diff options
author | root <leo@strike.wu.ac.at> | 2013-12-10 17:50:45 +0100 |
---|---|---|
committer | Alexander Bergolth <leo@strike.wu.ac.at> | 2014-03-06 12:07:03 +0100 |
commit | 8fcc29ee8b7b5ed600c8ec7116f52486718467f6 (patch) | |
tree | 6a42655dab7314564401c381be897b21cd27a4a2 /apps/user_ldap/lib/ldap.php | |
parent | 7c3f3cc93348a23ee20bb75250a7313412fa2085 (diff) | |
download | nextcloud-server-8fcc29ee8b7b5ed600c8ec7116f52486718467f6.tar.gz nextcloud-server-8fcc29ee8b7b5ed600c8ec7116f52486718467f6.zip |
only check ldap_errno if an ldap_* function actually fails
fix wizard errors
reset search paging right after the search, not before some of the possible next search operations
cookie contains binary characters, don't log it
(avoids json_encode(): Invalid UTF-8 sequence in argument errors)
Diffstat (limited to 'apps/user_ldap/lib/ldap.php')
-rw-r--r-- | apps/user_ldap/lib/ldap.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php index de9b7481c19..0e5f78cd28c 100644 --- a/apps/user_ldap/lib/ldap.php +++ b/apps/user_ldap/lib/ldap.php @@ -78,7 +78,7 @@ class LDAP implements ILDAPWrapper { } public function nextEntry($link, $result) { - return $this->invokeLDAPMethod('next_entry', $link, $result); + return ldap_next_entry($link, $result); } public function read($link, $baseDN, $filter, $attr) { @@ -139,7 +139,9 @@ class LDAP implements ILDAPWrapper { if(function_exists($func)) { $this->preFunctionCall($func, $arguments); $result = call_user_func_array($func, $arguments); - $this->postFunctionCall(); + if ($result === FALSE) { + $this->postFunctionCall(); + } return $result; } } |