X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_MultiSelectWindow.inc;h=bb67e2698dade915e3d81e45c054eb95260c9384;hb=dc43e93accd4cbba7c509d879579701e48c9d3be;hp=f088cc189351693b1baaf3fd0c4c014b5bb86a93;hpb=7418bd6251aaf4f6fb5da61dc3d16b52043b81a4;p=gosa.git

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index f088cc189..bb67e2698 100644
--- 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;
@@ -63,6 +65,11 @@ class MultiSelectWindow{
 
 	function ClearElementsList()
 	{
+    $ui =get_userinfo();
+    $deps = $ui->get_module_departments($this->module);
+    if(!in_array($this->selectedBase, $deps)){
+      $this->selectedBase = array_shift($deps);
+    }
 		$this->array_Elements = array();
 	}
 
@@ -550,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;
         }
       }
     }
@@ -658,34 +657,49 @@ class MultiSelectWindow{
 
 		/* Get all departments within this subtree */
 		$deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
-                    array("ou", "description"), GL_SIZELIMIT );
+                    array("ou", "description","objectClass"), GL_SIZELIMIT );
 
 		/* Edit delete link for system types
 		 */
 		$linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
 
 		/* Create an array with all visible (in the list) departments */
+    $types = departmentManagement::get_support_departments();
+
 		$departments = array();
 		foreach($deps as $value){
       $name = $value['ou'][0]." -".$value['dn'];
-		  $this->departments[$name]= $value; 
+      foreach($types as $type){
+        if(in_array($type['OC'],$value['objectClass'])){
+          $value['type'] = $type;
+          break;
+        }
+      }       
+		  $this->departments[$name]= $value;
 		}
     uksort($this->departments, 'strnatcasecmp');
-    $this->departments = array_values($this->departments);
+
+    $ui = get_userinfo();
+    $module_deps = $ui->get_module_departments($this->module);
   
 		/* Add deps to this dialog object list */
+    $this->departments = array_values($this->departments);
 		foreach($this->departments as $key=> $val){
 
+      if(!in_array($val['dn'],$module_deps)) continue;
+
       /* Check if this department contains sub-departments
          Display different image in this case
        */
-      $non_empty="";
+      $img = $val['type']['IMG'];
       foreach($this->config->departments as $keyd){
         if(preg_match("/,".normalizePreg($val['dn'])."$/",$keyd)){
-          $non_empty="-full";
+          $img = $val['type']['IMG_FULL'];
         }
       }
 
+      $img = "<image src='".$img."' class='center'>";
+
 			/* Add spacer cols to divlist 
        */
 			$row = array();
@@ -704,7 +718,6 @@ class MultiSelectWindow{
 
       /* Add departments
        */
-      $img = "<img src='images/lists/folder".$non_empty.".png' alt='department'>";
 			$row[]=$field1=array("string"=> $img,"attach"=>"style='text-align:center;width:20px;'");
 			$row[]=$field2=array("string"=>sprintf($linkopen,$key,$name), "attach" => "style=''");
 
@@ -740,8 +753,11 @@ class MultiSelectWindow{
     $ids = $this->config->idepartments;
     foreach($modules as $module){
       $d = $ui->get_module_departments($module);
-      foreach($d as $department){
-        $departments[$department] = $department;
+
+      foreach($ids as $department => $desc){
+        if(in_array($department,$d)){
+          $departments[$department] = $department;
+        }
       }
     }