mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23086 from owncloud/ldap-sort-deprecated 

remove deprecated ldap_sort
This commit is contained in:
Thomas Müller 2016-03-11 00:23:13 +01:00
parent 7587fe8ad5 fe2a506e56
commit 866de3c174
3 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/user_ldap/lib/access.php
View File

@ -1025,14 +1025,6 @@ class Access extends LDAPUtility implements user\IUserTools {
return array(); 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) { foreach($sr as $res) {
$findings = array_merge($findings, $this->ldap->getEntries($cr , $res )); $findings = array_merge($findings, $this->ldap->getEntries($cr , $res ));
} }

8
apps/user_ldap/lib/ildapwrapper.php
View File

@ -178,14 +178,6 @@ interface ILDAPWrapper {
*/ */
public function startTls($link); 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 * Unbind from LDAP directory
* @param resource $link LDAP link resource * @param resource $link LDAP link resource

15
apps/user_ldap/lib/ldap.php
View File

@ -200,16 +200,6 @@ class LDAP implements ILDAPWrapper {
return $this->invokeLDAPMethod('set_option', $link, $option, $value); return $this->invokeLDAPMethod('set_option', $link, $option, $value);
} }
/**
* @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 * @param LDAP $link
* @return mixed|true * @return mixed|true
@ -283,10 +273,7 @@ class LDAP implements ILDAPWrapper {
$errorCode = ldap_errno($this->curArgs[0]); $errorCode = ldap_errno($this->curArgs[0]);
$errorMsg = ldap_error($this->curArgs[0]); $errorMsg = ldap_error($this->curArgs[0]);
if($errorCode !== 0) { if($errorCode !== 0) {
if($this->curFunc === 'ldap_sort' && $errorCode === -4) { if($this->curFunc === 'ldap_get_entries'
//You can safely ignore that decoding error.
//… says https://bugs.php.net/bug.php?id=18023
} else if($this->curFunc === 'ldap_get_entries'
&& $errorCode === -4) { && $errorCode === -4) {
} else if ($errorCode === 32) { } else if ($errorCode === 32) {
//for now //for now