[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_shared.inc.php,1.48.2.2.2.3,1.48.2.2.2.4

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv14136

Modified Files:
      Tag: Version-0_9_16-branch
        class.accounts_shared.inc.php 
Log Message:
update accounts

Index: class.accounts_shared.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_shared.inc.php,v
retrieving revision 1.48.2.2.2.3
retrieving revision 1.48.2.2.2.4
diff -C2 -r1.48.2.2.2.3 -r1.48.2.2.2.4
*** class.accounts_shared.inc.php       3 May 2003 00:57:32 -0000       
1.48.2.2.2.3
--- class.accounts_shared.inc.php       3 May 2003 02:15:50 -0000       
1.48.2.2.2.4
***************
*** 299,326 ****
                        );
  
-                       $user_groups = 
$GLOBALS['phpgw']->accounts->membership($this->account);
  
-                       $app_user = 
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,$app);
  
!                       for ($i = 0;$i<count($app_user);$i++)
                        {
!                               $type = 
$GLOBALS['phpgw']->accounts->get_type($app_user[$i]);
!                               if ($type == 'g')
                                {
!                                       $app_groups[] = $app_user[$i];
!                                       $members[] = 
$GLOBALS['phpgw']->acl->get_ids_for_location($app_user[$i],1,'phpgw_group');
                                }
-                       }
  
!                       $i = count($app_user);
!                       while(is_array($members) && list(,$mem) = 
each($members))
                        {
!                               for($j=0;$j<count($mem);$j++)
                                {
!                                       $app_user[$i] = $mem[$j];
                                        $i++;
                                }
                        }
-                       //_debug_array($app_user);
  
                        while (is_array($user_groups) && list(,$group) = 
each($user_groups))
--- 299,356 ----
                        );
  
  
  
!                       if ($app != 'admin')
                        {
!                               $user_groups = 
$GLOBALS['phpgw']->accounts->membership($this->account);
!                               $app_user = 
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,$app);
! 
!                               for ($i = 0;$i<count($app_user);$i++)
                                {
!                                       $type = 
$GLOBALS['phpgw']->accounts->get_type($app_user[$i]);
!                                       if ($type == 'g')
!                                       {
!                                               $app_groups[] = $app_user[$i];
!                                               $members[] = 
$GLOBALS['phpgw']->acl->get_ids_for_location($app_user[$i],1,'phpgw_group');
!                                       }
                                }
  
!                               $i = count($app_user);
!                               while(is_array($members) && list(,$mem) = 
each($members))
!                               {
!                                       for($j=0;$j<count($mem);$j++)
!                                       {
!                                               $app_user[$i] = $mem[$j];
!                                               $i++;
!                                       }
!                               }
!                               //_debug_array($app_user);
!                       }
!                       else
                        {
!                               $all_groups     = $this->get_list('groups');
!                               $all_user       = $this->get_list('accounts');
! 
!                               while(is_array($all_groups) && list(,$agroup) = 
each($all_groups))
!                               {
!                                       $user_groups[] = array
!                                       (
!                                               'account_id'    => 
$agroup['account_id'],
!                                               'account_name'  => 
$agroup['account_firstname']
!                                       );
!                               }
! 
!                               for($j=0;$j<count($user_groups);$j++)
!                               {
!                                       $app_groups[$i] = 
$user_groups[$j]['account_id'];
!                                       $i++;
!                               }
! 
!                               for($j=0;$j<count($all_user);$j++)
                                {
!                                       $app_user[$i] = 
$all_user[$j]['account_id'];
                                        $i++;
                                }
                        }
  
                        while (is_array($user_groups) && list(,$group) = 
each($user_groups))