X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupGeneric.inc;h=39008f756ffcc67080432c4623f6e7f5af69bedb;hb=0b1c07be5aec5f7232881db7003517e337e85b88;hp=7ae9d8b5db093d862b099f334f880b73ced44ea6;hpb=f08888ac1e3d75269059bf70cd59ad6661040083;p=gosa.git
diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 7ae9d8b5d..39008f756 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,6 +222,7 @@ 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);
}
@@ -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'));
@@ -329,7 +337,7 @@ class group extends plugin
natcasesort ($this->users);
reset ($this->users);
- $ldap->cd ($this->config->current['BASE']);
+ $ldap->cd ($gufilter['dselect']);
$ldap->search ("(&(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate))(!(uid=*$)))");
$this->allusers= array();
while ($attrs= $ldap->fetch()){