From: Jan Schneider <jan@horde.org>
Date: Mon, 13 Sep 2010 13:34:53 +0000 (+0200)
Subject: Fix removing users.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e88d86628e59710a0c3396b5712b4f98638269f1;p=horde.git

Fix removing users.
---

diff --git a/framework/Group/lib/Horde/Group/Ldap.php b/framework/Group/lib/Horde/Group/Ldap.php
index 354ce9510..357bd9240 100644
--- a/framework/Group/lib/Horde/Group/Ldap.php
+++ b/framework/Group/lib/Horde/Group/Ldap.php
@@ -303,7 +303,7 @@ class Horde_Group_Ldap extends Horde_Group
      * @throws Horde_History_Exception
      * @throws InvalidArgumentException
      */
-    public function updateGroup(Horde_Group_DataTreeObject $group)
+    public function updateGroup(Horde_Group_LdapObject $group)
     {
         $entry = $group->toAttributes();
 
diff --git a/framework/Group/lib/Horde/Group/LdapObject.php b/framework/Group/lib/Horde/Group/LdapObject.php
index 88554c055..0feddd08c 100644
--- a/framework/Group/lib/Horde/Group/LdapObject.php
+++ b/framework/Group/lib/Horde/Group/LdapObject.php
@@ -106,7 +106,8 @@ class Horde_Group_LdapObject extends Horde_Group_DataTreeObject
      */
     public function toAttributes()
     {
-        $attributes = array();
+        $member = Horde_String::lower($GLOBALS['conf']['group']['params']['memberuid']);
+        $attributes = array($member => array());
         foreach ($this->data as $key => $value) {
             if ($key == 'users') {
                 foreach ($value as $user => $membership) {
@@ -114,7 +115,7 @@ class Horde_Group_LdapObject extends Horde_Group_DataTreeObject
                         $user = $GLOBALS['conf']['auth']['params']['uid'] .
                             '=' . $user . ',' . $GLOBALS['conf']['auth']['params']['basedn'];
                     }
-                    $attributes[Horde_String::lower($GLOBALS['conf']['group']['params']['memberuid'])][] = $user;
+                    $attributes[$member][] = $user;
                 }
             } elseif ($key == 'email') {
                 if (!empty($value)) {