[Phpgroupware-cvs] admin/inc class.boaclmanager.inc.php, 1.3, 1.4 class.uiaclmanager.inc.php, 1.8, 1.9

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv28330/inc

Modified Files:
        class.boaclmanager.inc.php class.uiaclmanager.inc.php 
Log Message:
update

Index: class.uiaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaclmanager.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.uiaclmanager.inc.php  6 Nov 2003 17:44:13 -0000       1.8
--- class.uiaclmanager.inc.php  7 Nov 2003 16:02:27 -0000       1.9
***************
*** 164,167 ****
--- 164,169 ----
                function list_addressmasters()
                {
+                       $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
+ 
                        $link_data = array
                        (
***************
*** 180,206 ****
                        }
  
!                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('admin') . ': ' . lang('list addressmasters');
!                       $GLOBALS['phpgw']->common->phpgw_header();
!                       echo parse_navbar();
! 
!                       
$GLOBALS['phpgw']->template->set_file(array('admin_list_t' => 
'list_accountmasters.tpl'));
!                       
$GLOBALS['phpgw']->template->set_block('admin_list_t','user_list','list');
!                       
$GLOBALS['phpgw']->template->set_block('admin_list_t','group_list','glist');
! 
!                       
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
  
!                       
$GLOBALS['phpgw']->template->set_var('sort_lid',lang('loginid'));
!                       
$GLOBALS['phpgw']->template->set_var('sort_firstname',lang('firstname'));
!                       
$GLOBALS['phpgw']->template->set_var('sort_lastname',lang('lastname'));
!                       
$GLOBALS['phpgw']->template->set_var('sort_name',lang('name'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_edit',lang('edit'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_users',lang('users'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_groups',lang('groups'));
  
                        $admins = $this->boacl->list_addressmasters();
                        
                        //_debug_array($admins);
! 
                        if(is_array($admins))
                        {
--- 182,193 ----
                        }
  
!                       $GLOBALS['phpgw']->xslttpl->add_file(array('app_data'));
  
!                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('admin') . ': ' . lang('list addressmasters');
  
                        $admins = $this->boacl->list_addressmasters();
                        
                        //_debug_array($admins);
!                       //exit;
                        if(is_array($admins))
                        {
***************
*** 209,250 ****
                                        if ($admin['lastname'] != 'Group')
                                        {
!                                               
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
!                                       
!                                               
$GLOBALS['phpgw']->template->set_var(array
!                                                                               
     (
!                                                                               
             'lid'              => $admin['lid'],
!                                                                               
             'firstname'=> $admin['firstname'],
!                                                                               
             'lastname' => $admin['lastname'])
!                                                       );
! 
!                                               
$GLOBALS['phpgw']->template->fp('list','user_list',True);
                                        }
!                               }
!                       }
! 
!                       $gadmins = $this->boacl->list_addressmasters(8);
!                       
!                       if(is_array($gadmins))
!                       {
!                               foreach($gadmins as $gadmin)
!                               {
!                                       if ($gadmin['lastname'] == 'Group')
                                        {
!                                               
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
!                                       
!                                               
$GLOBALS['phpgw']->template->set_var(array
!                                                                               
     (
!                                                                               
             'lid'              => $gadmin['lid'],
!                                                                               
             'firstname'=> $gadmin['firstname'],
!                                                                               
             'lastname' => $gadmin['lastname'])
!                                                       );
!                                               
$GLOBALS['phpgw']->template->fp('glist','group_list',True);
                                        }
                                }
                        }
  
  
  
!                       
$GLOBALS['phpgw']->template->pfp('out','admin_list_t',True);
                }
  
--- 196,238 ----
                                        if ($admin['lastname'] != 'Group')
                                        {
!                                               $users[] = array
!                                               (
!                                                       'lid'           => 
$admin['lid'],
!                                                       'firstname'=> 
$admin['firstname'],
!                                                       'lastname'      => 
$admin['lastname']
!                                               );
                                        }
!                                       elseif ($admin['lastname'] == 'Group')
                                        {
!                                               $groups[] = array
!                                               (
!                                                       'lid'           => 
$admin['lid'],
!                                                       'firstname'=> 
$admin['firstname'],
!                                                       'lastname'      => 
$admin['lastname']
!                                               );
                                        }
                                }
                        }
  
+                       //_debug_array($users);
+                       //exit;
  
+                       $link_data['menuaction'] = 
'admin.uiaclmanager.list_addressmasters';
  
!                       $data = array
!                       (
!                               'sort_lid'                              => 
lang('loginid'),
!                               'sort_firstname'                => 
lang('firstname'),
!                               'sort_lastname'                 => 
lang('lastname'),
!                               'sort_name'                             => 
lang('name'),
!                               'lang_users'                    => 
lang('users'),
!                               'lang_groups'                   => 
lang('groups'),
!                               'addressmaster_user'    => $users,
!                               'addressmaster_group'   => $groups,
!                               'lang_edit'                             => 
lang('edit'),
!                               'lang_done'                             => 
lang('done'),
!                               'action_url'                    => 
$GLOBALS['phpgw']->link('/index.php',$link_data) 
!                       );
!                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('addressmaster_list' => 
$data));
                }
  

Index: class.boaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaclmanager.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** class.boaclmanager.inc.php  6 Nov 2003 17:21:33 -0000       1.3
--- class.boaclmanager.inc.php  7 Nov 2003 16:02:26 -0000       1.4
***************
*** 49,55 ****
                }
  
!               function list_addressmasters($rights=7)
                {
!                       $admins = $this->get_addressmaster_ids($rights);
                        //_debug_array($admins);
  
--- 49,55 ----
                }
  
!               function list_addressmasters()
                {
!                       $admins = $this->get_addressmaster_ids();
                        //_debug_array($admins);
  
***************
*** 57,61 ****
                        {
                                $acc_name = 
$GLOBALS['phpgw']->accounts->get_account_data($admins[$i]);
!                               $data[] = array(
                                                'account_id'    => $admins[$i],
                                                'lid'                   => 
$acc_name[$admins[$i]]['lid'],
--- 57,64 ----
                        {
                                $acc_name = 
$GLOBALS['phpgw']->accounts->get_account_data($admins[$i]);
! 
!                               if(intval($admins[$i])>0)
!                               {
!                                       $data[] = array(
                                                'account_id'    => $admins[$i],
                                                'lid'                   => 
$acc_name[$admins[$i]]['lid'],
***************
*** 63,66 ****
--- 66,70 ----
                                                'lastname'              => 
$acc_name[$admins[$i]]['lastname']
                                                );
+                               }
                        }