From d644d31a2430d53c513bc38754c0a2964eed69e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fl=C3=A1vio=20Gomes=20da=20Silva=20Lisboa?=
 <flavio.lisboa@serpro.gov.br>
Date: Thu, 14 Dec 2017 08:24:21 -0200
Subject: [PATCH] User is not found when is searched by name and one of
 surnames #7510

---
 apps/user_ldap/lib/Access.php        | 7 ++++++-
 apps/user_ldap/lib/Configuration.php | 1 +
 apps/user_ldap/lib/Connection.php    | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index 0c87bd9c0699a..28624c730f2c1 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -1488,12 +1488,17 @@ private function prepareSearchTerm($term) {
 		$config = \OC::$server->getConfig();
 
 		$allowEnum = $config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes');
+		$allowMedialSearch = $this->connection->ldapMedialSearch;
 
 		$result = $term;
 		if ($term === '') {
 			$result = '*';
 		} else if ($allowEnum !== 'no') {
-			$result = $term . '*';
+			if ($allowMedialSearch) {
+				$result = '*' . $term . '*';
+			} else {
+				$result = $term . '*';
+			}
 		}
 		return $result;
 	}
diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php
index 6240e8d8f5740..d3498c5ef76b1 100644
--- a/apps/user_ldap/lib/Configuration.php
+++ b/apps/user_ldap/lib/Configuration.php
@@ -101,6 +101,7 @@ class Configuration {
 		'turnOnPasswordChange' => false,
 		'ldapDynamicGroupMemberURL' => null,
 		'ldapDefaultPPolicyDN' => null,
+		'ldapMedialSearch' => false
 	);
 
 	/**
diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php
index 53e1882bd6559..1716a2039a524 100644
--- a/apps/user_ldap/lib/Connection.php
+++ b/apps/user_ldap/lib/Connection.php
@@ -56,6 +56,7 @@
  * @property string ldapUuidGroupAttribute
  * @property string ldapExpertUUIDUserAttr
  * @property string ldapExpertUUIDGroupAttr
+ * @property boolean ldapMedialSearch
  */
 class Connection extends LDAPUtility {
 	private $ldapConnectionRes = null;