From 6cd556f04c9ea7f3868df8fe3573e23f81014961 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 12 Apr 2006 03:43:47 +0000 Subject: [PATCH] Removed convert_department_dn2 from div list mangement (within reload) 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 | 4 ++-- plugins/admin/departments/class_departmentManagement.inc | 4 ++-- plugins/admin/fai/class_faiManagement.inc | 4 ++-- plugins/admin/groups/class_groupManagement.inc | 4 ++-- plugins/admin/ogroups/class_ogroupManagement.inc | 4 ++-- plugins/admin/systems/class_glpiSelectUser.inc | 4 ++-- plugins/admin/systems/class_systemManagement.inc | 4 ++-- plugins/admin/users/class_userManagement.inc | 4 ++-- plugins/gofax/blocklists/class_blocklistManagement.inc | 4 ++-- plugins/gofon/conference/class_phoneConferenceManagment.inc | 4 ++-- plugins/gofon/macro/class_gofonMacroManagement.inc | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc index cb57824d0..61bd390ad 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']]=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 b1e1d7b93..6ad90f7bc 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']]= 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 3d06467d7..e64e8ab9c 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']]=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 80bc11446..f09bef054 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']]=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 bc6cc78e3..9956546a4 100644 --- a/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/plugins/admin/ogroups/class_ogroupManagement.inc @@ -721,9 +721,9 @@ name='dep_root' alt='"._("Root")."'> ". 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 f25dce8d3..23e532966 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']]=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 8bc2eccf9..088a0168f 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']]=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 beab32aa7..363435490 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']]=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 3b42150ad..066f0d732 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']]=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 890afd9c9..839516b44 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']]=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 756803839..584c3839b 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']]=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]; } } -- 2.30.2