From 7c0dcca9d594d4224dc00bd125c2d76615fb170e Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 28 Feb 2008 20:01:57 +0000
Subject: Applied patch by Emanuele Rocca to make LDAP filters work with or
 without brackets

git-svn-id: https://svn.roundcube.net/trunk@1152 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_ldap.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/rcube_ldap.inc b/roundcubemail/program/include/rcube_ldap.inc
index 608365269..29e7faa6b 100644
--- a/roundcubemail/program/include/rcube_ldap.inc
+++ b/roundcubemail/program/include/rcube_ldap.inc
@@ -285,9 +285,12 @@ class rcube_ldap
     }
     $filter .= ')';
     
+    // avoid double-wildcard if $value is empty
+    $filter = preg_replace('/\*+/', '*', $filter);
+    
     // add general filter to query
     if (!empty($this->prop['filter']))
-      $filter = '(&('.$this->prop['filter'] .')' . $filter . ')';
+      $filter = '(&(' . preg_replace('/^\(|\)$/', '', $this->prop['filter']) . ')' . $filter . ')';
 
     // set filter string and execute search
     $this->set_search_set($filter);
-- 
cgit v1.2.3