* 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 cb68e5efa4754cd7124aba48c07e61897ee2c2f6..b10bb2076e4c403dfae2fe215a1effd0315d952b 100644 (file)
--- 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 7ea01bb5e694cc9cbb8ad125a158074467f5cf36..7c9427a6062cdde50d1e0f189917281ed622daeb 100644 (file)
--- 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 6b59c1d7afd8d434b2f896ea8e5257936ef9df83..80be71cfca651843583e08d4e85a507d842955f1 100644 (file)
--- 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 2866f43af69f13698b7ccceee59a9a6ebd6ddaab..7ea048d994db6a4f76cf45c6f6a300ee56737b58 100644 (file)
--- 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";
         }
       }