[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.3, 1.2.4.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.boaclmanager.inc.php, 1.2.4.3, 1.2.4.4 class.uiaclmanager.inc.php, 1.5.2.2.2.4, 1.5.2.2.2.5 |
|
Date: |
Tue, 04 Nov 2003 14:37:33 +0000 |
Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv6665/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boaclmanager.inc.php class.uiaclmanager.inc.php
Log Message:
finished addressmaster
Index: class.uiaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaclmanager.inc.php,v
retrieving revision 1.5.2.2.2.4
retrieving revision 1.5.2.2.2.5
diff -C2 -d -r1.5.2.2.2.4 -r1.5.2.2.2.5
*** class.uiaclmanager.inc.php 28 Oct 2003 13:44:20 -0000 1.5.2.2.2.4
--- class.uiaclmanager.inc.php 4 Nov 2003 14:37:30 -0000 1.5.2.2.2.5
***************
*** 186,190 ****
$GLOBALS['phpgw']->template->set_file(array('admin_list_t' =>
'list_accountmasters.tpl'));
!
$GLOBALS['phpgw']->template->set_block('admin_list_t','admin_list','list');
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
--- 186,192 ----
$GLOBALS['phpgw']->template->set_file(array('admin_list_t' =>
'list_accountmasters.tpl'));
!
$GLOBALS['phpgw']->template->set_block('admin_list_t','user_list','list');
!
$GLOBALS['phpgw']->template->set_block('admin_list_t','group_list','glist');
!
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
***************
*** 192,216 ****
$GLOBALS['phpgw']->template->set_var('sort_firstname',lang('firstname'));
$GLOBALS['phpgw']->template->set_var('sort_lastname',lang('lastname'));
$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);
if(is_array($admins))
{
foreach($admins as $admin)
{
!
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
!
$GLOBALS['phpgw']->template->set_var(array
! (
!
'lid' => $admin['lid'],
!
'firstname'=> $admin['firstname'],
!
'lastname' => $admin['lastname'])
! );
!
$GLOBALS['phpgw']->template->fp('list','admin_list',True);
}
}
$GLOBALS['phpgw']->template->pfp('out','admin_list_t',True);
}
--- 194,250 ----
$GLOBALS['phpgw']->template->set_var('sort_firstname',lang('firstname'));
$GLOBALS['phpgw']->template->set_var('sort_lastname',lang('lastname'));
+
$GLOBALS['phpgw']->template->set_var('sort_name',lang('name'));
$GLOBALS['phpgw']->template->set_var('lang_edit',lang('edit'));
$GLOBALS['phpgw']->template->set_var('lang_done',lang('done'));
+
$GLOBALS['phpgw']->template->set_var('lang_users',lang('users'));
+
$GLOBALS['phpgw']->template->set_var('lang_groups',lang('groups'));
+
$admins = $this->boacl->list_addressmasters();
//_debug_array($admins);
+
if(is_array($admins))
{
foreach($admins as $admin)
{
! if ($admin['lastname'] != 'Group')
! {
!
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
!
$GLOBALS['phpgw']->template->set_var(array
!
(
!
'lid' => $admin['lid'],
!
'firstname'=> $admin['firstname'],
!
'lastname' => $admin['lastname'])
! );
!
$GLOBALS['phpgw']->template->fp('list','user_list',True);
! }
}
}
+
+ $gadmins = $this->boacl->list_addressmasters(8);
+
+ if(is_array($gadmins))
+ {
+ foreach($gadmins as $gadmin)
+ {
+ if ($gadmin['lastname'] == 'Group')
+ {
+
$this->nextmatchs->template_alternate_row_color(&$GLOBALS['phpgw']->template);
+
+
$GLOBALS['phpgw']->template->set_var(array
+
(
+
'lid' => $gadmin['lid'],
+
'firstname'=> $gadmin['firstname'],
+
'lastname' => $gadmin['lastname'])
+ );
+
$GLOBALS['phpgw']->template->fp('glist','group_list',True);
+ }
+ }
+ }
+
+
+
$GLOBALS['phpgw']->template->pfp('out','admin_list_t',True);
}
***************
*** 231,235 ****
if ($_POST['save'])
{
!
$this->boacl->edit_addressmasters($_POST['account_addressmaster']);
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
--- 265,269 ----
if ($_POST['save'])
{
!
$this->boacl->edit_addressmasters($_POST['account_addressmaster'],$_POST['group_addressmaster']);
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
***************
*** 255,267 ****
$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')
{
$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($sel_accounts) && list(,$acc) =
each($sel_accounts))
{
$user_list .= '<option value="' .
$acc['account_id'] . '" selected>'
--- 289,299 ----
$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>'
***************
*** 276,280 ****
--- 308,316 ----
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');
+
for ($i = 0;$i<count($app_user);$i++)
{
***************
*** 282,320 ****
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);
}
--- 318,379 ----
if($type == 'g')
{
! $app_groups[] = $app_user[$i];
$members[] =
$GLOBALS['phpgw']->acl->get_ids_for_location($app_user[$i],1,'phpgw_group');
! }
! else
! {
! $add_users[] = $app_user[$i];
}
}
! //reset($app_user);
! $i = count($add_users);
!
while(is_array($members) && list(,$mem) =
each($members))
{
for($j=0;$j<count($mem);$j++)
{
! $add_users[$i] = $mem[$j];
$i++;
}
}
+ //_debug_array($add_users);
! $add_user_num = count($add_users);
!
! $usel = $this->boacl->get_addressmaster_ids();
! //_debug_array($usel);
! for($i=0;$i<count($add_users);$i++)
{
! $user_list .= '<option value="' .
$add_users[$i] . '"';
! if (is_array($usel) &&
in_array($add_users[$i],$usel))
{
! $user_list .= ' SELECTED';
}
$user_list .= '>';
! $user_list .=
$GLOBALS['phpgw']->common->grab_owner_name($add_users[$i])
. '</option>' . "\n";
}
!
$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);
!
! $gsel = $this->boacl->get_addressmaster_ids();
! for($i=0;$i<count($app_groups);$i++)
! {
! $group_list .= '<option value="' .
$app_groups[$i] . '"';
! if (is_array($gsel) &&
in_array($app_groups[$i],$usel))
! {
! $group_list .= ' selected';
! }
! $group_list .= '>';
! $group_list .=
$GLOBALS['phpgw']->common->grab_owner_name($app_groups[$i])
! . '</option>' . "\n";
! }
!
!
$GLOBALS['phpgw']->template->set_var('g_select_size',($app_group_num <
7?$app_group_num:7));
!
$GLOBALS['phpgw']->template->set_var('group_list',$group_list);
!
$GLOBALS['phpgw']->template->fp('accounts','select',True);
}
***************
*** 323,355 ****
$GLOBALS['phpgw']->template->set_var('popwin','');
$GLOBALS['phpgw']->template->pfp('out','admin_add');
- }
-
- function get_select_user_list($user_list, $options=array())
- {
- if(!is_array($options))
- {
- $options=array();
- }
-
- foreach($user_list as $entry)
- {
- if(in_array($entry['account_id'], $options))
- {
- $selected = 'selected';
- }
- else
- {
- $selected = '';
- }
-
- $user_list .= '<option value="' .
$entry['account_id'] . '"'
- . $selected . '>'
- .
$GLOBALS['phpgw']->common->display_fullname(
- $entry['account_lid'],
- $entry['account_firstname'],
- $entry['account_lastname'])
- . '</option>'."\n";
- }
- return $user_list;
}
}
--- 382,385 ----
Index: class.boaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaclmanager.inc.php,v
retrieving revision 1.2.4.3
retrieving revision 1.2.4.4
diff -C2 -d -r1.2.4.3 -r1.2.4.4
*** class.boaclmanager.inc.php 28 Oct 2003 13:44:19 -0000 1.2.4.3
--- class.boaclmanager.inc.php 4 Nov 2003 14:37:29 -0000 1.2.4.4
***************
*** 44,116 ****
}
! 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']
);
- }
}
$this->total = count($data);
return $data;
}
! function set_addressmaster($master)
{
- // maybe:
- // $contacts->set_addressmaster($master) or
- $GLOBALS['phpgw']->accounts->set_addressmaster($master);
}
! 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;
! }
! $old_master =
$GLOBALS['phpgw_info']['server']['addressmaster'];
!
! $acc = $GLOBALS['phpgw']->acl->get_location_list_for_id(
! 'addressbook',
! PHPGW_ACL_READ +
! PHPGW_ACL_ADD +
! 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);
}
}
--- 44,88 ----
}
! function get_addressmaster_ids()
{
! return
$GLOBALS['phpgw']->acl->get_ids_for_location('addressmaster',7,'addressbook');
! }
! function list_addressmasters($rights=7)
! {
! $admins = $this->get_addressmaster_ids($rights);
! //_debug_array($admins);
! for($i=0;$i<count($admins);$i++)
{
! $acc_name =
$GLOBALS['phpgw']->accounts->get_account_data($admins[$i]);
! $data[] = array(
! 'account_id' => $admins[$i],
! 'lid' =>
$acc_name[$admins[$i]]['lid'],
! 'firstname' =>
$acc_name[$admins[$i]]['firstname'],
! 'lastname' =>
$acc_name[$admins[$i]]['lastname']
);
}
+
$this->total = count($data);
return $data;
}
! function check_values()
{
}
! function edit_addressmasters($master,$group = 0)
{
!
$GLOBALS['phpgw']->acl->delete_repository('addressbook','addressmaster',False);
! for($i=0;$i<count($master);$i++)
{
!
$GLOBALS['phpgw']->acl->add_repository('addressbook',
'addressmaster',$master[$i],7);
}
! for($i=0;$i<count($group);$i++)
{
!
$GLOBALS['phpgw']->acl->add_repository('addressbook',
'addressmaster',$group[$i],7);
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.boaclmanager.inc.php, 1.2.4.3, 1.2.4.4 class.uiaclmanager.inc.php, 1.5.2.2.2.4, 1.5.2.2.2.5,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] phpgwapi/inc class.acl.inc.php, 1.65.4.8, 1.65.4.9
- Next by Date:
[Phpgroupware-cvs] admin/templates/default form_accountmasters.tpl, 1.1.2.3, 1.1.2.4 list_accountmasters.tpl, 1.1.2.1, 1.1.2.2
- Previous by thread:
[Phpgroupware-cvs] phpgwapi/inc class.acl.inc.php, 1.65.4.8, 1.65.4.9
- Next by thread:
[Phpgroupware-cvs] admin/templates/default form_accountmasters.tpl, 1.1.2.3, 1.1.2.4 list_accountmasters.tpl, 1.1.2.1, 1.1.2.2
- Index(es):