浏览代码

Fixed undocumented issue: in read-only mode, stimulus where still allowed

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1109 a333f486-631f-4898-b8df-5754b55c2be0
romainq 14 年之前
父节点
当前提交
b9bd697cf7
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      core/userrights.class.inc.php

+ 2 - 5
core/userrights.class.inc.php

@@ -202,7 +202,7 @@ abstract class User extends cmdbAbstractObject
 				{
 					if (UserRights::IsStimulusAllowed($sClass, $sStimulusCode, null, $this))
 					{
-						$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription()).'">'.htmlentities($oStimulus->GetLabel()).'</span>';
+						$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
 					}
 				}
 				$sStimuli = implode(', ', $aStimuli);
@@ -668,10 +668,7 @@ class UserRights
 
 		if (MetaModel::DBIsReadOnly())
 		{
-			if ($iActionCode == UR_ACTION_MODIFY) return false;
-			if ($iActionCode == UR_ACTION_DELETE) return false;
-			if ($iActionCode == UR_ACTION_BULK_MODIFY) return false;
-			if ($iActionCode == UR_ACTION_BULK_DELETE) return false;
+			return false;
 		}
 
 		if (self::IsAdministrator($oUser)) return true;