From 900e129a2b360a7126e07cb2e809df4307b17dd6 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 1 Mar 2011 22:11:34 +0000
Subject: Fix LDAP group identifiers

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

(limited to 'roundcubemail/program/include/rcube_ldap.php')

diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php
index c8253713b..a20d12318 100644
--- a/roundcubemail/program/include/rcube_ldap.php
+++ b/roundcubemail/program/include/rcube_ldap.php
@@ -1068,7 +1068,7 @@ class rcube_ldap extends rcube_addressbook
      * @param string New group identifier (if changed, otherwise don't set)
      * @return boolean New name on success, false if no data was changed
      */
-    function rename_group($group_id, $new_name, &$new_id)
+    function rename_group($group_id, $new_name, &$new_gid)
     {
         if (!$this->group_cache)
             $this->list_groups();
@@ -1077,7 +1077,7 @@ class rcube_ldap extends rcube_addressbook
         $group_name = $this->group_cache[$group_id]['name'];
         $old_dn = "cn=$group_name,$base_dn";
         $new_rdn = "cn=$new_name";
-        $new_id = base64_encode($new_rdn . ",$base_dn");
+        $new_gid = base64_encode($new_name);
 
         $res = ldap_rename($this->conn, $old_dn, $new_rdn, NULL, TRUE);
         if ($res === false)
-- 
cgit v1.2.3