X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fmimetypes%2Fclass_divListMimeTypes.inc;h=87b7bbaa4524b4e7c499c026164720767303b1b7;hb=6ae7a3503964fb97587cf21b9c1b4276b9db23fc;hp=0d961ba4b1cdcdc0a71be48f67e0a8e0845dab54;hpb=e19e3d570fda8db305fb177f6ac217865ce6c714;p=gosa.git
diff --git a/plugins/admin/mimetypes/class_divListMimeTypes.inc b/plugins/admin/mimetypes/class_divListMimeTypes.inc
index 0d961ba4b..87b7bbaa4 100755
--- a/plugins/admin/mimetypes/class_divListMimeTypes.inc
+++ b/plugins/admin/mimetypes/class_divListMimeTypes.inc
@@ -96,20 +96,26 @@ class divListMimeTypes extends MultiSelectWindow
$first = "";
$found = FALSE;
$base = $this->config->current['BASE'];
- $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
- array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH);
/* Add base */
- $deps[] = array("dn"=>$this->config->current['BASE']);
+ $tmp = array();
+ $tmp[] = array("dn"=>$this->config->current['BASE']);
+ $tmp= array_merge($tmp,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
+ array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH));
+
+ $deps = array();
+ foreach($tmp as $tm){
+ $deps[$tm['dn']] = $tm['dn'];
+ }
/* Load possible departments */
- $ui = get_userinfo();
+ $ui= get_userinfo();
$tdeps= $ui->get_module_departments($this->module);
-
$ids = $this->config->idepartments;
-
- foreach($deps as $dep){
- if(isset($ids[$dep['dn']]) && in_array_ics($dep['dn'], $tdeps)){
+ $first = "";
+ $found = FALSE;
+ foreach($ids as $dep => $name){
+ if(isset($deps[$dep]) && in_array_ics($dep, $tdeps)){
/* Keep first base dn in mind, we could need this
* info if no valid base was found
@@ -117,12 +123,13 @@ class divListMimeTypes extends MultiSelectWindow
if(empty($first)) {
$first = $dep['dn'];
}
-
- $value = $ids[$dep['dn']];
- if ($this->selectedBase == $dep['dn']){
- $options.= "";
+
+ $value = $ids[$dep];
+ if ($this->selectedBase == $dep){
+ $found = TRUE;
+ $options.= "";
} else {
- $options.= "";
+ $options.= "";
}
}
}
@@ -183,6 +190,14 @@ class divListMimeTypes extends MultiSelectWindow
$listhead .= " ";
+ /* Add multiple copy & cut icons */
+ if(is_object($this->parent->CopyPasteHandler)){
+ $listhead .= " ";
+ $listhead .= " ";
+ }
+
$listhead .="";;
$this->SetListHeader($listhead);