X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Fclass_divListOGroup.inc;h=32276f8969df7250911423ed45cde8cc7f08a3d3;hb=03ace41f27d274a8a82ad57defa833bf6cecd6d6;hp=c661eb577a2a65fee27defd1cd2084d1c58b3070;hpb=2738e56e22f23c43e980dea2d34a3c21baa645e9;p=gosa.git diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc index c661eb577..32276f896 100755 --- a/plugins/admin/ogroups/class_divListOGroup.inc +++ b/plugins/admin/ogroups/class_divListOGroup.inc @@ -48,12 +48,17 @@ class divListOGroup extends MultiSelectWindow $this->EnableSaveButton (false); /* Dynamic action col, depending on snapshot icons */ - $action_col_size = 70; + $action_col_size = 80; if($this->parent->snapshotEnabled()){ $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; @@ -121,17 +153,8 @@ class divListOGroup extends MultiSelectWindow $add_sep = true; } - // Managment - $listhead = "