X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupGeneric.inc;h=d9c523c9f0859dc6060d90cd4ad0ea2c16a60a2e;hb=46b995937ce49d16cd6d3d1e1f69a70d421453e8;hp=f4fc95da9122c6d0c375abb1b6088e82662408ed;hpb=e299f0ca47a924516f2afbe4e922f2418b75315c;p=gosa.git
diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index f4fc95da9..d9c523c9f 100644
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -137,7 +137,7 @@ class group extends plugin
{
/* Do we represent a valid group? */
if (!$this->is_account && $this->parent == NULL){
- $display= "
".
+ $display= "
".
_("This 'dn' is no group.")."";
return ($display);
}
@@ -222,17 +222,18 @@ class group extends plugin
}
}
$smarty->assign("users", $users);
+ $smarty->assign("apply", apply_filter());
$display= $smarty->fetch (get_template_path('group_objects.tpl', TRUE, dirname(__FILE__)));
return ($display);
}
/* Bases / Departments */
- if ($this->dn == "new"){
- $ui= get_userinfo();
- $this->base= dn2base($ui->dn);
+ if (isset($_POST['base'])){
+ $this->base= $_POST['base'];
} else {
- if (isset($_POST['base'])){
- $this->base= $_POST['base'];
+ if ($this->dn == "new"){
+ $ui= get_userinfo();
+ $this->base= dn2base($ui->dn);
} else {
$this->base= preg_replace ("/^[^,]+,[^,]+,/", "", $this->dn);
}
@@ -280,6 +281,8 @@ class group extends plugin
$smarty->assign("sambaDomainNameACL", chkacl($this->acl, "sambaDomainName"));
if ($this->fon_group){
$smarty->assign("fon_group", "checked");
+ } else {
+ $smarty->assign("fon_group", "");
}
$smarty->assign("fon_groupACL", chkacl($this->acl, "fon_group"));
@@ -289,6 +292,11 @@ class group extends plugin
$smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
}
+ /* Missing ACL's */
+ foreach (array("base", "smbgroup", "members") as $val){
+ $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
+ }
+
/* Show main page */
$smarty->assign("alphabet", generate_alphabet(10));
$smarty->assign("search_image", get_template_path('images/search.png'));