Parcourir la source

Protection against a non existing UserLDAP class (in case the LDAP module is not installed)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3251 a333f486-631f-4898-b8df-5754b55c2be0
dflaven il y a 11 ans
Parent
commit
96d3b4aaf4
1 fichiers modifiés avec 16 ajouts et 2 suppressions
  1. 16 2
      core/valuesetdef.class.inc.php

+ 16 - 2
core/valuesetdef.class.inc.php

@@ -389,13 +389,27 @@ class ValueSetEnumClasses extends ValueSetEnum
 		// Translate the labels of the additional values
 		foreach($this->m_aValues as $sClass => $void)
 		{
-			$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+			if (MetaModel::IsValidClass($sClass))
+			{
+				$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+			}
+			else
+			{
+				unset($this->m_aValues[$sClass]);
+			}
 		}
 
 		// Then, add the classes from the category definition
 		foreach (MetaModel::GetClasses($this->m_sCategories) as $sClass)
 		{
-			$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+			if (MetaModel::IsValidClass($sClass))
+			{
+				$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+			}
+			else
+			{
+				unset($this->m_aValues[$sClass]);
+			}
 		}
 
 		return true;