From 24c224ddc224f68521f3143d66754742311d2a83 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Thu, 17 Mar 2016 22:24:11 -0400
Subject: Added support for multiple placeholders for LDAP_USER_FILTER

---
 app/Core/Ldap/User.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/Core/Ldap')

diff --git a/app/Core/Ldap/User.php b/app/Core/Ldap/User.php
index d36d6f34..52283434 100644
--- a/app/Core/Ldap/User.php
+++ b/app/Core/Ldap/User.php
@@ -211,14 +211,15 @@ class User
      *
      * @access public
      * @param  string  $username
+     * @param  string  $filter
      * @return string
      */
-    public function getLdapUserPattern($username)
+    public function getLdapUserPattern($username, $filter = LDAP_USER_FILTER)
     {
-        if (! LDAP_USER_FILTER) {
+        if (! $filter) {
             throw new LogicException('LDAP user filter empty, check the parameter LDAP_USER_FILTER');
         }
 
-        return sprintf(LDAP_USER_FILTER, $username);
+        return str_replace('%s', $username, $filter);
     }
 }
-- 
cgit v1.2.3