Removed unwanted print ^^

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2210 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index deafb3eb8ef0098bfdbf7558d4fdb101cbbd35f3..619c3c62ff86518e76dafabea0ed1fcb056e07e5 100644 (file)
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -40,6 +40,7 @@ $ACLD['blocklists']= array("cn",
                        "delete",
                        "description",
                        "goFaxBlocklist");
+$ACLD['ogroup']=   array("ogroup","create","delete","cn", "description", "gosaGroupObjects","base");
 $ACLD['group']=      array("cn",
                        "create",
                        "delete",
@@ -47,7 +48,6 @@ $ACLD['group']=      array("cn",
                        "force_gid",
                        "password",
                        "gidNumber");
-$ACLD['ogroup']=   array("ogroup","create","delete","cn", "description", "gosaGroupObjects","base");
 $ACLD['appgroup']=   array();
 $ACLD['all']=        array();
 $ACLD['mailgroup']=  array("default_permission",

diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index c8378315e41002079749fa4283c94c20d2749f78..8b2c2b6ae20e7e86ee88ca1ce3f2a2c9e17cdc7c 100644 (file)
--- a/plugins/admin/groups/class_groupGeneric.inc
+++ b/plugins/admin/groups/class_groupGeneric.inc
@@ -158,7 +158,10 @@ class group extends plugin
        /* Call parent execute */
        plugin::execute();
 
-    /* Do we represent a valid group? */
+  $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= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
         _("This 'dn' is no group.")."</b>";
@@ -617,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'.");
     }
 

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 49cb8bf9834c430684145d7cd856219a31084eba..4f9dd781968b6387e30d0d1e3b0c34ea279dbbc6 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -182,7 +182,6 @@ class groupManagement extends plugin
       /* Create new usertab object */
       $this->grouptab= new grouptabs($this->config,
           $this->config->data['TABS']['GROUPTABS'], $this->dn);
-      $this->grouptab->set_acl(array(':all'));
     }
 
     /* Cancel dialogs */