Updated functions.inc

[gosa.git] / gosa-core / include / class_MultiSelectWindow.inc

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index b4a43dea77a4e03e3a6516dcde0172feb38d3fdb..bb67e2698dade915e3d81e45c054eb95260c9384 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -33,7 +33,7 @@ class MultiSelectWindow{
 
        var $string_Title                         = "";
        var $string_ListHeader  = "";
-  var $string_ListDropDown= "";
+       var $string_ListDropDown= "";
        var $string_Summary                     = "";
        var $string_Information = "";
 
@@ -48,9 +48,11 @@ class MultiSelectWindow{
        var $is_headpage                          = false;      // if true the design changes
        var $filterName                           = "Liste";
        var $DepartmentsAdded           = false;
-  var $Added_Departments  = array();
+       var $Added_Departments  = array();
        var $selectedBase       = "";
 
+       private $departments= array();
+
   var $DivHeight          = "";
 
   var $HideFilterPart     = false;
@@ -555,16 +557,8 @@ class MultiSelectWindow{
       $base_back= preg_replace("/^[^,]+,/", "", session::get('CurrentMainBase'));
       $dep_id = $this->ui->get_module_departments($this->module);
       if(in_array_ics($base_back,$dep_id)){
-
-        /* The department array keeps non DN entries as index. We need to convert
-           it before checking the existance. */
-        $base_back= trim(convert_department_dn($base_back));
-
-        /* Check if the department exists, otherwise revert to the configure base DN */
-        if(isset($this->config->departments[$base_back])){
-          $this->selectedBase= $this->config->departments[$base_back];
-        }else{
-          $this->selectedBase= $this->config->departments['/'];
+        if(in_array($base_back,$this->config->departments)){
+          $this->selectedBase = $base_back;
         }
       }
     }