diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2016-03-10 13:13:38 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2016-03-10 13:13:38 +0100 |
| commit | fe2a506e56e33625edb51e6b5e0df8911cf4e294 (patch) | |
| tree | 34c0b322ac26182a1e5c0d017dbdaac11a90b1eb | |
| parent | 51072f742ea2988d8e485dff60d81834e077fe3f (diff) | |
| download | nextcloud-server-fe2a506e56e33625edb51e6b5e0df8911cf4e294.tar.gz nextcloud-server-fe2a506e56e33625edb51e6b5e0df8911cf4e294.zip | |
remove deprecated ldap_sort
| -rw-r--r-- | apps/user_ldap/lib/access.php | 8 | ||||
| -rw-r--r-- | apps/user_ldap/lib/ildapwrapper.php | 8 | ||||
| -rw-r--r-- | apps/user_ldap/lib/ldap.php | 15 |
3 files changed, 1 insertions, 30 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 8409e6ce3d8..135eca1e625 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -1025,14 +1025,6 @@ class Access extends LDAPUtility implements user\IUserTools { return array(); } - // Do the server-side sorting - foreach(array_reverse($attr) as $sortAttr){ - foreach($sr as $searchResource) { - $this->ldap->sort($cr, $searchResource, $sortAttr); - } - } - - foreach($sr as $res) { $findings = array_merge($findings, $this->ldap->getEntries($cr , $res )); } diff --git a/apps/user_ldap/lib/ildapwrapper.php b/apps/user_ldap/lib/ildapwrapper.php index 44ec08f59fd..d607a3fdb66 100644 --- a/apps/user_ldap/lib/ildapwrapper.php +++ b/apps/user_ldap/lib/ildapwrapper.php @@ -179,14 +179,6 @@ interface ILDAPWrapper { public function startTls($link); /** - * Sort the result of a LDAP search - * @param resource $link LDAP link resource - * @param resource $result LDAP result resource - * @param string $sortFilter attribute to use a key in sort - */ - public function sort($link, $result, $sortFilter); - - /** * Unbind from LDAP directory * @param resource $link LDAP link resource * @return bool true on success, false otherwise diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php index ad8c338b587..383d71ca6eb 100644 --- a/apps/user_ldap/lib/ldap.php +++ b/apps/user_ldap/lib/ldap.php @@ -202,16 +202,6 @@ class LDAP implements ILDAPWrapper { /** * @param LDAP $link - * @param LDAP $result - * @param string $sortFilter - * @return mixed - */ - public function sort($link, $result, $sortFilter) { - return $this->invokeLDAPMethod('sort', $link, $result, $sortFilter); - } - - /** - * @param LDAP $link * @return mixed|true */ public function startTls($link) { @@ -283,10 +273,7 @@ class LDAP implements ILDAPWrapper { $errorCode = ldap_errno($this->curArgs[0]); $errorMsg = ldap_error($this->curArgs[0]); if($errorCode !== 0) { - if($this->curFunc === 'ldap_sort' && $errorCode === -4) { - //You can safely ignore that decoding error. - //… says https://bugs.php.net/bug.php?id=18023 - } else if($this->curFunc === 'ldap_get_entries' + if($this->curFunc === 'ldap_get_entries' && $errorCode === -4) { } else if ($errorCode === 32) { //for now |