X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Fclass_divListOGroup.inc;h=32276f8969df7250911423ed45cde8cc7f08a3d3;hb=bda4c3aedb1c60fd9945d73a8b589468602bc685;hp=ad23b1f3dd891d083ad125691a52bc8a7f7b16bf;hpb=6fcd93f05a5f78184d865ea4fb10783f8053ff38;p=gosa.git
diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc
index ad23b1f3d..32276f896 100755
--- a/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/plugins/admin/ogroups/class_divListOGroup.inc
@@ -53,7 +53,12 @@ class divListOGroup extends MultiSelectWindow
$action_col_size += 38;
}
+ /* Toggle all selected / deselected */
+ $chk = "";
+
/* set Page header */
+ $this->AddHeader(array("string"=> $chk, "attach"=>"style='width:20px;'"));
$this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'"));
$this->AddHeader(array("string" => _("Name of object groups")." / "._("Departments"), "attach" => "style=''"));
$this->AddHeader(array("string" => _("Properties"), "attach" => "style='width:136px;'"));
@@ -87,28 +92,55 @@ class divListOGroup extends MultiSelectWindow
$options= "";
/* Get all departments within this subtree */
+ $ui= get_userinfo();
+ $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 */
+ $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();
$tdeps= $ui->get_module_departments("ogroups");
-
$ids = $this->config->idepartments;
+ $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
+ */
+ if(empty($first)) {
+ $first = $dep['dn'];
+ }
- foreach($deps as $dep){
- if(isset($ids[$dep['dn']]) && in_array_ics($dep['dn'], $tdeps)){
-
- $value = $ids[$dep['dn']];
- if ($this->selectedBase == $dep['dn']){
- $options.= "";
+ $value = $ids[$dep];
+ if ($this->selectedBase == $dep){
+ $found = TRUE;
+ $options.= "";
} else {
- $options.= "";
+ $options.= "";
}
}
}
+ /* The currently used base is not visible with your acl setup.
+ * Set base to first useable base.
+ */
+ if(!$found){
+ $this->selectedBase = $first;
+ }
+
/* Add a seperator after displaying c&p and snapshot icons ? */
$add_sep = false;
@@ -148,8 +180,13 @@ class divListOGroup extends MultiSelectWindow
/* Add department selector */
$listhead .= _("Base")." ".
" ".
- "";
+ title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'> ";
+
+ /* Multiple options */
+ $listhead .= " ";
+
+ $listhead .="";
$this->SetListHeader($listhead);
}
@@ -219,12 +256,15 @@ class divListOGroup extends MultiSelectWindow
}else{
$desc = " - [ ".$val['description'][0]." ]";
}
+ /* Create each field */
+ $field0 = array("string" => "" ,
+ "attach" => "style='width:20px;'");
$field1 = array("string" => "
", "attach" => "style='text-align:center;width: 20px;'");
$field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
$field3 = array("string" => preg_replace("/%KEY/", $key, $this->parent->convert_list($val))." ".$mail, "attach" => "style='width:136px;'");
$field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'");
- $this->AddElement(array($field1,$field2,$field3,$field4));
+ $this->AddElement(array($field0,$field1,$field2,$field3,$field4));
}
}