summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/user_ldap.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2013-01-31 01:46:34 +0100
committerArthur Schiwon <blizzz@owncloud.com>2013-01-31 01:46:34 +0100
commitb3b0544e17b172da1ae3760fe5b4e4f90c20b47a (patch)
tree54a67d739b3d0e98d9f1f1bd40ddb2ae80016cfb /apps/user_ldap/user_ldap.php
parent8f388d9df4aad381ed8774971ea1e3ae1c9dcf33 (diff)
downloadnextcloud-server-b3b0544e17b172da1ae3760fe5b4e4f90c20b47a.tar.gz
nextcloud-server-b3b0544e17b172da1ae3760fe5b4e4f90c20b47a.zip
LDAP: make it possible to define attributes that should be considered on searches
Diffstat (limited to 'apps/user_ldap/user_ldap.php')
-rw-r--r--apps/user_ldap/user_ldap.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 6591d1d5fee..cb11ae39099 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -116,10 +116,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
if($limit <= 0) {
$limit = null;
}
- $search = empty($search) ? '*' : '*'.$search.'*';
$filter = $this->combineFilterWithAnd(array(
$this->connection->ldapUserFilter,
- $this->connection->ldapUserDisplayName.'='.$search
+ $this->getFilterPartForUserSearch($search)
));
\OCP\Util::writeLog('user_ldap', 'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter, \OCP\Util::DEBUG);