[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.uiaclmanager.inc.php,1.9,1.10
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.uiaclmanager.inc.php,1.9,1.10 |
|
Date: |
Tue, 11 Nov 2003 16:40:26 +0000 |
Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv28435/inc
Modified Files:
class.uiaclmanager.inc.php
Log Message:
addressmaster
Index: class.uiaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaclmanager.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** class.uiaclmanager.inc.php 7 Nov 2003 16:02:27 -0000 1.9
--- class.uiaclmanager.inc.php 11 Nov 2003 16:40:24 -0000 1.10
***************
*** 3,11 ****
* phpGroupWare - Administration
*
* http://www.phpgroupware.org
*
! * --------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
\**************************************************************************/
/* $Id$ */
--- 3,14 ----
* phpGroupWare - Administration
*
* http://www.phpgroupware.org
*
! *
------------------------------------------------------------------------ *
! * Copyright 2001 - 2003 Free Software Foundation, Inc
*
! * This program is part of the GNU project, see http://www.gnu.org/
*
! *
------------------------------------------------------------------------ *
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by the
*
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
\**************************************************************************/
/* $Id$ */
***************
*** 239,243 ****
function accounts_popup()
{
!
$GLOBALS['phpgw']->accounts->accounts_popup('admin_acl');
}
--- 242,246 ----
function accounts_popup()
{
! return
$GLOBALS['phpgw']->accounts->accounts_popup('admin_acl');
}
***************
*** 249,252 ****
--- 252,257 ----
function edit_addressmasters()
{
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
+
$link_data = array
(
***************
*** 260,264 ****
if(is_array($error))
{
!
$GLOBALS['phpgw']->template->set_var('error_message',$GLOBALS['phpgw']->common->error_list($error));
}
else
--- 265,269 ----
if(is_array($error))
{
! $error_message =
$GLOBALS['phpgw']->common->error_list($error);
}
else
***************
*** 275,314 ****
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('admin') . ': ' . lang('edit addressmaster list');
- $GLOBALS['phpgw']->common->phpgw_header();
- echo parse_navbar();
-
- $GLOBALS['phpgw']->template->set_file(array('admin_add'
=> 'form_accountmasters.tpl'));
-
$GLOBALS['phpgw']->template->set_block('admin_add','select');
-
$GLOBALS['phpgw']->template->set_block('admin_add','popwin');
-
-
$GLOBALS['phpgw']->template->set_var('lang_select_addressmasters',lang('Select
addressmasters'));
-
$GLOBALS['phpgw']->template->set_var('lang_save',lang('save'));
-
$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('cancel'));
! $link_data['menuaction'] =
'admin.uiaclmanager.edit_addressmasters';
!
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
if
($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection']
== 'popup')
{
$usel = $this->boacl->list_addressmasters();
-
$GLOBALS['phpgw']->template->set_var('accounts_link',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaclmanager.accounts_popup'));
-
$GLOBALS['phpgw']->template->set_var('lang_open_popup',lang('open popup
window'));
-
while(is_array($usel) && list(,$acc) =
each($usel))
{
! $user_list .= '<option value="' .
$acc['account_id'] . '" selected>'
! .
$GLOBALS['phpgw']->common->display_fullname($acc['lid'],$acc['firstname'],$acc['lastname'])
! .
'</option>'."\n";
}
$account_num = count($sel_accounts);
!
$GLOBALS['phpgw']->template->set_var('select_size',($account_num <
7?$account_num:7));
!
$GLOBALS['phpgw']->template->set_var('account_list',$user_list);
!
$GLOBALS['phpgw']->template->fp('accounts','popwin',True);
}
else
{
-
$GLOBALS['phpgw']->template->set_var('lang_select_users',lang('Select users'));
-
$GLOBALS['phpgw']->template->set_var('lang_select_groups',lang('Select
groups'));
-
$app_user =
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'addressbook');
--- 280,312 ----
$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')
{
$usel = $this->boacl->list_addressmasters();
while(is_array($usel) && list(,$acc) =
each($usel))
{
! $user_list[] = array
! (
! 'account_id' =>
$acc['account_id'],
! 'select_value' => 'yes',
! 'fullname' =>
$GLOBALS['phpgw']->common->display_fullname($acc['lid'],$acc['firstname'],$acc['lastname'])
! );
}
$account_num = count($sel_accounts);
!
! $popwin_user = array
! (
! 'url' => "'"
.
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaclmanager.accounts_popup')
. "'",
! 'width' =>
'800',
! 'height' =>
'600',
! 'lang_open_popup' => lang('open
popup window'),
! 'select_size' =>
($account_num < 7?$account_num:7),
! 'user_list' =>
$user_list
! );
}
else
{
$app_user =
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'addressbook');
***************
*** 320,359 ****
for($i=0;$i<count($add_users['users']);$i++)
{
- $user_list .= '<option value="' .
$add_users['users'][$i] . '"';
if (is_array($usel) &&
in_array($add_users['users'][$i],$usel))
{
! $user_list .= ' SELECTED';
}
! $user_list .= '>';
! $user_list .=
$GLOBALS['phpgw']->common->grab_owner_name($add_users['users'][$i])
! . '</option>' . "\n";
}
$add_user_num = count($add_users['users']);
-
$GLOBALS['phpgw']->template->set_var('u_select_size',($add_user_num <
7?$add_user_num:7));
-
$GLOBALS['phpgw']->template->set_var('user_list',$user_list);
for($i=0;$i<count($add_users['groups']);$i++)
{
- $group_list .= '<option value="' .
$add_users['groups'][$i] . '"';
if (is_array($usel) &&
in_array($add_users['groups'][$i],$usel))
{
! $group_list .= ' selected';
}
! $group_list .= '>';
! $group_list .=
$GLOBALS['phpgw']->common->grab_owner_name($add_users['groups'][$i])
! . '</option>' . "\n";
}
$add_group_num = count($add_users['groups']);
-
$GLOBALS['phpgw']->template->set_var('g_select_size',($add_group_num <
7?$add_group_num:7));
-
$GLOBALS['phpgw']->template->set_var('group_list',$group_list);
!
$GLOBALS['phpgw']->template->fp('accounts','select',True);
}
! $GLOBALS['phpgw']->template->set_var('select','');
! $GLOBALS['phpgw']->template->set_var('popwin','');
! $GLOBALS['phpgw']->template->pfp('out','admin_add');
}
}
--- 318,376 ----
for($i=0;$i<count($add_users['users']);$i++)
{
if (is_array($usel) &&
in_array($add_users['users'][$i],$usel))
{
! $select_value = 'yes';
}
!
! $user_list[] = array
! (
! 'account_id' =>
$add_users['users'][$i],
! 'select_value' =>
$select_value,
! 'fullname' =>
$GLOBALS['phpgw']->common->grab_owner_name($add_users['users'][$i])
! );
}
$add_user_num = count($add_users['users']);
for($i=0;$i<count($add_users['groups']);$i++)
{
if (is_array($usel) &&
in_array($add_users['groups'][$i],$usel))
{
! $select_value = 'yes';
}
!
! $group_list[] = array
! (
! 'account_id' =>
$add_users['groups'][$i],
! 'select_value' =>
$select_value,
! 'fullname' =>
$GLOBALS['phpgw']->common->grab_owner_name($add_users['groups'][$i])
! );
}
$add_group_num = count($add_users['groups']);
! $select_user = array
! (
! 'lang_select_users' =>
lang('Select users'),
! 'lang_select_groups' => lang('Select
groups'),
! 'u_select_size' =>
($add_user_num < 7?$add_user_num:7),
! 'g_select_size' =>
($add_group_num < 7?$add_group_num:7),
! 'group_list' =>
$group_list,
! 'user_list'
=> $user_list
! );
}
! $link_data['menuaction'] =
'admin.uiaclmanager.edit_addressmasters';
!
! $data = array
! (
! 'lang_select_addressmasters' => lang('Select
addressmasters'),
! 'lang_save'
=> lang('save'),
! 'lang_cancel'
=> lang('cancel'),
! 'action_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'popwin_user'
=> $popwin_user,
! 'select_user'
=> $select_user
! );
!
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('addressmaster_edit' =>
$data));
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.uiaclmanager.inc.php,1.9,1.10,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] phpgwapi/templates/default default_scripts.js, NONE, 1.1 nextmatchs.tpl, 1.10, 1.11 nextmatchs.xsl, 1.7, 1.8 phpgw.xsl, 1.17, 1.18
- Next by Date:
[Phpgroupware-cvs] admin/templates/default app_data.xsl,1.8,1.9
- Previous by thread:
[Phpgroupware-cvs] phpgwapi/templates/default default_scripts.js, NONE, 1.1 nextmatchs.tpl, 1.10, 1.11 nextmatchs.xsl, 1.7, 1.8 phpgw.xsl, 1.17, 1.18
- Next by thread:
[Phpgroupware-cvs] admin/templates/default app_data.xsl,1.8,1.9
- Index(es):