Updated class core and schema check method

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

diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index 048af50c76f44fc08cabbf40ad26ce69366ece00..2b593f0dfa47614f9fe96ef383f99673d2dbbabd 100644 (file)
--- a/gosa-core/include/class_configRegistry.inc
+++ b/gosa-core/include/class_configRegistry.inc
@@ -114,7 +114,7 @@ class configRegistry{
             if(isset($requirements['ldapSchema'])){
                 foreach($requirements['ldapSchema'] as $oc => $version){
                     if(!$this->ocAvailable($oc)){
-                        $this->detectedSchemaIssues['missing'][] = $oc;
+                        $this->detectedSchemaIssues['missing'][$oc] = $oc;
                         $this->schemaCheckFailed = TRUE;
                         $failure = TRUE;
                     }elseif(!empty($version)){
@@ -123,7 +123,7 @@ class configRegistry{
                             if($currentVersion == -1){
                                 $currentVersion = _("unknown");
                             }
-                            $this->detectedSchemaIssues['versionMismatch'][] = 
+                            $this->detectedSchemaIssues['versionMismatch'][$oc] = 
                                 sprintf(_("%s has version %s but %s is required!"), bold($oc),bold($currentVersion),bold($version));
                             $this->schemaCheckFailed = TRUE;
                             $failure = TRUE;
@@ -159,14 +159,14 @@ class configRegistry{
             $message.= "<br>".
                 _("The following object classes are missing:").
                 "<div class='scrollContainer' style='height:100px'>".
-                msgPool::buildList($this->detectedSchemaIssues['missing']).
+                msgPool::buildList(array_values($this->detectedSchemaIssues['missing'])).
                 "</div>";
         }    
         if(count($this->detectedSchemaIssues['versionMismatch'])){
             $message.= "<br>".
                 _("The following object classes are outdated:").
                 "<div class='scrollContainer' style='height:100px'>".
-                msgPool::buildList($this->detectedSchemaIssues['versionMismatch']).
+                msgPool::buildList(array_values($this->detectedSchemaIssues['versionMismatch'])).
                 "</div>";
         }    
         if($message != ""){

diff --git a/gosa-core/include/class_core.inc b/gosa-core/include/class_core.inc
index 2b7c5a6b24e9c18e41119b7849c0adc1e0336785..50c294d2d1a9556ad9813b1faa63cdb7093d0e14 100644 (file)
--- a/gosa-core/include/class_core.inc
+++ b/gosa-core/include/class_core.inc
@@ -99,18 +99,23 @@ class core extends plugin {
                     "plDepends"     => array(),
                     "plPriority"    => 0,
                     "plSection"     => array("administration"),
-                    "plCategory"    => array("all"),
 
                     "plRequirements"=> array(
                         'ldapSchema' => array(
                             'gosaObject' => '>=2.7',
+                            'gosaAccount' => '>=2.7',
                             'gosaLockEntry' => '>=2.7',
+                            'gosaDepartment' => '>=2.7',
                             'gosaCacheEntry' => '>=2.7',
-                            'gosaConfig' => '>=2.7',
-                            'gosaProperties' => '>=2.7'
-                            )
+                            'gosaProperties' => '>=2.7',
+                            'gosaConfig' => '>=2.7'
+                            ),
+                        'onFailureDisablePlugin' => array(get_class())
                         ),
 
+
+
+                    "plCategory"    => array("all"),
                     "plProperties"  => array(
 
                         array(