From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 13 Apr 2006 13:53:59 +0000 (+0000)
Subject: Reverted 3035
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=14f9bcf0b64036a4c89ecb46bfc943e66b61c91a;p=gosa.git

Reverted 3035


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

diff --git a/include/class_config.inc b/include/class_config.inc
index 4c3161a88..4b26e2607 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -512,8 +512,7 @@ class config  {
 	$this->idepartments= $this->generateDepartmentArray($ret,-1,$max_size);
   }
 
-	/* Creates display friendly output from make_idepartments
-     */
+	/* Creates display friendly output from make_idepartments */
 	function generateDepartmentArray($arr,$depth = -1,$max_size){
 		$ret = array();
 		$depth ++;
@@ -522,8 +521,7 @@ class config  {
 		foreach($arr as $name => $entries){
 
 			/* If this department is the last in the current tree position 
-             * remove it, to avoid generating output for it 
-             */
+			 * remove it, to avoid generating output for it */
 			if(count($entries['SUB'])==0){
 				unset($entries['SUB']);
 			}
diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 61bd390ad..9e47fbbd4 100644
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
       }
     }
 
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index 6ad90f7bc..b1e1d7b93 100644
--- 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']]= $value['dn']." - [".$value["description"][0]."]";
+				$this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
 			}else{
-				$this->departments[$value['dn']]= $value['dn'];//$value["description"][0];
+				$this->departments[$value['dn']]= convert_department_dn2($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 e64e8ab9c..050a7db06 100644
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+				$this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
 			}else{
-				$this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
+				$this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
 			}
 		}
 
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index f09bef054..250621df8 100644
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+          $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
         }else{
-          $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
+          $this->departments[$value['dn']]= convert_department_dn2($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 9956546a4..67b664577 100644
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
+        $this->departments[$value['dn']]= convert_department_dn2($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 23e532966..053bc0d13 100644
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
       }
     }
 
diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 088a0168f..f91cd51cb 100644
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
       }
     }
 
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 363435490..beab32aa7 100644
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=$value['dn'];
+        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);
       }
     }
     /* END NEW LIST MANAGMENT 
diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index 066f0d732..7bc7dc193 100644
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
       }
     }
 
diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 839516b44..dafcf2323 100644
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
       }
     }
   }
diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index 584c3839b..6ea4e3649 100755
--- 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']]=$value['dn']." - [".$value["description"][0]."]";
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
       }else{
-        $this->departments[$value['dn']]=$value['dn'];//$value["description"][0];
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
       }
     }