From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 25 May 2010 14:13:50 +0000 (+0000)
Subject: Check things only once
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e472bc9800d635cbab8ee5843347e24f7a9d54fc;p=gosa.git

Check things only once


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

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 710b8c34e..0b44deb12 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -65,7 +65,10 @@ if ($_SERVER['REMOTE_ADDR'] != $ui->ip){
 $config= session::global_get('config');
 $config->check_and_reload();
 $config->configRegistry->reload();
-if(!$config->configRegistry->validateSchemata($force=FALSE,$disableIncompatiblePlugins=TRUE)){
+
+// Validate LDAP schema if not done already
+if(!$config->configRegistry->schemaCheckFinished() && 
+    !$config->configRegistry->validateSchemata($force=FALSE,$disableIncompatiblePlugins=TRUE)){
     $config->configRegistry->displayErrors();
 }
 
diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index 1a2d7b733..33b033b69 100644
--- a/gosa-core/include/class_configRegistry.inc
+++ b/gosa-core/include/class_configRegistry.inc
@@ -49,6 +49,12 @@ class configRegistry{
         $this->reload();
     }
 
+    
+    function schemaCheckFinished()
+    {
+        return($this->schemaCheckFinished);
+    }
+
 
     function validateSchemata($force = FALSE, $disableIncompatiblePlugins = FALSE)
     {