composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Internal: it is possible to override the user authorized organizations

Browse Source 
SVN:trunk[1516]
This commit is contained in:
Romain Quetiez
2011-08-25 15:45:45 +00:00
parent a3a4fd0a75
commit c74c955973
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
addons/userrights/userrightsprofile.class.inc.php
View File

@@ -598,7 +598,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
protected $m_aProfiles; // id -> object
protected $m_aUserProfiles; // userid,profileid -> object
protected $m_aUserOrgs; // userid,orgid -> object
protected $m_aUserOrgs; // userid -> orgid
// Those arrays could be completed on demand (inheriting parent permissions)
protected $m_aClassActionGrants = null; // profile, class, action -> actiongrantid (or false if NO, or null/missing if undefined)
@@ -607,6 +607,11 @@ class UserRightsProfile extends UserRightsAddOnAPI
// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
protected $m_aObjectActionGrants = array();
protected function GetUserOrgs($oUser, $sClass)
{
return @$this->m_aUserOrgs[$oUser->GetKey()];
}
public function ResetCache()
{
// Loaded by Load cache
@@ -678,7 +683,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
$this->m_aUserOrgs = array();
while ($oUserOrg = $oUserOrgSet->Fetch())
{
$this->m_aUserOrgs[$oUserOrg->Get('userid')][$oUserOrg->Get('allowed_org_id')] = $oUserOrg;
$this->m_aUserOrgs[$oUserOrg->Get('userid')][] = $oUserOrg->Get('allowed_org_id');
}
$this->m_aClassStimulusGrants = array();
@@ -776,8 +781,8 @@ exit;
}
// Position the user
//
@$aUserOrgs = $this->m_aUserOrgs[$oUser->GetKey()];
if (!isset($aUserOrgs) || count($aUserOrgs) == 0)
$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
if (is_null($aUserOrgs) || count($aUserOrgs) == 0)
{
// No position means 'Everywhere'
return true;
@@ -785,8 +790,7 @@ exit;
$oExpression = new FieldExpression($sAttCode, $sClass);
$oFilter = new DBObjectSearch($sClass);
$aIds = array_keys($aUserOrgs);
$oListExpr = ListExpression::FromScalars($aIds);
$oListExpr = ListExpression::FromScalars($aUserOrgs);
// Check if the condition points to a hierarchical key
$bConditionAdded = false;