diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 7c3a7fc21..a0cbf37d5 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -529,7 +529,7 @@ abstract class cmdbAbstractObject extends CMDBObject $aAuthorizedClasses = array(); foreach($aClasses as $sAlias => $sClassName) { - if ((UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) == UR_ALLOWED_YES) && + if ( (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS)) && ( (count($aDisplayAliases) == 0) || (in_array($sAlias, $aDisplayAliases))) ) { $aAuthorizedClasses[$sAlias] = $sClassName; @@ -629,7 +629,7 @@ abstract class cmdbAbstractObject extends CMDBObject $aAuthorizedClasses = array(); foreach($aClasses as $sAlias => $sClassName) { - if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) == UR_ALLOWED_YES) + if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS)) { $aAuthorizedClasses[$sAlias] = $sClassName; } @@ -687,7 +687,7 @@ abstract class cmdbAbstractObject extends CMDBObject $aAuthorizedClasses = array(); foreach($aClasses as $sAlias => $sClassName) { - if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) == UR_ALLOWED_YES) + if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS)) { $aAuthorizedClasses[$sAlias] = $sClassName; } diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index aa68ed1a9..0d35c4c2f 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -436,7 +436,7 @@ class DisplayBlock // Check the classes that can be read (i.e authorized) by this user... foreach($aClasses as $sAlias => $sClassName) { - if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) + if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $this->m_oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS)) { $aAuthorizedClasses[$sAlias] = $sClassName; } @@ -536,32 +536,23 @@ class DisplayBlock break; case 'details': - if (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) + while($oObj = $this->m_oSet->Fetch()) { - while($oObj = $this->m_oSet->Fetch()) - { - $sHtml .= $oObj->GetDetails($oPage); // Still used ??? - } + $sHtml .= $oObj->GetDetails($oPage); // Still used ??? } break; case 'bare_details': - if (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) + while($oObj = $this->m_oSet->Fetch()) { - while($oObj = $this->m_oSet->Fetch()) - { - $sHtml .= $oObj->GetBareProperties($oPage); - } + $sHtml .= $oObj->GetBareProperties($oPage); } break; case 'csv': - if (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) - { - $sHtml .= "\n"; - } + $sHtml .= "\n"; break; case 'modify': diff --git a/pages/UI.php b/pages/UI.php index 42f2cb01d..9e23ce387 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -676,8 +676,7 @@ try } $bIsModifiedAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet) == UR_ALLOWED_YES) && !MetaModel::IsReadOnlyClass($sClass); - $bIsReadAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_READ, $oSet) == UR_ALLOWED_YES); - if( ($oObj != null) && ($bIsModifiedAllowed) && ($bIsReadAllowed)) + if( ($oObj != null) && $bIsModifiedAllowed ) { $oP->set_title(Dict::Format('UI:ModificationPageTitle_Object_Class', $oObj->GetName(), $sClassLabel)); $oP->add("