2 commits - lib/Auth

[Jeroen van Meeuwen]

 lib/Auth/LDAP.php |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a3359a1148f02a59f8371f71c5a4df09ea4a223f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Apr 3 14:32:55 2012 +0200

    Do not pass an array with a useless key to a function that is expecting a string

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index c0c3274..102dd03 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -492,7 +492,7 @@ class LDAP
         }
 
         $_user_dn = key($_user);
-        $_user = $this->user_info(array('user' => $_user_dn), array());
+        $_user = $this->user_info($_user_dn, array());
 
         // We should start throwing stuff over the fence here.
         return $this->modify_entry($_user_dn, $_user, $attributes);
@@ -603,7 +603,7 @@ class LDAP
         }
 
         $_group_dn = key($_group);
-        $_group = $this->group_info(array('group' => $_group_dn), array());
+        $_group = $this->group_info($_group_dn, array());
 
         // We should start throwing stuff over the fence here.
         return $this->modify_entry($_group_dn, $_group, $attributes);


commit 9a2e6919a0b32392f494e7d4f23b7d1f792229e5
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Apr 3 14:19:07 2012 +0200

    I love spelling things out in full: unique_attr -> unique_attribute

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index dd4da66..c0c3274 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -1714,7 +1714,7 @@ class LDAP
     private function unique_attribute()
     {
         $conf        = Conf::get_instance();
-        $unique_attr = $conf->get('unique_attr');
+        $unique_attr = $conf->get('unique_attribute');
 
         if (!$unique_attr) {
             $unique_attr = 'nsuniqueid';