From d2a7e3c024a7d9426593b1169e03e86709dd08db Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 2 Jun 2010 12:57:11 +0000 Subject: [PATCH] Updated property handling -Fixed logging (No recursions anymore) git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18839 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_config.inc | 6 +++++- gosa-core/include/class_configRegistry.inc | 14 +++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 4f7c82f13..faf44aab3 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -1060,7 +1060,11 @@ class config { } // Show a warning in the syslog if there is an undefined property requested. - new log("debug","","Unconfigured property: '{$class}::{$name}'",array(),''); + if($this->configRegistry->propertyInitializationComplete() && + "{$class}::{$name}" != 'core::config' && // <--- This on is never set, only in gosa.conf. + "{$class}::{$name}" != 'core::logging'){ // <--- This one may cause endless recursions in class_log.inc + new log("debug","","Unconfigured property: '{$class}::{$name}'",array(),''); + } // Try to find the property in the config file directly. $name= strtoupper($name); diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc index 697aea85e..d14f4ef44 100644 --- a/gosa-core/include/class_configRegistry.inc +++ b/gosa-core/include/class_configRegistry.inc @@ -388,7 +388,6 @@ class configRegistry{ $this->ldapStoredProperties[$class][$name] = $value; } } - $this->status = 'finished'; } // Register plugin properties. @@ -417,6 +416,19 @@ class configRegistry{ } } } + + // We are only finsihed once we are logged in. + if(!empty($this->config->current['CONFIG'])){ + $this->status = 'finished'; + } + } + + + /*! \brief Returns TRUE if the property registration has finished without any error. + */ + function propertyInitializationComplete() + { + return($this->status == 'finished'); } -- 2.30.2