[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php,1.6,1.7 class.b
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php,1.6,1.7 class.boadmin.inc.php,1.8,1.9 |
Date: |
Thu, 03 Jul 2003 17:53:12 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv21474/inc
Modified Files:
class.acl2.inc.php class.boadmin.inc.php
Log Message:
no message
Index: class.acl2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.acl2.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.acl2.inc.php 3 Jul 2003 09:40:41 -0000 1.6
--- class.acl2.inc.php 3 Jul 2003 21:53:10 -0000 1.7
***************
*** 168,184 ****
$expected_args[2] =
Array('name'=>'account_id','default'=>$this->account_id, 'type'=>'number');
$expected_args[3] =
Array('name'=>'app_id','default'=>$this->app_id, 'type'=>'number');
$recieved_args = func_get_args();
$args = safe_args($expected_args,
$recieved_args,__LINE__,__FILE__);
! $memberships =
$GLOBALS['phpgw']->accounts->membership($args['account_id']);
!
! while (is_array($memberships) && list(,$account) =
each($memberships))
{
! $member_of[] = $account['account_id'];
! }
! if($member_of)
! {
! $this->memberships_sql = ',' .
@implode(",",$member_of);
}
--- 168,188 ----
$expected_args[2] =
Array('name'=>'account_id','default'=>$this->account_id, 'type'=>'number');
$expected_args[3] =
Array('name'=>'app_id','default'=>$this->app_id, 'type'=>'number');
+ $expected_args[4] =
Array('name'=>'no_membership','default'=>false, 'type'=>'number');
$recieved_args = func_get_args();
$args = safe_args($expected_args,
$recieved_args,__LINE__,__FILE__);
! if(!$args['no_membership'])
{
! $memberships =
$GLOBALS['phpgw']->accounts->membership($args['account_id']);
! while (is_array($memberships) &&
list(,$account) = each($memberships))
! {
! $member_of[] = $account['account_id'];
! }
!
! if($member_of)
! {
! $this->memberships_sql = ',' .
@implode(",",$member_of);
! }
}
Index: class.boadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boadmin.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.boadmin.inc.php 3 Jul 2003 09:40:41 -0000 1.8
--- class.boadmin.inc.php 3 Jul 2003 21:53:10 -0000 1.9
***************
*** 23,26 ****
--- 23,27 ----
$this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
$this->right = array(1,2,4,8,16,32,64,128);
+ $this->app_id
=$GLOBALS['phpgw']->applications->data[$GLOBALS['phpgw_info']['flags']['currentapp']]['id'];
if ($session)
***************
*** 275,279 ****
for ($i=0;$i<count($right);$i++)
{
!
if($this->acl2->check($this->location, $right[$i],$account['account_id']))
{
$user_list[$j]['right'][$right[$i]] = 'checked';
--- 276,280 ----
for ($i=0;$i<count($right);$i++)
{
!
if($this->acl2->check($this->location,
$right[$i],$account['account_id'],$this->app_id,True))
{
$user_list[$j]['right'][$right[$i]] = 'checked';
***************
*** 285,289 ****
}
! //_debug_array($users);
if(is_array($users))
{
--- 286,290 ----
}
! //_debug_array($this->app_id);
if(is_array($users))
{
***************
*** 299,303 ****
for ($i=0;$i<count($right);$i++)
{
!
if($this->acl2->check($this->location, $right[$i],$account['account_id']))
{
$user_list[$j]['right'][$right[$i]] = 'checked';
--- 300,304 ----
for ($i=0;$i<count($right);$i++)
{
!
if($this->acl2->check($this->location,
$right[$i],$account['account_id'],$this->app_id,True))
{
$user_list[$j]['right'][$right[$i]] = 'checked';
***************
*** 329,333 ****
for ($i=0;$i<count($right);$i++)
{
!
if($this->acl2->check($this->location, $right[$i],$account['account_id']))
{
$user_list[$j]['right'][$right[$i]] = 'checked';
--- 330,334 ----
for ($i=0;$i<count($right);$i++)
{
!
if($this->acl2->check($this->location,
$right[$i],$account['account_id'],$this->app_id,True))
{
$user_list[$j]['right'][$right[$i]] = 'checked';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php,1.6,1.7 class.boadmin.inc.php,1.8,1.9,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default admin.xsl,1.8,1.9
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc class.bogab.inc.php,1.7,1.8 class.botts.inc.php,1.14,1.15class.soadmin_location.inc.php,1.14,1.15 class.sogab.inc.php,1.11,1.12 class.sotts.inc.php,1.22,1.23 class.uigab.inc.php,1.10,1.11 class.uitts.inc.php,1.32,1.33
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default admin.xsl,1.8,1.9
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc class.bogab.inc.php,1.7,1.8 class.botts.inc.php,1.14,1.15class.soadmin_location.inc.php,1.14,1.15 class.sogab.inc.php,1.11,1.12 class.sotts.inc.php,1.22,1.23 class.uigab.inc.php,1.10,1.11 class.uitts.inc.php,1.32,1.33
- Index(es):