X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fgroups%2Fclass_groupGeneric.inc;h=8b2c2b6ae20e7e86ee88ca1ce3f2a2c9e17cdc7c;hb=ca98ca8c7d1adccfcf78ccc86faa5d9e2d69967e;hp=37e1814d54502b559cd29d631822faca69cc5665;hpb=42676da889a38b777620ff33ea6c2635a4f89beb;p=gosa.git
diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 37e1814d5..8b2c2b6ae 100644
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -32,6 +32,7 @@ class group extends plugin
var $orig_dn= "";
var $has_mailAccount= FALSE;
var $group_dialog= FALSE;
+ var $nagios_group =FALSE;
/* attribute list for save action */
var $attributes= array("cn", "description", "gidNumber");
@@ -154,7 +155,13 @@ class group extends plugin
function execute()
{
- /* Do we represent a valid group? */
+ /* Call parent execute */
+ plugin::execute();
+
+ $ui= get_userinfo();
+ $acla= get_permissions ($ui->dn, $ui->subtreeACL);
+ $this->acl= get_module_permission($acla, "group", $ui->dn);
+ /* Do we represent a valid group? */
if (!$this->is_account && $this->parent == NULL){
$display= "
".
_("This 'dn' is no group.")."";
@@ -200,6 +207,18 @@ class group extends plugin
$smarty->assign("samba3", "");
}
+ if(search_config($this->config->data['MENU'], "nagiosaccount", "CLASS")){
+ $smarty->assign("nagios",true);
+ }else{
+ $smarty->assign("nagios",false);
+ }
+
+ if(search_config($this->config->data['MENU'], "phoneAccount", "CLASS")){
+ $smarty->assign("pickupGroup",true);
+ }else{
+ $smarty->assign("pickupGroup",false);
+ }
+
/* Manage object add dialog */
if ($this->group_dialog){
@@ -288,6 +307,8 @@ class group extends plugin
}
if ($this->force_gid != "1"){
$smarty->assign("forceMode", "disabled");
+ }else{
+ $smarty->assign("forceMode", "");
}
$smarty->assign("force_gidACL", chkacl($this->acl, "gidNumber"));
$smarty->assign("sambaDomainNameACL", chkacl($this->acl, "sambaDomainName"));
@@ -599,9 +620,9 @@ class group extends plugin
}
$ui= get_userinfo();
- $acl= get_permissions ($new_dn, $ui->subtreeACL);
- $acl= get_module_permission($acl, "group", $new_dn);
- if (chkacl($acl, "create") != ""){
+ $acl= get_permissions ($ui->dn, $ui->subtreeACL);
+ $acl= get_module_permission($acl, "group", $ui->dn);
+ if (chkacl($this->acl, "create") != ""){
$message[]= _("You have no permissions to create a group on this 'Base'.");
}