[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    admin
Changes by:     Sigurd Nes <sigurdne>   06/06/12 09:13:17

Modified files:
        inc            : class.boaccounts.inc.php 

Log message:
        Fix for edit_group: check "lid" against "lid" - and let one save 
members correctly

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.boaccounts.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47

Patches:
Index: class.boaccounts.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- class.boaccounts.inc.php    26 Mar 2006 05:34:14 -0000      1.46
+++ class.boaccounts.inc.php    12 Jun 2006 09:13:17 -0000      1.47
@@ -9,7 +9,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: class.boaccounts.inc.php,v 1.46 2006/03/26 05:34:14 skwashd Exp 
$ */
+       /* $Id: class.boaccounts.inc.php,v 1.47 2006/06/12 09:13:17 sigurdne 
Exp $ */
 
        //FIXME define constants for rights so we can fuck all these magic 
numbers
        
@@ -170,7 +170,7 @@
                                {
                                        if($values['account_user'][$i] == 
$old_group_list[$j])
                                        {
-                                               unset($old_group_list[$j]);
+                                               $old_group_list[$j] = false;
                                                $is_new = false;
                                                break;
                                        }
@@ -210,9 +210,12 @@
                        // Remove members from group
                        foreach($old_group_list as $key => $value)
                        {
+                               if($value)
+                               {
                                
$acl->delete_repository('phpgw_group',$new_group->account_id, $value);
                                
$this->refresh_session_data($values['account_user'][$i]);
                        }
+                       }
                        
                        //Add the group manager
                        $acl->add_repository('phpgw_group', 
$new_group->account_id, $values['group_manager'], PHPGW_ACL_GROUP_MANAGERS | 1);
@@ -350,7 +353,7 @@
                                $error[] = lang('You must enter a group name.');
                        }
 
-                       if($values['account_name'] != 
$group->id2name($values['account_id']))
+                       if($values['account_name'] != $group->lid)
                        {
                                if ($group->exists($values['account_name']))
                                {