[Phpgroupware-cvs] CVS: admin/inc class.boaccounts.inc.php,1.30,1.31 class.uiaccounts.inc.php,1.35,1.36

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.boaccounts.inc.php class.uiaccounts.inc.php 
Log Message:
update

Index: class.boaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.boaccounts.inc.php    23 Apr 2003 21:52:21 -0000      1.30
--- class.boaccounts.inc.php    27 Apr 2003 20:28:34 -0000      1.31
***************
*** 296,304 ****
                }
  
!               function add_user()
                {
                        if 
($GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
                        {
-                               ExecMethod('admin.uiaccounts.list_users');
                                return False;
                        }
--- 296,303 ----
                }
  
!               function add_user($values)
                {
                        if 
($GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
                        {
                                return False;
                        }
***************
*** 520,524 ****
                        if 
($GLOBALS['phpgw']->acl->check('account_access',16,'admin'))
                        {
-                               ExecMethod('admin.uiaccounts.list_users');
                                return False;
                        }
--- 519,522 ----

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.uiaccounts.inc.php    27 Apr 2003 19:28:13 -0000      1.35
--- class.uiaccounts.inc.php    27 Apr 2003 20:28:34 -0000      1.36
***************
*** 472,491 ****
                function edit_user()
                {
!                       $cd                                             = 
get_var('cd',array('GET'));
!                       $account_id                             = 
get_var('account_id',array('GET','POST'));
!                       $values                                 = 
get_var('values',array('POST'));
!                       $account_groups                 = 
get_var('account_groups',array('POST'));
!                       $account_permissions    = 
get_var('account_permissions',array('POST'));
  
!                       if (!$account_id && 
$GLOBALS['phpgw']->acl->check('account_access',4,'admin'))
!                       {
!                               $this->list_user();
!                               return False;
!                       }
  
!                       if ($account_id && 
$GLOBALS['phpgw']->acl->check('account_access',16,'admin'))
                        {
!                               $this->list_user();
!                               return False;
                        }
  
--- 472,486 ----
                function edit_user()
                {
!                       $cd                             = 
get_var('cd',array('GET'));
!                       $account_id             = 
get_var('account_id',array('GET','POST'));
!                       $values                 = 
get_var('values',array('POST'));
!                       $account_groups = 
get_var('account_groups',array('POST'));
!                       $account_apps   = get_var('account_apps',array('POST'));
  
!                       _debug_array($values);
  
!                       if ($values['cancel'] || (!$account_id && 
$GLOBALS['phpgw']->acl->check('account_access',4,'admin')) || ($account_id && 
$GLOBALS['phpgw']->acl->check('account_access',16,'admin')))
                        {
!                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_users');
                        }
  
***************
*** 542,545 ****
--- 537,550 ----
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('administration') . ': ' . ($account_id?lang('edit user 
account'):lang('add user account'));
  
+                       if ($account_id)
+                       {
+                               $user_info = Array
+                               (
+                                       'account_name' => 
$GLOBALS['phpgw']->accounts->id2name($account_id),
+                                       'account_user' => 
$this->bo->load_group_users($account_id),
+                                       'account_apps' => 
$this->bo->load_group_apps($account_id)
+                               );
+                       }
+ 
                        if (is_array($_userData))
                        {
***************
*** 683,690 ****
                        }
  
!                       $page_params['menuaction'] = 
'admin.boaccounts.edit_user';
!                       if($_account_id)
                        {
!                               $page_params['account_id']  = $_account_id;
                                $page_params['old_loginid'] = 
rawurlencode($userData['account_lid']);
                        }
--- 688,695 ----
                        }
  
!                       $page_params['menuaction'] = 
'admin.uiaccounts.edit_user';
!                       if($account_id)
                        {
!                               $page_params['account_id']  = $account_id;
                                $page_params['old_loginid'] = 
rawurlencode($userData['account_lid']);
                        }
***************
*** 693,697 ****
                        (
                                'edit_url'                              => 
$GLOBALS['phpgw']->link('/index.php',$page_params),
-                               'cancel_url'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_user'),
                                'lang_lid'                              => 
lang('loginid'),
                                'lang_account_active'   => lang('account 
active'),
--- 698,701 ----