From e752d25d49596911c4ca37a0e86ad79e8cdfa352 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 2 Dec 2005 12:50:54 +0000
Subject: [PATCH] Updated ogroup acls

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2207 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/admin/groups/acl_definition.inc          | 1 +
 plugins/admin/ogroups/class_ogroup.inc           | 7 +++++++
 plugins/admin/ogroups/class_ogroupManagement.inc | 5 ++---
 plugins/admin/ogroups/generic.tpl                | 6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index 69d4c16c8..02c8004ae 100644
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -43,6 +43,7 @@ $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/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index b69b284ae..a88fd660a 100644
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -83,6 +83,12 @@ class ogroup extends plugin
      $this->base = $_SESSION['ogroupfilter']['depselect'];
     }
 
+     /* set permissions */
+    $ui= get_userinfo();
+    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
+    $this->acl= get_module_permission($acl, "ogroup", $ui->dn);
+
+
     /* Load member data */
     $this->reload();
   }
@@ -118,6 +124,7 @@ class ogroup extends plugin
 	/* Call parent execute */
 	plugin::execute();
 
+    print $this->acl;
     
     $this->reload();
 
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 1f33b87d3..09210ac1e 100644
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -192,8 +192,7 @@ class ogroupManagement extends plugin
 
       /* Create new usertab object */
       $this->ogroup= new ogrouptabs($this->config,
-          $this->config->data['TABS']['OGROUPTABS'], $this->dn);
-      $this->ogroup->set_acl(array(':all'));
+      $this->config->data['TABS']['OGROUPTABS'], $this->dn);
     }
 
     if ($s_action=="del"){
@@ -234,7 +233,7 @@ class ogroupManagement extends plugin
 
         /* Delete request is permitted, perform LDAP action */
         $this->ogroup= new ogrouptabs($this->config,
-            $this->config->data['TABS']['OGROUPTABS'], $this->dn);
+        $this->config->data['TABS']['OGROUPTABS'], $this->dn);
         $this->ogroup->set_acl(array($this->acl));
         $this->ogroup->delete ();
         gosa_log ("Object group'".$this->dn."' has been removed");
diff --git a/plugins/admin/ogroups/generic.tpl b/plugins/admin/ogroups/generic.tpl
index 6a8a7b3a8..0cbbd2fba 100644
--- a/plugins/admin/ogroups/generic.tpl
+++ b/plugins/admin/ogroups/generic.tpl
@@ -32,12 +32,12 @@
   <td style="border-left:1px solid #A0A0A0; padding-left:10px;">
    <b><LABEL for="members">{t}Member objects{/t}</LABEL></b>&nbsp;({$combinedObjects})
    <br>
-   <select style="width:100%; height:450px;" id="members" name="members[]" size="15" multiple>
+   <select style="width:100%; height:450px;" id="members" name="members[]" size="15" multiple {$gosaGroupObjectsACL}>
     {$members}
    </select>
    <br>
-   <input type=submit value="{t}Add{/t}" name="edit_membership" {$membersACL}>&nbsp;
-   <input type=submit value="{t}Delete{/t}" name="delete_membership" {$membersACL}>
+   <input type=submit value="{t}Add{/t}" name="edit_membership" {$gosaGroupObjectsACL}>&nbsp;
+   <input type=submit value="{t}Delete{/t}" name="delete_membership" {$gosaGroupObjectsACL}>
   </td>
  </tr>
 </table>
-- 
2.30.2