[Phpgroupware-cvs] CVS: admin/inc class.uiaccounts.inc.php,1.34,1.35

[Bettina Gille <address@hidden>]

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

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

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.uiaccounts.inc.php    27 Apr 2003 00:47:33 -0000      1.34
--- class.uiaccounts.inc.php    27 Apr 2003 19:28:13 -0000      1.35
***************
*** 49,55 ****
                function list_groups()
                {
!                       if 
($GLOBALS['phpgw']->acl->check('group_access',1,'admin'))
                        {
!                               
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.mainscreen'));
                        }
  
--- 49,60 ----
                function list_groups()
                {
!                       if ($_POST['done'] || 
$GLOBALS['phpgw']->acl->check('group_access',1,'admin'))
                        {
!                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uimainscreen.mainscreen');
!                       }
! 
!                       if($_POST['add'])
!                       {
!                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.edit_group');
                        }
  
***************
*** 110,117 ****
                                'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a group'),
!                               'add_url'                               => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_group'),
                                'lang_done'                             => 
lang('done'),
                                'lang_done_statustext'  => lang('return to 
admin mainscreen'),
-                               'done_url'                              => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.mainscreen'),
                                'add_access'                    => 
($this->bo->check_rights('add')?'yes':''),
                        );
--- 115,121 ----
                                'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a group'),
!                               'action_url'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
                                'lang_done'                             => 
lang('done'),
                                'lang_done_statustext'  => lang('return to 
admin mainscreen'),
                                'add_access'                    => 
($this->bo->check_rights('add')?'yes':''),
                        );
***************
*** 140,146 ****
                function list_users($param_cd='')
                {
!                       if 
($GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
                        {
!                               
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.mainscreen'));
                        }
  
--- 144,155 ----
                function list_users($param_cd='')
                {
!                       if ($_POST['done'] || 
$GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
                        {
!                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uimainscreen.mainscreen');
!                       }
! 
!                       if ($_POST['add'])
!                       {
!                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.edit_user');
                        }
  
***************
*** 245,252 ****
                                'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a user'),
!                               'add_url'                               => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_user'),
                                'lang_done'                             => 
lang('done'),
                                'lang_done_statustext'  => lang('return to 
admin mainscreen'),
-                               'done_url'                              => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.mainscreen'),
                                'add_access'                    => 
($this->bo->check_rights('add','account_access')?'yes':''),
                        );
--- 254,260 ----
                                'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a user'),
!                               'action_url'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'),
                                'lang_done'                             => 
lang('done'),
                                'lang_done_statustext'  => lang('return to 
admin mainscreen'),
                                'add_access'                    => 
($this->bo->check_rights('add','account_access')?'yes':''),
                        );
***************
*** 308,326 ****
                                        {
                                                $this->bo->add_group($values);
!                                               Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'));
                                        }
                                }
                        }
  
!                       if (!$account_id && 
$GLOBALS['phpgw']->acl->check('group_access',4,'admin'))
                        {
!                               $this->list_groups();
!                               return False;
!                       }
! 
!                       if ($account_id && 
$GLOBALS['phpgw']->acl->check('group_access',16,'admin'))
!                       {
!                               $this->list_groups();
!                               return False;
                        }
  
--- 316,327 ----
                                        {
                                                $this->bo->add_group($values);
!                                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
                                        }
                                }
                        }
  
!                       if ($values['cancel'] || (!$account_id && 
$GLOBALS['phpgw']->acl->check('group_access',4,'admin')) || ($account_id && 
$GLOBALS['phpgw']->acl->check('group_access',16,'admin')))
                        {
!                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
                        }
  
***************
*** 447,451 ****
                        (
                                'edit_url'                              => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
-                               'cancel_url'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
                                'account_id'                    => 
$group_info['account_id'],
                                'lang_account_name'             => lang('group 
name'),
--- 448,451 ----
***************
*** 889,903 ****
                        $account_id = get_var('account_id',array('POST','GET'));
  
!                       if 
($GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
                        {
!                               $this->list_groups();
!                               return False;
                        }
  
!                       if ($account_id && get_var('confirm',array('POST')))
                        {
                                $this->bo->delete_group($account_id);
!                               $this->list_groups();
!                               return False;
                        }
  
--- 889,901 ----
                        $account_id = get_var('account_id',array('POST','GET'));
  
!                       if ($_POST['cancel'] || 
$GLOBALS['phpgw']->acl->check('group_access',32,'admin'))
                        {
!                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
                        }
  
!                       if ($account_id && $_POST['delete'])
                        {
                                $this->bo->delete_group($account_id);
!                               
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_groups');
                        }
  
***************
*** 907,917 ****
                        $data = array
                        (
!                               'delete_url'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group&account_id='
 . $account_id),
!                               'done_url'                              => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
!                               'lang_yes'                              => 
lang('Yes'),
!                               'lang_no'                               => 
lang('No'),
!                               'lang_yes_statustext'   => lang('Delete the 
entry'),
!                               'lang_no_statustext'    => lang('Back to the 
list'),
!                               'lang_error_msg'                => lang('are 
you sure you want to delete this group ?')
                        );
  
--- 905,914 ----
                        $data = array
                        (
!                               'delete_url'                            => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group&account_id='
 . $account_id),
!                               'lang_delete'                           => 
lang('delete'),
!                               'lang_cancel'                           => 
lang('cancel'),
!                               'lang_delete_statustext'        => lang('delete 
the group'),
!                               'lang_cancel_statustext'        => lang('Leave 
the group untouched and return back to the list'),
!                               'lang_delete_msg'                       => 
lang('are you sure you want to delete this group ?')
                        );