[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.boaclmanager.inc.php, 1.2.4.2, 1.2.4.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.boaclmanager.inc.php, 1.2.4.2, 1.2.4.3 class.uiaclmanager.inc.php, 1.5.2.2.2.3, 1.5.2.2.2.4 hook_admin.inc.php, 1.26.2.1.2.6, 1.26.2.1.2.7 |
|
Date: |
Tue, 28 Oct 2003 13:44:23 +0000 |
Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv1608/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boaclmanager.inc.php class.uiaclmanager.inc.php
hook_admin.inc.php
Log Message:
addressmaster
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_admin.inc.php,v
retrieving revision 1.26.2.1.2.6
retrieving revision 1.26.2.1.2.7
diff -C2 -d -r1.26.2.1.2.6 -r1.26.2.1.2.7
*** hook_admin.inc.php 23 Oct 2003 15:26:36 -0000 1.26.2.1.2.6
--- hook_admin.inc.php 28 Oct 2003 13:44:20 -0000 1.26.2.1.2.7
***************
*** 24,28 ****
if (! $GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
{
! $file['account | contact master'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaclmanager.list_accountmasters&account_id='
. $GLOBALS['phpgw_info']['user']['account_id']);
}
--- 24,28 ----
if (! $GLOBALS['phpgw']->acl->check('account_access',1,'admin'))
{
! $file['addressmasters'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaclmanager.list_addressmasters&account_id='
. $GLOBALS['phpgw_info']['user']['account_id']);
}
Index: class.uiaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaclmanager.inc.php,v
retrieving revision 1.5.2.2.2.3
retrieving revision 1.5.2.2.2.4
diff -C2 -d -r1.5.2.2.2.3 -r1.5.2.2.2.4
*** class.uiaclmanager.inc.php 26 Oct 2003 03:24:42 -0000 1.5.2.2.2.3
--- class.uiaclmanager.inc.php 28 Oct 2003 13:44:20 -0000 1.5.2.2.2.4
***************
*** 19,30 ****
'list_apps' => True,
'access_form' => True,
! 'account_list' => True,
! 'list_accountmasters' => True,
! 'edit_accountmasters' => True
);
function uiaclmanager()
{
! $this->account_id = intval($_GET['account_id']);
if (!$this->account_id ||
$GLOBALS['phpgw']->acl->check('account_access',64,'admin'))
--- 19,30 ----
'list_apps' => True,
'access_form' => True,
! 'list_addressmasters' => True,
! 'edit_addressmasters' => True,
! 'accounts_popup' => True
);
function uiaclmanager()
{
! $this->account_id =
(intval($_GET['account_id'])?intval($_GET['account_id']):$GLOBALS['phpgw_info']['user']['account_id']);
if (!$this->account_id ||
$GLOBALS['phpgw']->acl->check('account_access',64,'admin'))
***************
*** 163,171 ****
}
! function list_accountmasters()
{
$link_data = array
(
! 'menuaction' =>
'admin.uiaclmanager.edit_accountmasters',
'account_id' =>
$GLOBALS['phpgw_info']['user']['account_id']
);
--- 163,171 ----
}
! function list_addressmasters()
{
$link_data = array
(
! 'menuaction' =>
'admin.uiaclmanager.edit_addressmasters',
'account_id' =>
$GLOBALS['phpgw_info']['user']['account_id']
);
***************
*** 181,185 ****
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('admin') . ': ' . lang('list accountmasters');
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 181,185 ----
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('admin') . ': ' . lang('list addressmasters');
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 194,198 ****
$GLOBALS['phpgw']->template->set_var('lang_edit',lang('edit'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
! $admins = $this->boacl->list_accountmasters();
//_debug_array($admins);
--- 194,198 ----
$GLOBALS['phpgw']->template->set_var('lang_edit',lang('edit'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
! $admins = $this->boacl->list_addressmasters();
//_debug_array($admins);
***************
*** 206,210 ****
(
'lid' => $admin['lid'],
!
'firstname' => $admin['firstname'],
'lastname' => $admin['lastname'])
);
--- 206,210 ----
(
'lid' => $admin['lid'],
!
'firstname'=> $admin['firstname'],
'lastname' => $admin['lastname'])
);
***************
*** 221,229 ****
}
! function edit_accountmasters()
{
$link_data = array
(
! 'menuaction' =>
'admin.uiaclmanager.list_accountmasters',
'account_id' =>
$GLOBALS['phpgw_info']['user']['account_id']
);
--- 221,229 ----
}
! function edit_addressmasters()
{
$link_data = array
(
! 'menuaction' =>
'admin.uiaclmanager.list_addressmasters',
'account_id' =>
$GLOBALS['phpgw_info']['user']['account_id']
);
***************
*** 231,235 ****
if ($_POST['save'])
{
!
$this->boacl->edit_accountmasters($_POST['account_addressmaster'],
$_POST['account_user']);
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
--- 231,235 ----
if ($_POST['save'])
{
!
$this->boacl->edit_addressmasters($_POST['account_addressmaster']);
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
***************
*** 240,244 ****
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('admin') . ': ' . lang('edit accountmaster list');
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 240,244 ----
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('admin') . ': ' . lang('edit addressmaster list');
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 248,261 ****
$GLOBALS['phpgw']->template->set_block('admin_add','popwin');
!
$GLOBALS['phpgw']->template->set_var('lang_set_accountmaster',lang('Set
accountmaster'));
!
$GLOBALS['phpgw']->template->set_var('lang_select_accountmasters',lang('Select
accountmasters list'));
$GLOBALS['phpgw']->template->set_var('lang_save',lang('save'));
$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('cancel'));
! $link_data['menuaction'] =
'admin.uiaclmanager.edit_accountmasters';
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
! $sel_accounts = $this->boacl->list_accountmasters();
if
($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection']
== 'popup')
{
--- 248,261 ----
$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));
! $sel_accounts = $this->boacl->list_addressmasters();
+ //_debug_array($sel_accounts);
if
($GLOBALS['phpgw_info']['user']['preferences']['common']['account_selection']
== 'popup')
{
***************
*** 270,294 ****
}
$account_num = count($sel_accounts);
!
$GLOBALS['phpgw']->template->set_var('select_size',($account_num <
25?$account_num:25));
!
$GLOBALS['phpgw']->template->set_var('user_list',$user_list);
$GLOBALS['phpgw']->template->fp('accounts','popwin',True);
}
else
{
! $account_list =
$GLOBALS['phpgw']->accounts->get_list('accounts');
! $account_num = count($account_list);
$addressmaster =
$GLOBALS['phpgw_info']['server']['addressmaster'];
- $user_list = '';
- $user_list =
$this->get_select_user_list($account_list, array($addressmaster));
-
$GLOBALS['phpgw']->template->set_var('select_size',($account_num <
7?$account_num:7));
-
$GLOBALS['phpgw']->template->set_var('user_list',$user_list);
! $admins = $this->boacl->list_accountmasters();
! $user_list =
$this->get_select_user_list($account_list, array_keys($admins));
$GLOBALS['phpgw']->template->set_var('account_list',$user_list);
! $select =
$GLOBALS['phpgw']->template->fp('out','select', True);
!
$GLOBALS['phpgw']->template->set_var('accounts', $select);
!
//$GLOBALS['phpgw']->template->fp('admin_add','accounts',True);
}
--- 270,321 ----
}
$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
{
! $app_user =
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'addressbook');
! for ($i = 0;$i<count($app_user);$i++)
! {
! $type =
$GLOBALS['phpgw']->accounts->get_type($app_user[$i]);
! if($type == 'g')
! {
! //$app_groups[] = $app_user[$i];
! $members[] =
$GLOBALS['phpgw']->acl->get_ids_for_location($app_user[$i],1,'phpgw_group');
! unset($app_user[$i]);
! }
! }
!
! $i = count($app_user);
! while(is_array($members) && list(,$mem) =
each($members))
! {
! for($j=0;$j<count($mem);$j++)
! {
! $app_user[$i] = $mem[$j];
! $i++;
! }
! }
+ $account_num = count($app_user);
+
+ //_debug_array($app_user);
$addressmaster =
$GLOBALS['phpgw_info']['server']['addressmaster'];
! for($i=0;$i<count($app_user);$i++)
! {
! $user_list .= '<option value="' .
$app_user[$i] . '"';
! if ($app_user[$i] == $addressmaster)
! {
! $user_list .= ' selected';
! }
! $user_list .= '>';
! $user_list .=
$GLOBALS['phpgw']->common->grab_owner_name($app_user[$i])
! . '</option>' . "\n";
! }
!
!
$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','select',True);
}
Index: class.boaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaclmanager.inc.php,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -C2 -d -r1.2.4.2 -r1.2.4.3
*** class.boaclmanager.inc.php 26 Oct 2003 03:24:41 -0000 1.2.4.2
--- class.boaclmanager.inc.php 28 Oct 2003 13:44:19 -0000 1.2.4.3
***************
*** 44,68 ****
}
! function list_accountmasters()
{
! $acc = $GLOBALS['phpgw']->acl->get_location_list_for_id(
'addressbook',
PHPGW_ACL_READ +
PHPGW_ACL_ADD +
PHPGW_ACL_EDIT,
!
$GLOBALS['phpgw_info']['server']['addressmaster']);
- $data = array();
//_debug_array($acc);
while(is_array($acc) && list(,$val) = each($acc))
{
! if(intval($val))
{
! $acc_name =
$GLOBALS['phpgw']->accounts->get_account_data($val);
! $data[$val] = array(
! 'account_id' => $val,
! 'lid' =>
$acc_name[$val]['lid'],
! 'firstname' =>
$acc_name[$val]['firstname'],
! 'lastname' =>
$acc_name[$val]['lastname']
);
}
--- 44,69 ----
}
! function list_addressmasters()
{
! /*$acc =
$GLOBALS['phpgw']->acl->get_location_list_for_id(
'addressbook',
PHPGW_ACL_READ +
PHPGW_ACL_ADD +
PHPGW_ACL_EDIT,
!
$GLOBALS['phpgw_info']['server']['addressmaster']);*/
!
! $acc =
$GLOBALS['phpgw']->acl->read_specific(array('acl_location' => 'addressmaster'));
//_debug_array($acc);
while(is_array($acc) && list(,$val) = each($acc))
{
! if(intval($val['account']))
{
! $acc_name =
$GLOBALS['phpgw']->accounts->get_account_data($val['account']);
! $data[] = array(
! 'account_id' =>
$val['account'],
! 'lid' =>
$acc_name[$val['account']]['lid'],
! 'firstname' =>
$acc_name[$val['account']]['firstname'],
! 'lastname' =>
$acc_name[$val['account']]['lastname']
);
}
***************
*** 72,81 ****
}
-
- function get_acl_accounts()
- {
- $GLOBALS['phpgw']->acl->read_specific(array('type' =>
'account','acl_location' => 'accountmaster'));
- }
-
function set_addressmaster($master)
{
--- 73,76 ----
***************
*** 85,93 ****
}
! function edit_accountmasters($master, $values)
{
// One addressmaster es required for owner field on
contacts records.
// This is the master.
! if(intval($master) < 1)
{
return;
--- 80,90 ----
}
! function edit_addressmasters($master)
{
// One addressmaster es required for owner field on
contacts records.
// This is the master.
! // we have to provide the possibility to have more than
one or a group as addressmaster (ceb)
!
! if(!is_array($master))
{
return;
***************
*** 95,100 ****
$old_master =
$GLOBALS['phpgw_info']['server']['addressmaster'];
- $this->set_addressmaster($master);
-
$acc = $GLOBALS['phpgw']->acl->get_location_list_for_id(
'addressbook',
--- 92,95 ----
***************
*** 103,123 ****
PHPGW_ACL_EDIT,
$old_master);
!
while(is_array($acc) && list(,$location) = each($acc))
{
$GLOBALS['phpgw']->acl->delete_repository('addressbook', $location,
$old_master);
}
!
! if(is_array($values))
{
! foreach($values as $account)
! {
!
$GLOBALS['phpgw']->acl->add_repository('addressbook',
!
$account,
!
$master,
!
PHPGW_ACL_READ +
!
PHPGW_ACL_ADD +
!
PHPGW_ACL_EDIT);
! }
}
}
--- 98,116 ----
PHPGW_ACL_EDIT,
$old_master);
!
while(is_array($acc) && list(,$location) = each($acc))
{
$GLOBALS['phpgw']->acl->delete_repository('addressbook', $location,
$old_master);
}
!
! if(is_array($master) && list(,$account) = each($master))
{
! $this->set_addressmaster($account);
!
$GLOBALS['phpgw']->acl->add_repository('addressbook',
!
'addressmaster',
!
$account,
!
PHPGW_ACL_READ +
!
PHPGW_ACL_ADD +
!
PHPGW_ACL_EDIT);
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.boaclmanager.inc.php, 1.2.4.2, 1.2.4.3 class.uiaclmanager.inc.php, 1.5.2.2.2.3, 1.5.2.2.2.4 hook_admin.inc.php, 1.26.2.1.2.6, 1.26.2.1.2.7,
Bettina Gille <address@hidden> <=