Reverted last commit

-

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

diff --git a/gosa-core/include/class_baseSelector.inc b/gosa-core/include/class_baseSelector.inc
index b11c8364965bee62595c759d33ac643427497c0c..68dd3ca036630620cb822c31ef425b06a08aa96c 100644 (file)
--- a/gosa-core/include/class_baseSelector.inc
+++ b/gosa-core/include/class_baseSelector.inc
@@ -57,7 +57,6 @@ class baseSelector {
 
   function setBase($base)
   {
-    $base = LDAP::fix($base);
     if (isset($this->pathMapping[$base])) {
       $this->base= $base;
       $this->update(true);
@@ -92,7 +91,7 @@ class baseSelector {
       $elements= explode(',', substr($base, 0, strlen($base) - strlen($config->current['BASE'])));
       $elements= array_reverse($elements, true);
 
-      $this->pathMapping[LDAP::fix($base)]= $base == $config->current['BASE']? '/' : ldap::fix(preg_replace('/(^|,)[a-z0-9]+=/i', '/', implode(',', $elements)));
+      $this->pathMapping[$base]= $base == $config->current['BASE']? '/' : ldap::fix(preg_replace('/(^|,)[a-z0-9]+=/i', '/', implode(',', $elements)));
     }
 
     // Save bases to session for autocompletion
@@ -189,8 +188,8 @@ class baseSelector {
       $link= "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($base)."';$('submit_tree_base_".$this->pid."').click();\"";
       $this->tree.= "<li>".
                     image($config->department_info[$base]['img'])."&nbsp;<a$selected $link>".
-                    ($this->gennonbreaks($config->department_info[LDAP::fix($base)]['name'])).
-                    ($config->department_info[LDAP::fix($base)]['description']==''?'':'&nbsp;<span class="informal">['.$this->gennonbreaks($config->department_info[LDAP::fix($base)]['description']).']</span>').
+                    $this->gennonbreaks($config->department_info[$base]['name']).
+                    ($config->department_info[$base]['description']==''?'':'&nbsp;<span class="informal">['.$this->gennonbreaks($config->department_info[$base]['description']).']</span>').
                     "</a>";
 
       $last_indent= $indent;

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index f89a32b1b28c76398438626b7d373d45c27b208e..07e9152569fd458c8ef48392957ae27fa9ac4d49 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -756,7 +756,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]);