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

[Bettina Gille <address@hidden>]

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

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.2
retrieving revision 1.48.2.2.2.3
diff -C2 -r1.48.2.2.2.2 -r1.48.2.2.2.3
*** class.accounts_shared.inc.php       1 May 2003 02:58:17 -0000       
1.48.2.2.2.2
--- class.accounts_shared.inc.php       3 May 2003 00:57:32 -0000       
1.48.2.2.2.3
***************
*** 265,272 ****
  
                        
$GLOBALS['phpgw']->template->set_var('title',$GLOBALS['phpgw_info']['site_title']);
!                       
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Accounts & Groups'));
                        
$GLOBALS['phpgw']->template->set_var('charset',$GLOBALS['phpgw']->translation->translate('charset'));
                        
$GLOBALS['phpgw']->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
                        
$GLOBALS['phpgw']->template->set_var('lang_search',lang('search'));
  
                        if (! $start) { $start = 0; }
--- 265,273 ----
  
                        
$GLOBALS['phpgw']->template->set_var('title',$GLOBALS['phpgw_info']['site_title']);
!                       
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Accounts and Groups'));
                        
$GLOBALS['phpgw']->template->set_var('charset',$GLOBALS['phpgw']->translation->translate('charset'));
                        
$GLOBALS['phpgw']->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
                        
$GLOBALS['phpgw']->template->set_var('lang_search',lang('search'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_select_group',lang('select group'));
  
                        if (! $start) { $start = 0; }
***************
*** 278,285 ****
--- 279,293 ----
                                        $action = 
'calendar.uicalendar.accounts_popup';
                                        
$GLOBALS['phpgw']->template->set_var('select_name','participants[]');
+                                       
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
                                        break;
                                case 'admin':
                                        $action = 
'admin.uiaccounts.accounts_popup';
                                        
$GLOBALS['phpgw']->template->set_var('select_name','account_user[]');
+                                       
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
+                                       break;
+                               case 'projects':
+                                       $action = 
'projects.uiprojects.accounts_popup';
+                                       
$GLOBALS['phpgw']->template->set_var('select_name','values[coordinator]');
+                                       
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountText');
                                        break;
                        }
***************
*** 293,328 ****
                        $user_groups = 
$GLOBALS['phpgw']->accounts->membership($this->account);
  
!                       switch($app)
!                       {
!                               case 'calendar':
!                                       $cal_user = 
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'calendar');
  
!                                       for ($i = 0;$i<count($cal_user);$i++)
!                                       {
!                                               $type = 
$GLOBALS['phpgw']->accounts->get_type($cal_user[$i]);
!                                               if ($type == 'g')
!                                               {
!                                                       $cal_groups[] = 
$cal_user[$i];
!                                                       $members[] = 
$GLOBALS['phpgw']->acl->get_ids_for_location($cal_user[$i],1,'phpgw_group');
!                                               }
!                                       }
  
!                                       $i = count($cal_user);
!                                       while(is_array($members) && list(,$mem) 
= each($members))
!                                       {
!                                               for($j=0;$j<count($mem);$j++)
!                                               {
!                                                       $cal_user[$i] = 
$mem[$j];
!                                                       $i++;
!                                               }
!                                       }
!                                       //_debug_array($cal_user);
!                                       break;
                        }
  
                        while (is_array($user_groups) && list(,$group) = 
each($user_groups))
                        {
                                $link_data['group_id'] = $group['account_id'];
!                               if (($app == 'calendar') && 
in_array($group['account_id'],$cal_groups))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('link_user_group',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 301,331 ----
                        $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))
                        {
                                $link_data['group_id'] = $group['account_id'];
!                               if (in_array($group['account_id'],$app_groups))
                                {
                                        
$GLOBALS['phpgw']->template->set_var('link_user_group',$GLOBALS['phpgw']->link('/index.php',$link_data));
***************
*** 332,339 ****
                                else
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('link_user_group',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_user_group',$group['account_name']);
                                }
!                               
$GLOBALS['phpgw']->template->fp('bla','group_list');
                        }
  
--- 335,343 ----
                                else
                                {
!                                       
$GLOBALS['phpgw']->template->set_var('link_user_group','');
!                                       
$GLOBALS['phpgw']->template->set_var('lang_user_group','');
! 
                                }
!                               
$GLOBALS['phpgw']->template->fp('bla','group_list',True);
                        }
  
***************
*** 369,373 ****
                                for ($i=0;$i<count($entries);$i++)
                                {
!                                       if (($app == 'calendar') && 
in_array($entries[$i]['account_id'],$cal_user))
                                        {
                                                $val_users[] = array
--- 373,377 ----
                                for ($i=0;$i<count($entries);$i++)
                                {
!                                       if 
(in_array($entries[$i]['account_id'],$app_user))
                                        {
                                                $val_users[] = array