Updated class check

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14361 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 5fffd7a1aa9ca062e8fb33b409dd8fc30e1f4379..6fa78e8ee0c1192094e953e4c5026008516a0b86 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -2285,26 +2285,18 @@ function check_schema($cfg,$rfc2307bis = FALSE)
           if(isset($values['file'])){
             $checks[$name]["SCHEMA_FILES"] = array($values['file']);
           }
-          $checks[$name]["CLASSES_REQUIRED"] = array($name);
+          $checks[$name]["CLASSES_REQUIRED"] = is_array($values['class'])?$values['class']:array($values['class']);
         }
   foreach($checks as $name => $value){
     foreach($value['CLASSES_REQUIRED'] as $class){
 
       if(!isset($objectclasses[$name])){
         $checks[$name]['STATUS'] = FALSE;
-        if($value['IS_MUST_HAVE']){
-          $checks[$name]['MSG']    = sprintf(_("Missing required object class '%s'!"),$class);
-        }else{
-          $checks[$name]['MSG']    = sprintf(_("Missing optional object class '%s'!"),$class);
-        }
+        $checks[$name]['MSG']    = sprintf(_("Missing required object class '%s'!"),$class);
       }elseif(!check_schema_version($objectclasses[$name],$value['REQUIRED_VERSION'])){
         $checks[$name]['STATUS'] = FALSE;
 
-        if($value['IS_MUST_HAVE']){
-          $checks[$name]['MSG'] = sprintf(_("Version mismatch for required object class '%s' (!=%s)!"), $class,                           $value['REQUIRED_VERSION']);
-        }else{
-          $checks[$name]['MSG'] = sprintf(_("Version mismatch for optional object class '%s' (!=%s)!"), $class,                           $value['REQUIRED_VERSION']);
-        }
+        $checks[$name]['MSG'] = sprintf(_("Version mismatch for required object class '%s' (!=%s)!"), $class,                           $value['REQUIRED_VERSION']);
       }else{
         $checks[$name]['STATUS'] = TRUE;
         $checks[$name]['MSG'] = sprintf(_("Class(es) available"));