From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 18 Apr 2006 06:39:43 +0000 (+0000)
Subject: * Reverted from ldap_explode to split - special characters were not shown
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9bf439f2612af4501fb7ea6b61e15d3619bff266;p=gosa.git

* Reverted from ldap_explode to split - special characters were not shown
  correctly
* Speed up in userManagement/systemManagement


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

diff --git a/TODO b/TODO
index cb68e5efa..b10bb2076 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,8 @@ Target for 2.4.1:
 
 * Sanity check for workstations/servers: repository server == self?
 
+* Can't rename server objects
+
 * Can't remove phoneAccounts...
 
 * Explaination of several FIXME's. Group removal, etc.
diff --git a/include/functions.inc b/include/functions.inc
index 7ea01bb5e..7c9427a60 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -742,7 +742,7 @@ function convert_department_dn($dn)
 
   /* Build a sub-directory style list of the tree level
      specified in $dn */
-  foreach (ldap_explode_dn($dn, false) as $rdn){
+  foreach (split(',', $dn) as $rdn){
 
     /* We're only interested in organizational units... */
     if (substr($rdn,0,3) == 'ou='){
diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 6b59c1d7a..80be71cfc 100644
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -812,9 +812,9 @@ class systems extends plugin
          Display different image in this case 
        */ 
       $non_empty="";
-      $keys= str_replace("/","\/",$key);
+      $nkey= normalizePreg($key);
       foreach($this->config->departments as $keyd=>$vald ){
-        if(preg_match("/".$keys."\/.*/",$keyd)){
+        if(preg_match("/$nkey\/.*/",$keyd)){
           $non_empty="full";
         }
       }
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 2866f43af..7ea048d99 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -818,8 +818,9 @@ class userManagement extends plugin
       }
 
       $non_empty="";
+      $nkey= normalizePreg($key);
       foreach($this->config->departments as $keyd => $vald ){
-        if(preg_match("/".normalizePreg($key)."\/.*/", $keyd)){
+        if(preg_match("/$nkey\/.*/", $keyd)){
           $non_empty="full";
         }
       }