[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.8, 1.9 class.
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php, 1.8, 1.9 class.soequipment.inc.php, 1.22, 1.23 class.solocation.inc.php, 1.21, 1.22 class.uitemplate.inc.php, 1.11, 1.12 |
|
Date: |
Fri, 11 Jul 2003 07:03:56 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv15344/inc
Modified Files:
class.acl2.inc.php class.soequipment.inc.php
class.solocation.inc.php class.uitemplate.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.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.acl2.inc.php 10 Jul 2003 21:11:38 -0000 1.8
--- class.acl2.inc.php 11 Jul 2003 11:03:53 -0000 1.9
***************
*** 559,572 ****
$app_id =
$GLOBALS['phpgw']->applications->data[$app]['id'];
! $sql = "select acl_account, acl_rights from fm_acl2
where acl_appid = $app_id AND acl_type=0 and acl_location = '$location' and "
! . " owner_id in ";
! $security = "('". $this->account_id ."'";
$myaccounts = CreateObject('phpgwapi.accounts');
$my_memberships =
$myaccounts->membership($this->account_id);
unset($myaccounts);
@reset($my_memberships);
while($my_memberships && list($key,$group) =
each($my_memberships))
{
! $security .= ",'" . $group['account_id'] . "'";
}
$security .= ')';
--- 559,573 ----
$app_id =
$GLOBALS['phpgw']->applications->data[$app]['id'];
! $sql = "select owner_id as acl_account, acl_rights from
fm_acl2 where acl_appid = $app_id AND acl_type=0 and acl_location =
'$location' AND owner_id is NOT NULL AND"
! . " fm_acl2.acl_account in ";
! $security = "(". $this->account_id ."";
$myaccounts = CreateObject('phpgwapi.accounts');
$my_memberships =
$myaccounts->membership($this->account_id);
+
unset($myaccounts);
@reset($my_memberships);
while($my_memberships && list($key,$group) =
each($my_memberships))
{
! $security .= "," . $group['account_id'];
}
$security .= ')';
***************
*** 584,617 ****
$rights = $this->db2->f('acl_rights');
! if(!isset($accounts[$grantor]))
! // cache the group-members for performance
! {
! // if $grantor is a group, get its
members
! $members =
$this->get_ids_for_location($grantor,1,1,$location);
! if(!$members)
! {
! $accounts[$grantor] =
Array($grantor);
! $is_group[$grantor] = False;
! }
! else
! {
! $accounts[$grantor] = $members;
! $is_group[$grantor] = True;
! }
! }
! if(@$is_group[$grantor])
! {
! // Don't allow to override private!
! $rights &= (~ PHPGW_ACL_PRIVATE);
! if(!isset($grants[$grantor]))
! {
! $grants[$grantor] = 0;
! }
! $grants[$grantor] |= $rights;
! if(!!($rights & PHPGW_ACL_READ))
! {
! $grants[$grantor] |=
PHPGW_ACL_READ;
! }
! }
while(list($nul,$grantors) =
each($accounts[$grantor]))
{
--- 585,590 ----
$rights = $this->db2->f('acl_rights');
! $accounts[$grantor] = Array($grantor);
!
while(list($nul,$grantors) =
each($accounts[$grantor]))
{
***************
*** 626,657 ****
$grants[$GLOBALS['phpgw_info']['user']['account_id']] =
31;
return $grants;
- }
-
- function get_ids_for_location($owner_id, $required, $app_id =
False,$location='')
- {
- if ($app == False)
- {
- $app =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $app_id =
$GLOBALS['phpgw']->applications->data[$app]['id'];
- }
- $sql = "select acl_account, acl_rights from fm_acl2
where acl_appid = $app_id AND acl_location= '$location' and ";
- $sql .= "owner_id = '".$owner_id."'";
- $this->db->query($sql ,__LINE__,__FILE__);
- $rights = 0;
- if ($this->db->num_rows() == 0 )
- {
- return False;
- }
- while ($this->db->next_record())
- {
- $rights = 0;
- $rights |= $this->db->f('acl_rights');
- if (!!($rights & $required) == True)
- {
- $accounts[] =
intval($this->db->f('acl_account'));
- }
- }
- @reset($accounts);
- return $accounts;
}
--- 599,602 ----
Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.soequipment.inc.php 9 Jul 2003 11:12:16 -0000 1.22
--- class.soequipment.inc.php 11 Jul 2003 11:03:53 -0000 1.23
***************
*** 122,126 ****
if ($order)
{
! $ordermethod = " order by $order $sort";
}
else
--- 122,126 ----
if ($order)
{
! $ordermethod = " order by fm_equipment.$order
$sort";
}
else
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.solocation.inc.php 10 Jul 2003 21:11:38 -0000 1.21
--- class.solocation.inc.php 11 Jul 2003 11:03:53 -0000 1.22
***************
*** 26,30 ****
$this->join = $this->socommon->join;
$this->left_join = $this->socommon->left_join;
! _debug_array($this->grants);
}
--- 26,30 ----
$this->join = $this->socommon->join;
$this->left_join = $this->socommon->left_join;
! //_debug_array($this->grants);
}
Index: class.uitemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitemplate.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uitemplate.inc.php 9 Jun 2003 20:48:40 -0000 1.11
--- class.uitemplate.inc.php 11 Jul 2003 11:03:53 -0000 1.12
***************
*** 121,125 ****
'var' => 'fm_template.id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uitemplate.list_template',
'chapter_id'
=>$this->chapter_id,
'query'
=>$this->query,
--- 121,125 ----
'var' => 'fm_template.id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uitemplate.index',
'chapter_id'
=>$this->chapter_id,
'query'
=>$this->query,
***************
*** 134,138 ****
'var' => 'name',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uitemplate.list_template',
'chapter_id'
=>$this->chapter_id,
'query'
=>$this->query,
--- 134,138 ----
'var' => 'name',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uitemplate.index',
'chapter_id'
=>$this->chapter_id,
'query'
=>$this->query,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php, 1.8, 1.9 class.soequipment.inc.php, 1.22, 1.23 class.solocation.inc.php, 1.21, 1.22 class.uitemplate.inc.php, 1.11, 1.12,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php, 1.112, 1.113
- Next by Date:
[Phpgroupware-cvs] CVS: phpgroupware login.php, 1.76.2.4.2.11, 1.76.2.4.2.12 home.php, 1.16.2.1.2.2, 1.16.2.1.2.3
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php, 1.112, 1.113
- Next by thread:
[Phpgroupware-cvs] CVS: phpgroupware login.php, 1.76.2.4.2.11, 1.76.2.4.2.12 home.php, 1.16.2.1.2.2, 1.16.2.1.2.3
- Index(es):