[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ff4f658)
Reverted 3035
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 13 Apr 2006 13:53:59 +0000 (13:53 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 13 Apr 2006 13:53:59 +0000 (13:53 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3042 594d385d-05f5-0310-b6e9-bd551577e9d8

12 files changed:
include/class_config.inc patch | blob | history
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/include/class_config.inc b/include/class_config.inc
index 4c3161a8822f15e260b13f17bf3704e23d4efcee..4b26e2607cf4838403bbfe4c9af436481e77fbf8 100644 (file)
--- 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 61bd390ad7abe1aaedb2c3fc426286c2ec604f11..9e47fbbd4120d387ae48d225a3d7aa250e360a52 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']]=$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 6ad90f7bc42deae9eb6032fba5b0d26127fb2e11..b1e1d7b93bd16f4830ece91b1fc4006fa1c4e481 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']]= $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 e64e8ab9cf4620c008e91103de598d4a8e504cab..050a7db0644e4d907c794fce958415f02a6e3488 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']]=$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 f09bef054cbb15d0b6cf02bb3dedfd37a650cf22..250621df8b1c4ebd1acfa99eae6fab86d4b11926 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']]=$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 9956546a4a929ae4cacd8c67d06aa0978ecddd4f..67b66457780588165115602c201ed15ef08632b1 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']]=$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 23e532966be60bc7a603931e61ec57a7c3a2f63e..053bc0d13e45552c91c2bb576fa40866bd58d902 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']]=$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 088a0168f75fdd11ed3c69c4d96168c3709eea28..f91cd51cb2aaa20477e2b5d99af5332ad425b928 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']]=$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 3634354909d0e3d354c806c09057d135090afc2c..beab32aa7d4ad2ff418c19baa343a1a1e83f9707 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']]=$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 066f0d7328b75844603e9546be1f229ba2529e31..7bc7dc193c71a835b7e5d522dd3be1900b326d96 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']]=$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 839516b44d2c3760f9565c182afd2b3f3ee46a62..dafcf232354fda8473c2538eb6b09d0f4b5a9daf 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']]=$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 584c3839b3791fe50e7e504474592283e726cb35..6ea4e3649796721e42d60793da3b01dbd0269fb0 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']]=$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];
       }
     }
 
GONICUS system administrator (SVN clone)