lib/ext

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sat Sep 22 13:14:16 CEST 2012


 lib/ext/Net/LDAP3.php |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 568c81983ca317ed39991ff2d28830622302279b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sat Sep 22 12:13:26 2012 +0100

    Correct use of VLV filters with/without additional filters

diff --git a/lib/ext/Net/LDAP3.php b/lib/ext/Net/LDAP3.php
index a69e283..31247a6 100644
--- a/lib/ext/Net/LDAP3.php
+++ b/lib/ext/Net/LDAP3.php
@@ -1163,9 +1163,13 @@ class Net_LDAP3
 
         $this->_debug("Using function $function on scope $scope (\$ns_function is $ns_function)");
 
-        if ($this->vlv_active && isset($this->additional_filter)) {
-            $filter = "(&" . $filter . $this->additional_filter . ")";
-            $this->_debug("C: Setting a filter of " . $filter);
+        if ($this->vlv_active) {
+            if (isset($this->additional_filter) && !empty($this->additional_filter)) {
+                $filter = "(&" . $filter . $this->additional_filter . ")";
+                $this->_debug("C: (With VLV) Setting a filter (with additional filter) of " . $filter);
+            } else {
+                $this->_debug("C: (With VLV) Setting a filter (without additional filter) of " . $filter);
+            }
         } else {
             $filter = "(&" . $filter . $this->additional_filter . ")";
             $this->_debug("C: (Without VLV) Setting a filter of " . $filter);





More information about the commits mailing list