[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php, 1.22.2.7.2.12, 1
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.boaccounts.inc.php, 1.22.2.7.2.12, 1.22.2.7.2.13 class.boaclmanager.inc.php, 1.2.4.4, 1.2.4.5 class.uiaccounts.inc.php, 1.23.2.9.2.26, 1.23.2.9.2.27 class.uiaclmanager.inc.php, 1.5.2.2.2.5, 1.5.2.2.2.6 |
|
Date: |
Wed, 05 Nov 2003 11:09:31 +0000 |
Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv24577/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boaccounts.inc.php class.boaclmanager.inc.php
class.uiaccounts.inc.php 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.5.2.2.2.5
retrieving revision 1.5.2.2.2.6
diff -C2 -d -r1.5.2.2.2.5 -r1.5.2.2.2.6
*** class.uiaclmanager.inc.php 4 Nov 2003 14:37:30 -0000 1.5.2.2.2.5
--- class.uiaclmanager.inc.php 5 Nov 2003 11:09:27 -0000 1.5.2.2.2.6
***************
*** 265,270 ****
if ($_POST['save'])
{
!
$this->boacl->edit_addressmasters($_POST['account_addressmaster'],$_POST['group_addressmaster']);
!
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
--- 265,278 ----
if ($_POST['save'])
{
! $error =
$this->boacl->check_values($_POST['account_addressmaster'],$_POST['group_addressmaster']);
! if(is_array($error))
! {
!
$GLOBALS['phpgw']->template->set_var('error_message',$GLOBALS['phpgw']->common->error_list($error));
! }
! else
! {
!
$this->boacl->edit_addressmasters($_POST['account_addressmaster'],$_POST['group_addressmaster']);
!
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
! }
}
***************
*** 313,377 ****
$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');
! }
! 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);
--- 321,359 ----
$app_user =
$GLOBALS['phpgw']->acl->get_ids_for_location('run',1,'addressbook');
! $add_users =
$GLOBALS['phpgw']->accounts->return_members($app_user);
$usel = $this->boacl->get_addressmaster_ids();
//_debug_array($usel);
! 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);
Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.23.2.9.2.26
retrieving revision 1.23.2.9.2.27
diff -C2 -d -r1.23.2.9.2.26 -r1.23.2.9.2.27
*** class.uiaccounts.inc.php 3 Nov 2003 20:32:45 -0000 1.23.2.9.2.26
--- class.uiaccounts.inc.php 5 Nov 2003 11:09:27 -0000 1.23.2.9.2.27
***************
*** 30,39 ****
);
! var $bo;
var $nextmatchs;
function uiaccounts()
{
! $this->bo = createobject('admin.boaccounts');
$this->nextmatchs = createobject('phpgwapi.nextmatchs');
@set_time_limit(300);
--- 30,39 ----
);
! var $boaccounts;
var $nextmatchs;
function uiaccounts()
{
! $this->boaccounts = createobject('admin.boaccounts');
$this->nextmatchs = createobject('phpgwapi.nextmatchs');
@set_time_limit(300);
***************
*** 373,377 ****
if ($_POST['yes'])
{
! $this->bo->delete_group();
}
$this->list_groups();
--- 373,377 ----
if ($_POST['yes'])
{
! $this->boaccounts->delete_group();
}
$this->list_groups();
***************
*** 519,524 ****
'account_id' =>
intval($_GET['account_id']),
'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($_GET['account_id']),
! 'account_user' =>
$this->bo->load_group_users($_GET['account_id']),
! 'account_apps' =>
$this->bo->load_group_apps($_GET['account_id'])
);
--- 519,524 ----
'account_id' =>
intval($_GET['account_id']),
'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($_GET['account_id']),
! 'account_user' =>
$this->boaccounts->load_group_users($_GET['account_id']),
! 'account_apps' =>
$this->boaccounts->load_group_apps($_GET['account_id'])
);
***************
*** 789,793 ****
'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($_GET['account_id']),
'account_user' =>
$GLOBALS['phpgw']->accounts->member($_GET['account_id']),
! 'account_managers' =>
$this->bo->load_group_managers($_GET['account_id'])
);
--- 789,793 ----
'account_name' =>
$GLOBALS['phpgw']->accounts->id2name($_GET['account_id']),
'account_user' =>
$GLOBALS['phpgw']->accounts->member($_GET['account_id']),
! 'account_managers' =>
$this->boaccounts->load_group_managers($_GET['account_id'])
);
***************
*** 1130,1138 ****
if($_account_id)
{
! $referer =
$GLOBALS['phpgw']->link('/index.php',
!
'menuaction=admin.uiaccounts.edit_user&account_id='.$_account_id);
! $owner =
$GLOBALS['phpgw_info']['server']['addressmaster'];
! $grants =
$GLOBALS['phpgw']->acl->get_grants('addressbook');
! if (!!($grants[$owner] & PHPGW_ACL_EDIT) ||
$GLOBALS['phpgw']->acl->check('addressmaster', 7, 'addressbook'))
{
if($userData['person_id'])
--- 1130,1140 ----
if($_account_id)
{
! $referer =
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_user&account_id='
. $_account_id);
!
! $add_masters =
$this->boaccounts->get_addressmaster_ids();
! $add_users =
$GLOBALS['phpgw']->accounts->return_members($add_masters);
! $masters = $add_users['users'];
!
! if (is_array($masters) &&
in_array($GLOBALS['phpgw_info']['user']['account_id'],$masters))
{
if($userData['person_id'])
***************
*** 1154,1158 ****
$addressbook_label = 'You do not have
edit access to addressmaster contacts';
$edit_entry =
$GLOBALS['phpgw']->link('/index.php', array(
!
'menuaction' => 'admin.uiaclmanager.edit_accountmasters',
'account_id' => $GLOBALS['phpgw_info']['user']['account_id'],
'referer' => rawurlencode($referer)));
--- 1156,1160 ----
$addressbook_label = 'You do not have
edit access to addressmaster contacts';
$edit_entry =
$GLOBALS['phpgw']->link('/index.php', array(
!
'menuaction' => 'admin.uiaclmanager.edit_addressmasters',
'account_id' => $GLOBALS['phpgw_info']['user']['account_id'],
'referer' => rawurlencode($referer)));
Index: class.boaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.22.2.7.2.12
retrieving revision 1.22.2.7.2.13
diff -C2 -d -r1.22.2.7.2.12 -r1.22.2.7.2.13
*** class.boaccounts.inc.php 26 Oct 2003 03:24:41 -0000 1.22.2.7.2.12
--- class.boaccounts.inc.php 5 Nov 2003 11:09:26 -0000 1.22.2.7.2.13
***************
*** 9,13 ****
* option) any later version.
*
\**************************************************************************/
-
/* $Id$ */
--- 9,12 ----
***************
*** 969,972 ****
--- 968,976 ----
}
return $result;
+ }
+
+ function get_addressmaster_ids()
+ {
+ return
$GLOBALS['phpgw']->acl->get_ids_for_location('addressmaster',7,'addressbook');
}
}
Index: class.boaclmanager.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaclmanager.inc.php,v
retrieving revision 1.2.4.4
retrieving revision 1.2.4.5
diff -C2 -d -r1.2.4.4 -r1.2.4.5
*** class.boaclmanager.inc.php 4 Nov 2003 14:37:29 -0000 1.2.4.4
--- class.boaclmanager.inc.php 5 Nov 2003 11:09:27 -0000 1.2.4.5
***************
*** 69,74 ****
}
! function check_values()
{
}
--- 69,82 ----
}
! function check_values($users = 0, $groups = 0)
{
+ if(!is_array($users) && !is_array($groups))
+ {
+ $error[] = lang('please choose at least one
addressmaster');
+ }
+ if (is_array($error))
+ {
+ return $error;
+ }
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.boaccounts.inc.php, 1.22.2.7.2.12, 1.22.2.7.2.13 class.boaclmanager.inc.php, 1.2.4.4, 1.2.4.5 class.uiaccounts.inc.php, 1.23.2.9.2.26, 1.23.2.9.2.27 class.uiaclmanager.inc.php, 1.5.2.2.2.5, 1.5.2.2.2.6,
Bettina Gille <address@hidden> <=