[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_shared.inc.php,1.48
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_shared.inc.php,1.48.2.2.2.10,1.48.2.2.2.11 |
|
Date: |
Sun, 04 May 2003 20:59:53 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv18490/inc
Modified Files:
Tag: Version-0_9_16-branch
class.accounts_shared.inc.php
Log Message:
update accounts_popup
Index: class.accounts_shared.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_shared.inc.php,v
retrieving revision 1.48.2.2.2.10
retrieving revision 1.48.2.2.2.11
diff -C2 -r1.48.2.2.2.10 -r1.48.2.2.2.11
*** class.accounts_shared.inc.php 5 May 2003 00:01:09 -0000
1.48.2.2.2.10
--- class.accounts_shared.inc.php 5 May 2003 00:59:51 -0000
1.48.2.2.2.11
***************
*** 296,301 ****
--- 296,306 ----
$GLOBALS['phpgw']->template->set_block('accounts_list_t','group_cal','cal');
$GLOBALS['phpgw']->template->set_block('accounts_list_t','group_other','other');
+
$GLOBALS['phpgw']->template->set_block('accounts_list_t','group_all','all');
+
$GLOBALS['phpgw']->template->set_block('accounts_list_t','bla_intro','ibla');
$GLOBALS['phpgw']->template->set_block('accounts_list_t','other_intro','iother');
+
$GLOBALS['phpgw']->template->set_block('accounts_list_t','all_intro','iall');
+
+
$GLOBALS['phpgw']->template->set_block('accounts_list_t','accounts_list','list');
***************
*** 307,311 ****
$GLOBALS['phpgw']->template->set_var('lang_groups',lang('user groups'));
$GLOBALS['phpgw']->template->set_var('lang_accounts',lang('user accounts'));
!
$GLOBALS['phpgw']->template->set_var('lang_show_users',lang('show users'));
$GLOBALS['phpgw']->template->set_var('css_file',$GLOBALS['phpgw_info']['server']['webserver_url']
. SEP . 'phpgwapi' . SEP . 'templates'
. SEP . 'idots' . SEP . 'css' . SEP .
'idots.css');
--- 312,319 ----
$GLOBALS['phpgw']->template->set_var('lang_groups',lang('user groups'));
$GLOBALS['phpgw']->template->set_var('lang_accounts',lang('user accounts'));
!
$GLOBALS['phpgw']->template->set_var('lang_perm',lang('Groups with permission
for %1',$app));
!
$GLOBALS['phpgw']->template->set_var('lang_nonperm',lang('Groups without
permission for %1',$app));
!
!
$GLOBALS['phpgw']->template->set_var('lang_show_users',lang(''));
$GLOBALS['phpgw']->template->set_var('css_file',$GLOBALS['phpgw_info']['server']['webserver_url']
. SEP . 'phpgwapi' . SEP . 'templates'
. SEP . 'idots' . SEP . 'css' . SEP .
'idots.css');
***************
*** 318,321 ****
--- 326,330 ----
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
$GLOBALS['phpgw']->template->fp('ibla','bla_intro',True);
+
$GLOBALS['phpgw']->template->fp('iall','all_intro',True);
break;
case 'admin':
***************
*** 323,326 ****
--- 332,336 ----
$GLOBALS['phpgw']->template->set_var('select_name',"account_user[]']");
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountSelect');
+
$GLOBALS['phpgw']->template->set_var('lang_perm',lang('group name'));
$GLOBALS['phpgw']->template->fp('iother','other_intro',True);
break;
***************
*** 330,333 ****
--- 340,344 ----
$GLOBALS['phpgw']->template->set_var('js_function','ExchangeAccountText');
$GLOBALS['phpgw']->template->fp('iother','other_intro',True);
+
$GLOBALS['phpgw']->template->fp('iall','all_intro',True);
break;
}
***************
*** 411,416 ****
else
{
!
$GLOBALS['phpgw']->template->set_var('link_user_group','');
!
$GLOBALS['phpgw']->template->set_var('lang_user_group','');
}
}
--- 422,431 ----
else
{
! if ($app != 'admin')
! {
!
$GLOBALS['phpgw']->template->set_var('link_all_group',$GLOBALS['phpgw']->link('/index.php','menuaction='
. $action . '&group_id=' . $group['account_id']));
!
$GLOBALS['phpgw']->template->set_var('name_all_group',$group['account_name']);
!
$GLOBALS['phpgw']->template->fp('all','group_all',True);
! }
}
}
***************
*** 425,457 ****
for ($i=0;$i<count($users);$i++)
{
!
$GLOBALS['phpgw']->accounts->account_id = $users[$i];
!
$GLOBALS['phpgw']->accounts->read_repository();
!
! switch ($order)
{
! case
'account_firstname':
! $id =
$GLOBALS['phpgw']->accounts->data['firstname'];
! break;
! case 'account_lastname':
! $id =
$GLOBALS['phpgw']->accounts->data['lastname'];
! break;
! case 'account_lid':
! default:
! $id =
$GLOBALS['phpgw']->accounts->data['account_lid'];
! break;
}
- $id .=
$GLOBALS['phpgw']->accounts->data['lastname']; // default sort-order
- $id .=
$GLOBALS['phpgw']->accounts->data['firstname'];
- $id .=
$GLOBALS['phpgw']->accounts->data['account_id']; // make our index unique
-
- $val_users[$id] = array
- (
- 'account_id'
=> $GLOBALS['phpgw']->accounts->data['account_id'],
- 'account_lid'
=> $GLOBALS['phpgw']->accounts->data['account_lid'],
- 'account_firstname'
=> $GLOBALS['phpgw']->accounts->data['firstname'],
- 'account_lastname'
=> $GLOBALS['phpgw']->accounts->data['lastname']
- );
}
! if (count($users))
{
if ($sort != 'DESC')
--- 440,476 ----
for ($i=0;$i<count($users);$i++)
{
! if
(in_array($users[$i],$app_user))
{
!
$GLOBALS['phpgw']->accounts->account_id = $users[$i];
!
$GLOBALS['phpgw']->accounts->read_repository();
!
! switch ($order)
! {
! case
'account_firstname':
! $id =
$GLOBALS['phpgw']->accounts->data['firstname'];
! break;
! case
'account_lastname':
! $id =
$GLOBALS['phpgw']->accounts->data['lastname'];
! break;
! case
'account_lid':
! default:
! $id =
$GLOBALS['phpgw']->accounts->data['account_lid'];
! break;
! }
! $id .=
$GLOBALS['phpgw']->accounts->data['lastname']; // default sort-order
! $id .=
$GLOBALS['phpgw']->accounts->data['firstname'];
! $id .=
$GLOBALS['phpgw']->accounts->data['account_id']; // make our index unique
!
! $val_users[$id] = array
! (
! 'account_id'
=> $GLOBALS['phpgw']->accounts->data['account_id'],
! 'account_lid'
=> $GLOBALS['phpgw']->accounts->data['account_lid'],
!
'account_firstname' => $GLOBALS['phpgw']->accounts->data['firstname'],
!
'account_lastname' => $GLOBALS['phpgw']->accounts->data['lastname']
! );
}
}
!
! if (is_array($val_users))
{
if ($sort != 'DESC')
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_shared.inc.php,1.48.2.2.2.10,1.48.2.2.2.11,
Bettina Gille <address@hidden> <=