[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php, 1.37, 1.38 class.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php, 1.37, 1.38 class.uiaclmanager.inc.php, 1.10, 1.11 class.uimainscreen.inc.php, 1.10, 1.11 |
|
Date: |
Wed, 12 Nov 2003 16:36:44 +0000 |
Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv29619/inc
Modified Files:
class.uiaccounts.inc.php class.uiaclmanager.inc.php
class.uimainscreen.inc.php
Log Message:
update
Index: class.uiaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaclmanager.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** class.uiaclmanager.inc.php 11 Nov 2003 16:40:24 -0000 1.10
--- class.uiaclmanager.inc.php 12 Nov 2003 16:35:01 -0000 1.11
***************
*** 185,190 ****
}
- $GLOBALS['phpgw']->xslttpl->add_file(array('app_data'));
-
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('admin') . ': ' . lang('list addressmasters');
--- 185,188 ----
***************
*** 280,285 ****
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('admin') . ': ' . lang('edit addressmaster list');
-
- $GLOBALS['phpgw']->xslttpl->add_file(array('app_data'));
if
($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection']
== 'popup')
--- 278,281 ----
Index: class.uimainscreen.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uimainscreen.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** class.uimainscreen.inc.php 26 Apr 2003 08:56:28 -0000 1.10
--- class.uimainscreen.inc.php 12 Nov 2003 16:35:01 -0000 1.11
***************
*** 28,33 ****
function mainscreen()
{
- $GLOBALS['phpgw']->xslttpl->add_file('app_data');
-
function display_section($appname,$file,$file2='')
{
--- 28,31 ----
***************
*** 36,40 ****
$GLOBALS['phpgw']->hooks->process('admin');
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' =>
$GLOBALS['phpgw']->common->output));
}
--- 34,37 ----
Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** class.uiaccounts.inc.php 27 Apr 2003 23:16:15 -0000 1.37
--- class.uiaccounts.inc.php 12 Nov 2003 16:35:00 -0000 1.38
***************
*** 65,71 ****
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . lang('list groups');
!
$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','groups',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'nextmatchs'));
/* what should this be for??? this is the same call for both cases! can this
be removed? [ceb] */
--- 65,69 ----
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . lang('list groups');
! $GLOBALS['phpgw']->xslttpl->add_file('groups');
/* what should this be for??? this is the same call for both cases! can this
be removed? [ceb] */
***************
*** 82,85 ****
--- 80,88 ----
}
+ $link_data = array
+ (
+ 'menuaction' => 'admin.uiaccounts.list_groups'
+ );
+
$group_header = array
(
***************
*** 89,93 ****
'var' => 'account_lid',
'order' => $order,
!
'extra' => 'menuaction=admin.uiaccounts.list_groups'
)),
'lang_name' =>
lang('name'),
--- 92,96 ----
'var' => 'account_lid',
'order' => $order,
!
'extra' => $link_data
)),
'lang_name' =>
lang('name'),
***************
*** 121,141 ****
);
$data = array
(
! 'start_record'
=> $start,
! 'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
! 'num_records'
=> count($account_info),
! 'all_records'
=> $total,
! 'nextmatchs_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
! 'nextmatchs_img_path' =>
$GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
! 'select_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'),
! 'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
! 'lang_searchbutton_statustext' => lang('Submit
the search string'),
! 'query'
=> $query,
! 'lang_search'
=> lang('search'),
! 'group_header'
=> $group_header,
! 'group_data'
=> $group_data,
! 'group_add'
=> $group_add,
! 'search_access'
=> ($this->bo->check_rights('search')?'yes':'')
);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('group_list' => $data));
--- 124,143 ----
);
+ $nm = array
+ (
+ 'start_record' => $start,
+ 'num_records' => count($account_info),
+ 'all_records' => $total,
+ 'link_data' => $link_data
+ );
+
$data = array
(
! 'nm_data' =>
$this->nextmatchs->xslt_nm($nm),
! 'search_data' =>
$this->nextmatchs->xslt_search(array('query' => $query,'link_data' =>
$link_data)),
! 'group_header' => $group_header,
! 'group_data' => $group_data,
! 'group_add' => $group_add,
! 'search_access' =>
($this->bo->check_rights('search')?'yes':'')
);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('group_list' => $data));
***************
*** 182,188 ****
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . lang('list users');
!
$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','users',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'nextmatchs'));
/* the same like in groups... we really should remove this... :) [ceb] */
--- 184,188 ----
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . lang('list users');
! $GLOBALS['phpgw']->xslttpl->add_file('users');
/* the same like in groups... we really should remove this... :) [ceb] */
***************
*** 199,202 ****
--- 199,207 ----
}
+ $link_data = array
+ (
+ 'menuaction' =>
'menuaction=admin.uiaccounts.list_users'
+ );
+
$user_header = array
(
***************
*** 206,210 ****
'var' => 'account_lid',
'order' => $order,
!
'extra' => 'menuaction=admin.uiaccounts.list_users'
)),
'lang_lid' =>
lang('loginid'),
--- 211,215 ----
'var' => 'account_lid',
'order' => $order,
!
'extra' => $link_data
)),
'lang_lid' =>
lang('loginid'),
***************
*** 214,218 ****
'var' => 'account_lastname',
'order' => $order,
!
'extra' => 'menuaction=admin.uiaccounts.list_users'
)),
'lang_lastname' =>
lang('Lastname'),
--- 219,223 ----
'var' => 'account_lastname',
'order' => $order,
!
'extra' => $link_data
)),
'lang_lastname' =>
lang('Lastname'),
***************
*** 222,226 ****
'var' => 'account_firstname',
'order' => $order,
!
'extra' => 'menuaction=admin.uiaccounts.list_users'
)),
'lang_firstname' =>
lang('firstname'),
--- 227,231 ----
'var' => 'account_firstname',
'order' => $order,
!
'extra' => $link_data
)),
'lang_firstname' =>
lang('firstname'),
***************
*** 260,280 ****
);
$data = array
(
! 'start_record'
=> $start,
! 'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
! 'num_records'
=> count($account_info),
! 'all_records'
=> $total,
! 'nextmatchs_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'),
! 'nextmatchs_img_path' =>
$GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
! 'select_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_users'),
! 'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
! 'lang_searchbutton_statustext' => lang('Submit
the search string'),
! 'query'
=> $query,
! 'lang_search'
=> lang('search'),
! 'user_header'
=> $user_header,
! 'user_data'
=> $user_data,
! 'user_add'
=> $user_add,
! 'search_access'
=> ($this->bo->check_rights('search','account_access')?'yes':'')
);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('account_list' => $data));
--- 265,284 ----
);
+ $nm = array
+ (
+ 'start_record' => $start,
+ 'num_records' => count($account_info),
+ 'all_records' => $total,
+ 'link_data' => $link_data
+ );
+
$data = array
(
! 'nm_data' =>
$this->nextmatchs->xslt_nm($nm),
! 'search_data' =>
$this->nextmatchs->xslt_search(array('query' => $query,'link_data' =>
$link_data)),
! 'user_header' => $user_header,
! 'user_data' => $user_data,
! 'user_add' => $user_add,
! 'search_access' =>
($this->bo->check_rights('search','account_access')?'yes':'')
);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('account_list' => $data));
***************
*** 358,362 ****
);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','groups'));
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . ((intval($account_id) > 0)?lang('edit
group'):lang('add group'));
--- 362,366 ----
);
! $GLOBALS['phpgw']->xslttpl->add_file('groups');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . ((intval($account_id) > 0)?lang('edit
group'):lang('add group'));
***************
*** 527,531 ****
print_debug('Type :
'.gettype($_userData).'<br>_userData(size) =
"'.$_userData.'"('.strlen($_userData).')');
!
$GLOBALS['phpgw']->xslttpl->add_file(array('app_data','users'));
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . ($account_id?lang('edit user
account'):lang('add user account'));
--- 531,535 ----
print_debug('Type :
'.gettype($_userData).'<br>_userData(size) =
"'.$_userData.'"('.strlen($_userData).')');
! $GLOBALS['phpgw']->xslttpl->add_file('users');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration') . ': ' . ($account_id?lang('edit user
account'):lang('add user account'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php, 1.37, 1.38 class.uiaclmanager.inc.php, 1.10, 1.11 class.uimainscreen.inc.php, 1.10, 1.11,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/inc class.uientity.inc.php, 1.14, 1.15 class.uiadmin_entity.inc.php, 1.12, 1.13 class.soadmin_entity.inc.php, 1.15, 1.16 class.soentity.inc.php, 1.14, 1.15 class.uitts.inc.php, 1.43, 1.44 class.sotts.inc.php, 1.33, 1.34 class.botts.inc.php, 1.23, 1.24 class.menu.inc.php, 1.2, 1.3 class.boentity.inc.php, 1.8, 1.9 hook_admin.inc.php, 1.43, 1.44
- Next by Date:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.9, 1.10 tts.xsl, 1.16, 1.17
- Previous by thread:
[Phpgroupware-cvs] property/inc class.uientity.inc.php, 1.14, 1.15 class.uiadmin_entity.inc.php, 1.12, 1.13 class.soadmin_entity.inc.php, 1.15, 1.16 class.soentity.inc.php, 1.14, 1.15 class.uitts.inc.php, 1.43, 1.44 class.sotts.inc.php, 1.33, 1.34 class.botts.inc.php, 1.23, 1.24 class.menu.inc.php, 1.2, 1.3 class.boentity.inc.php, 1.8, 1.9 hook_admin.inc.php, 1.43, 1.44
- Next by thread:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.9, 1.10 tts.xsl, 1.16, 1.17
- Index(es):