From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 28 Sep 2009 08:47:41 +0000 (+0000)
Subject: Updated class check
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=260838af5e008575b76239248b43af6516eed3ce;p=gosa.git

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 5fffd7a1a..6fa78e8ee 100644
--- 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"));