X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_config.inc;h=c01a2ec0e519fe9e696298030f2692cccbe49b79;hb=226580d683c1bebd09e732b0ce8af02935fd7e31;hp=f89a32b1b28c76398438626b7d373d45c27b208e;hpb=91d21d3282a7f9245ec7d7f02dbb88c955d4d732;p=gosa.git

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index f89a32b1b..c01a2ec0e 100644
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -64,6 +64,8 @@ class config  {
   var $filename = "";
   var $last_modified = 0;
 
+  public $configRegistry = NULL;
+
   /*! \brief Class constructor of the config class
    *  
    *  \param string 'filename' path to the configuration file
@@ -82,6 +84,9 @@ class config  {
     if ($filename != ""){
       $this->parse($filename);
     }
+
+    // Load configuration registry
+    $this->configRegistry = new configRegistry($this);
   }
 
 
@@ -756,7 +761,7 @@ class config  {
 
       $dn= $ldap->getDN();
       $this->tdepartments[$dn]= "";
-      $this->department_info[LDAP::fix($dn)]= array("img" => $type_data['IMG'],
+      $this->department_info[$dn]= array("img" => $type_data['IMG'],
                                          "description" => isset($attrs['description'][0])?$attrs['description'][0]:"",
                                          "name" => $attrs[$type_data['ATTR']][0]);
 
@@ -1070,7 +1075,15 @@ class config  {
    *
    *
    */
-  function get_cfg_value($name, $default= "") {
+  function get_cfg_value($name, $default= "") 
+  {
+
+    if($this->configRegistry->propertyExists('core',$name)){
+        return($this->configRegistry->getPropertyValue('core',$name));
+    }
+
+    syslog(1, $name);    
+
     $name= strtoupper($name);
 
     /* Check if we have a current value for $name */