From: hickert Date: Wed, 5 May 2010 09:29:07 +0000 (+0000) Subject: Updated config flags X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9540255fc994b107abc71468c306d408e290d7bb;p=gosa.git Updated config flags git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18096 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf index 3dd986d9f..6c6d576ad 100644 --- a/gosa-core/contrib/gosa.conf +++ b/gosa-core/contrib/gosa.conf @@ -417,7 +417,7 @@ {else} forceGlobals="false" {/if} -{if $cv.optional.forcessl} +{if $cv.optional.forceSSL} forceSSL="true" {else} forceSSL="false" @@ -427,7 +427,7 @@ {else} ldapStats="false" {/if} -{if $cv.optional.warnssl} +{if $cv.optional.warnSSL} warnSSL="true" {else} warnSSL="false" @@ -463,8 +463,8 @@ language="{$cv.lang_selected}" theme="{$cv.theme}" sessionLifetime="{$cv.optional.session_lifetime}" - templateCompileDirectory="{$cv.optional.compile}" - debugLevel="{$cv.optional.debuglevel}" + templateCompileDirectory="{$cv.optional.templateCompileDirectory}" + debugLevel="{$cv.optional.debugLevel}" sambaHashHook='{$cv.samba_settings.smbhash}' > diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc index acfc29171..e0e09f94f 100644 --- a/gosa-core/include/class_configRegistry.inc +++ b/gosa-core/include/class_configRegistry.inc @@ -128,6 +128,10 @@ class configRegistry{ function propertyExists($class,$name) { + if(!isset($this->mapByName[$class][$name])){ + print_a(array($class,$name)); + + } return(isset($this->mapByName[$class][$name])); } diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc index 86f04f7d2..93eab234c 100644 --- a/gosa-core/include/class_plugin.inc +++ b/gosa-core/include/class_plugin.inc @@ -1527,7 +1527,8 @@ class plugin static function callHook($plugin, $cmd, $addAttrs= array()) { global $config; - $command= $config->search(get_class($plugin), $cmd,array('menu','tabs')); + $command = $config->configRegistry->getPropertyValue(get_class($plugin),$cmd); + if ($command != ""){ // Walk trough attributes list and add the plugins attributes.