[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 088fea9)
Removed convert_department_dn2 from div list mangement (within reload)
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 12 Apr 2006 03:43:47 +0000 (03:43 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 12 Apr 2006 03:43:47 +0000 (03:43 +0000)
This function caused that all names for departments were cutted when there was a / in it.
In the list mangement we don't need to call this function, because get_list2() did it before.

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

plugins/admin/applications/class_applicationManagement.inc patch | blob | history
plugins/admin/departments/class_departmentManagement.inc patch | blob | history
plugins/admin/fai/class_faiManagement.inc patch | blob | history
plugins/admin/groups/class_groupManagement.inc patch | blob | history
plugins/admin/ogroups/class_ogroupManagement.inc patch | blob | history
plugins/admin/systems/class_glpiSelectUser.inc patch | blob | history
plugins/admin/systems/class_systemManagement.inc patch | blob | history
plugins/admin/users/class_userManagement.inc patch | blob | history
plugins/gofax/blocklists/class_blocklistManagement.inc patch | blob | history
plugins/gofon/conference/class_phoneConferenceManagment.inc patch | blob | history
plugins/gofon/macro/class_gofonMacroManagement.inc patch | blob | history

diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index cb57824d0d3107f1737527bc47ce530744adb170..61bd390ad7abe1aaedb2c3fc426286c2ec604f11 100644 (file)
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -636,9 +636,9 @@ class applicationManagement extends plugin
     ksort($tmp);
     foreach($tmp as $value){
       if(isset($value["description"][0])){
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
       }
     }
 
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index b1e1d7b93bd16f4830ece91b1fc4006fa1c4e481..6ad90f7bc42deae9eb6032fba5b0d26127fb2e11 100644 (file)
--- a/plugins/admin/departments/class_departmentManagement.inc
+++ b/plugins/admin/departments/class_departmentManagement.inc
@@ -429,9 +429,9 @@ class departmentManagement extends plugin
                $this->departments= array();
                foreach ($res as $value){
                        if(isset($value["description"][0])){
-                               $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+                               $this->departments[$value['dn']]= $value['dn']." - [".$value["description"][0]."]";
                        }else{
-                               $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
+                               $this->departments[$value['dn']]= $value['dn'];//$value["description"][0];
                        }
                }
                natcasesort ($this->departments);
diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 3d06467d7a728cc33601af2009d0bea508f5f7d9..e64e8ab9cf4620c008e91103de598d4a8e504cab 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -913,9 +913,9 @@ class faiManagement extends plugin
                ksort($tmp);
                foreach($tmp as $value){
                        if(isset($value["description"][0])){
-                               $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+                               $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
                        }else{
-                               $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+                               $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
                        }
                }
 
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 80bc11446e62288c69d4ebee9ca096c05ae2285b..f09bef054cbb15d0b6cf02bb3dedfd37a650cf22 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -687,9 +687,9 @@ class groupManagement extends plugin
       ksort($tmp);
       foreach($tmp as $value){
         if(isset($value["description"][0])){
-          $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+          $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
         }else{
-          $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
+          $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
         }
       }
     /*  Ende department generation
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index bc6cc78e3fe3cc0609388758b08aea98cab60fbf..9956546a4a929ae4cacd8c67d06aa0978ecddd4f 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -721,9 +721,9 @@ name='dep_root' alt='"._("Root")."'>&nbsp;".
     ksort($tmp);
     foreach($tmp as $value){
       if(isset($value["description"][0])){
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
       }
     }
     /* END NEW LIST MANAGMENT
diff --git a/plugins/admin/systems/class_glpiSelectUser.inc b/plugins/admin/systems/class_glpiSelectUser.inc
index f25dce8d3719238b39090580b895b338cda1fea8..23e532966be60bc7a603931e61ec57a7c3a2f63e 100644 (file)
--- a/plugins/admin/systems/class_glpiSelectUser.inc
+++ b/plugins/admin/systems/class_glpiSelectUser.inc
@@ -219,9 +219,9 @@ class glpiSelectUser extends plugin
     ksort($tmp);
     foreach($tmp as $value){
       if(isset($value["description"][0])){
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
       }
     }
 
diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 8bc2eccf90299a504b9d46b25031ef90e4462498..088a0168f75fdd11ed3c69c4d96168c3709eea28 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -1111,9 +1111,9 @@ class systems extends plugin
     ksort($tmp);
     foreach($tmp as $value){
       if(isset($value["description"][0])){
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
       }
     }
 
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index beab32aa7d4ad2ff418c19baa343a1a1e83f9707..3634354909d0e3d354c806c09057d135090afc2c 100644 (file)
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -1169,9 +1169,9 @@ class userManagement extends plugin
     /* Create result array */
     foreach($tmp as $value){
       if(isset($value['description'][0])){
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);
+        $this->departments[$value['dn']]=$value['dn'];
       }
     }
     /* END NEW LIST MANAGMENT 
diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index 3b42150ad3e50b0b45f390d80e435b453ee54915..066f0d7328b75844603e9546be1f229ba2529e31 100644 (file)
--- a/plugins/gofax/blocklists/class_blocklistManagement.inc
+++ b/plugins/gofax/blocklists/class_blocklistManagement.inc
@@ -489,9 +489,9 @@ class blocklist extends plugin
     ksort($tmp);
     foreach($tmp as $value){
       if(isset($value["description"][0])){
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
       }
     }
 
diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 890afd9c9d6846e8f4a52ba2101062ebab4b5dd7..839516b44d2c3760f9565c182afd2b3f3ee46a62 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -422,9 +422,9 @@ class phoneConferenceManagment extends plugin
     ksort($tmp);
     foreach($tmp as $value){
       if(isset($value["description"][0])){
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
       }
     }
   }
diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index 75680383939fc956bad49780b4aba1097bb7f429..584c3839b3791fe50e7e504474592283e726cb35 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroManagement.inc
+++ b/plugins/gofon/macro/class_gofonMacroManagement.inc
@@ -473,9 +473,9 @@ class gofonMacro extends plugin
     ksort($tmp);
     foreach($tmp as $value){
       if(isset($value["description"][0])){
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]=$value['dn']." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
       }
     }
 
GONICUS system administrator (SVN clone)