[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kolab-commits
Subject:    lib/Auth
From:       Aleksander Machniak <machniak () kolabsys ! com>
Date:       2013-01-23 14:31:11
Message-ID: 20130123143111.C068E1FBA9A () app01 ! kolabsys ! com
[Download RAW message or body]

 lib/Auth/LDAP.php |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 5da5104af689122cf4008ab36072140a0294295b
Author: Aleksander Machniak <alec@alec.pl>
Date:   Wed Jan 23 15:30:33 2013 +0100

    Fix bug where type=*e* was added to some LDAP searches

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index bcf2176..d3116c8 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -249,18 +249,13 @@ class LDAP extends Net_LDAP3 {
 
         $mail_attrs = $this->conf->get_list('mail_attributes', array('mail', \
'alias'));  
-        $search = array(
-                'params' => array(
-                        'type' => 'exact'
-                    ),
-                'operator' => "OR"
-            );
+        $search = array('operator' => 'OR');
 
         foreach ($mail_attrs as $num => $attr) {
             $search['params'][$attr] = array(
-                        'type' => 'exact',
-                        'value' => $address,
-                );
+                'type'  => 'exact',
+                'value' => $address,
+            );
         }
 
         $result = $this->search_entries($this->config_get('root_dn'), \
'(objectclass=*)', 'sub', null, $search);


_______________________________________________
kolab-commits mailing list
kolab-commits@kolab.org
https://www.intevation.de/mailman/listinfo/kolab-commits


[prev in list] [next in list] [prev in thread] [next in thread]