[Phpgroupware-cvs] CVS: admin/inc class.uiaccounts.inc.php,1.23.2.9.2.3,1.23.2.9.2.4

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaccounts.inc.php 
Log Message:
added stuff for accounts popup

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.23.2.9.2.3
retrieving revision 1.23.2.9.2.4
diff -C2 -r1.23.2.9.2.3 -r1.23.2.9.2.4
*** class.uiaccounts.inc.php    6 Apr 2003 22:27:05 -0000       1.23.2.9.2.3
--- class.uiaccounts.inc.php    1 May 2003 02:59:41 -0000       1.23.2.9.2.4
***************
*** 9,28 ****
        *  option) any later version.                                           
   *
        
\**************************************************************************/
- 
        /* $Id$ */
  
        class uiaccounts
        {
!               var $public_functions = array(
!                       'list_groups' => True,
!                       'list_users'  => True,
!                       'add_group'   => True,
!                       'add_user'    => True,
!                       'delete_group' => True,
!                       'delete_user' => True,
!                       'edit_user'   => True,
!                       'edit_group'  => True,
!                       'view_user'   => True,
!                       'group_manager' => True
                );
  
--- 9,29 ----
        *  option) any later version.                                           
   *
        
\**************************************************************************/
        /* $Id$ */
  
        class uiaccounts
        {
!               var $public_functions = array
!               (
!                       'list_groups'           => True,
!                       'list_users'            => True,
!                       'add_group'                     => True,
!                       'add_user'                      => True,
!                       'delete_group'          => True,
!                       'delete_user'           => True,
!                       'edit_user'                     => True,
!                       'edit_group'            => True,
!                       'view_user'                     => True,
!                       'group_manager'         => True,
!                       'accounts_popup'        => True
                );
  
***************
*** 740,743 ****
--- 741,749 ----
                }
  
+               function accounts_popup()
+               {
+                       $GLOBALS['phpgw']->accounts->accounts_popup('admin');
+               }
+ 
                function create_edit_group($group_info,$_errors='')
                {
***************
*** 767,784 ****
  
                        $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!                       $p->set_file(
!                               Array(
!                                       'form' => 'group_form.tpl'
!                               )
!                       );
  
                        $accounts = 
CreateObject('phpgwapi.accounts',$group_info['account_id'],'u');
-                       $account_list = $accounts->get_list('accounts');
-                       $account_num = count($account_list);
  
!                       $user_list = '';
!                       while (list($key,$entry) = each($account_list))
                        {
!                               $user_list .= '<option value="' . 
$entry['account_id'] . '"'
                                        . 
$group_info['account_user'][intval($entry['account_id'])] . '>'
                                        . 
$GLOBALS['phpgw']->common->display_fullname(
--- 773,809 ----
  
                        $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!                       $p->set_file(Array('edit' => 'group_form.tpl'));
!                       $p->set_block('edit','select');
!                       $p->set_block('edit','popwin');
  
                        $accounts = 
CreateObject('phpgwapi.accounts',$group_info['account_id'],'u');
  
!                       if 
($GLOBALS['phpgw_info']['server']['account_selection'] == 'popup')
!                       {
!                               
$p->set_var('accounts_link',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.accounts_popup'));
!                               $p->set_var('lang_open_popup',lang('open popup 
window'));
! 
!                               while(is_array($group_info['account_user']) && 
list($ac_id,) = each($group_info['account_user']))
!                               {
!                                       $ac_name = 
$GLOBALS['phpgw']->accounts->get_account_data($ac_id);
! 
!                                       $user_list .= '<option value="' . 
$ac_id . '" selected>'
!                                                               . 
$GLOBALS['phpgw']->common->display_fullname($ac_name[$ac_id]['lid'],$ac_name[$ac_id]['firstname'],$ac_name[$ac_id]['lastname'])
!                                                               . 
'</option>'."\n";
!                               }
!                               $account_num = 
count($group_info['account_user']);
!                               $p->set_var('select_size',($account_num < 
25?$account_num:25));
!                               $p->set_var('user_list',$user_list);
!                               $p->fp('accounts','popwin',True);
!                       }
!                       else
                        {
!                               $account_list = $accounts->get_list('accounts');
!                               $account_num = count($account_list);
! 
!                               $user_list = '';
!                               while (list($key,$entry) = each($account_list))
!                               {
!                                       $user_list .= '<option value="' . 
$entry['account_id'] . '"'
                                        . 
$group_info['account_user'][intval($entry['account_id'])] . '>'
                                        . 
$GLOBALS['phpgw']->common->display_fullname(
***************
*** 787,790 ****
--- 812,819 ----
                                                $entry['account_lastname'])
                                        . '</option>'."\n";
+                               }
+                               $p->set_var('select_size',($account_num < 
7?$account_num:7));
+                               $p->set_var('user_list',$user_list);
+                               $p->fp('accounts','select',True);
                        }
  
***************
*** 796,806 ****
                                'lang_include_user' => lang('Select users for 
inclusion'),
                                'error'             => 
(!$_errors?'':'<center>'.$GLOBALS['phpgw']->common->error_list($_errors).'</center>'),
-                               'select_size'       => ($account_num < 
5?$account_num:5),
-                               'user_list'         => $user_list,
                                'lang_permissions'  => lang('Permissions this 
group has')
                        );
                        $p->set_var($var);
  
!                       $group_repository = $accounts->read_repository ();
                        if (!$group_repository['file_space'])
                        {
--- 825,833 ----
                                'lang_include_user' => lang('Select users for 
inclusion'),
                                'error'             => 
(!$_errors?'':'<center>'.$GLOBALS['phpgw']->common->error_list($_errors).'</center>'),
                                'lang_permissions'  => lang('Permissions this 
group has')
                        );
                        $p->set_var($var);
  
!                       $group_repository = $accounts->read_repository();
                        if (!$group_repository['file_space'])
                        {
***************
*** 868,872 ****
                        
$p->set_var('rows',ExecMethod('admin.uimenuclass.createHTMLCode','group_manager'));
  
!                       $p->pfp('out','form');
                }
  
--- 895,902 ----
                        
$p->set_var('rows',ExecMethod('admin.uimenuclass.createHTMLCode','group_manager'));
  
!                       $p->set_var('select','');
!                       $p->set_var('popwin','');
!                       $p->pfp('out','edit');
! 
                }