[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php, 1.38, 1.39 class.uiaclmanager.inc.php, 1.11, 1.12

[Bettina Gille <address@hidden>]

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

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

Index: class.uiaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaclmanager.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** class.uiaclmanager.inc.php  12 Nov 2003 16:35:01 -0000      1.11
--- class.uiaclmanager.inc.php  13 Nov 2003 13:52:09 -0000      1.12
***************
*** 186,189 ****
--- 186,190 ----
  
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('admin') . ': ' . lang('list addressmasters');
+                       $GLOBALS['phpgw']->xslttpl->add_file('addressmaster');
  
                        $admins = $this->boacl->list_addressmasters();
***************
*** 278,281 ****
--- 279,283 ----
  
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('admin') . ': ' . lang('edit addressmaster list');
+                       $GLOBALS['phpgw']->xslttpl->add_file('addressmaster');
  
                        if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection'] 
== 'popup')

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** class.uiaccounts.inc.php    12 Nov 2003 16:35:00 -0000      1.38
--- class.uiaccounts.inc.php    13 Nov 2003 13:52:08 -0000      1.39
***************
*** 59,62 ****
--- 59,82 ----
                        }
  
+                       $start = 
(isset($GLOBALS['HTTP_POST_VARS']['start'])?intval($GLOBALS['HTTP_POST_VARS']['start']):'');
+ 
+                       if(isset($_GET['order']))
+                       {
+                               $order = $_GET['order'];
+                       }
+                       else
+                       {
+                               $order = 'account_lid';
+                       }
+                       
+                       if(isset($_GET['sort']))
+                       {
+                               $sort = $_GET['sort'];
+                       }
+                       else
+                       {
+                               $sort = 'ASC';
+                       }
+ 
                        $query = (isset($_POST['query'])?$_POST['query']:'');
  
***************
*** 201,205 ****
                        $link_data = array
                        (
!                               'menuaction' => 
'menuaction=admin.uiaccounts.list_users'
                        );
  
--- 221,225 ----
                        $link_data = array
                        (
!                               'menuaction' => 'admin.uiaccounts.list_users'
                        );
  
***************
*** 457,461 ****
                                'lang_include_user'             => lang('select 
users for inclusion'),
                                'select_size'                   => 
($account_num < 5?$account_num:5),
!                               'user_list'                             => 
$user_list,
                                'lang_permissions'              => 
lang('permissions this group has'),
                                'lang_application'              => 
lang('application'),
--- 477,481 ----
                                'lang_include_user'             => lang('select 
users for inclusion'),
                                'select_size'                   => 
($account_num < 5?$account_num:5),
!                               'guser_list'                    => $user_list,
                                'lang_permissions'              => 
lang('permissions this group has'),
                                'lang_application'              => 
lang('application'),