Some acl fixes for groups

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

diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc
index 55704051becef510faab9104b99ce360869b56c8..b46e8ee0826dbf74225b9bd84e0dde0ea7b50b01 100644 (file)
--- a/plugins/admin/groups/class_divListGroup.inc
+++ b/plugins/admin/groups/class_divListGroup.inc
@@ -199,11 +199,8 @@ class divListGroup extends MultiSelectWindow
           src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'> ";
       }
 
-      if(preg_match("/r/",$ui->get_category_permissions($val['dn'],"groups"))){
-        $actions.= "<input class='center' type='image'
-          src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
-      }
-
+      $actions.= "<input class='center' type='image'
+        src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
 
       if(preg_match("/w/",$ui->get_permissions($val['dn'],"groups/group"))){
         $actions.= $this->GetSnapShotActions($val['dn']);

diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc
index 415a6b9641b4f760fc3b96fc24a629a7ad4293e1..69e6ce20738473cd3497846c822f3eb65cdc7ede 100755 (executable)
--- a/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/plugins/admin/ogroups/class_divListOGroup.inc
@@ -85,15 +85,32 @@ class divListOGroup extends MultiSelectWindow
        which are shown in the listbox on top of the listbox
      */
     $options= "";
-    foreach ($this->config->idepartments as $key => $value){
-      if ($this->selectedBase == $key){
-        $options.= "<option selected='selected' value='$key'>$value</option>";
-      } else {
-        $options.= "<option value='$key'>$value</option>";
+
+    /* Get all departments within this subtree */
+    $base = $this->config->current['BASE'];
+    $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
+                    array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH);
+
+    /* Load possible departments */
+    $ui= get_userinfo();
+    $tdeps= $ui->get_module_departments("ogroups");
+
+    $ids = $this->config->idepartments;
+
+    foreach($deps as $dep){
+      if(isset($ids[$dep['dn']]) && in_array_ics($dep['dn'], $tdeps)){
+
+        $value = $ids[$dep['dn']];
+        if ($this->selectedBase == $dep['dn']){
+          $options.= "<option selected='selected' value='".$dep['dn']."'>$value</option>";
+        } else {
+          $options.= "<option value='".$dep['dn']."'>$value</option>";
+        }
       }
     }
 
-    if($this->parent->CopyPasteHandler){
+    /* Get copy & paste icon */
+    if(preg_match("/w/",$ui->get_permissions($this->selectedBase,"ogroups/ogroup")) &&  $this->parent->CopyPasteHandler){
       $Copy_Paste = $this->parent->CopyPasteHandler->generatePasteIcon();
     }else{
       $Copy_Paste ="";
@@ -110,10 +127,20 @@ class divListOGroup extends MultiSelectWindow
       " <input class='center' type='image' src='images/list_reload.png' align='middle' 
       title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
       " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;";
-    $listhead .= $this->get_snapshot_header($this->selectedBase);
-    $listhead .=" <input class='center' type='image' align='middle' src='images/list_new_ogroup.png' 
-      title='"._("Create new object group")."' alt='"._("new")."' name='group_new'>".
-      $Copy_Paste.
+
+    $acls  = $ui->get_permissions($this->selectedBase,"ogroups/ogroup");
+    if(preg_match("/c/",$acls) && preg_match("/w/",$acls)){
+      $listhead .= $this->get_snapshot_header($this->selectedBase);
+    }else{
+      $listhead .= "<img class='center' src='images/restore_grey.png' alt=''>&nbsp;";
+    }
+
+    if(preg_match("/c/",$acls)) {
+      $listhead .=" <input class='center' type='image' align='middle' src='images/list_new_ogroup.png' 
+        title='"._("Create new object group")."' alt='"._("new")."' name='group_new'>";
+    }
+
+    $listhead .=  $Copy_Paste.
       " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
       _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
       " <input class='center' type='image' src='images/list_submit.png' align='middle' 
@@ -145,23 +172,36 @@ class divListOGroup extends MultiSelectWindow
     if($this->parent->snapshotEnabled()){
       $action_col_size += 38; 
     }
+  
+    $ui = get_userinfo();
 
     // Assigning ogroups
     foreach($list as $key => $val){
 
       /* Create action icons */
       $actions= "";
-      if($this->parent->CopyPasteHandler){
+      if($this->parent->CopyPasteHandler && preg_match("/w/",$ui->get_category_permissions($val['dn'],"ogroups"))){
         $actions.= "<input class='center' type='image'
           src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";
         $actions.= "<input class='center' type='image'
           src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'>&nbsp;";
       }
+
+
       $actions.= "<input class='center' type='image'
         src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
-      $actions.= $this->GetSnapShotActions($val['dn']);
-      $actions.= "<input class='center' type='image'
-        src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+    
+      if(preg_match("/w/",$ui->get_permissions($val['dn'],"groups/group"))){
+        $actions.= $this->GetSnapShotActions($val['dn']);
+      }
+
+      if(preg_match("/d/",$ui->get_permissions($val['dn'],"ogroups/ogroup"))) {
+        $actions.= "<input class='center' type='image'
+          src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+      }else{
+        $action.= "<img class='center' src='images/empty.png' alt='&nbsp;'
+          title='"._("You are not allowed to remove this entry.")."'>";
+      }
 
 
       if(isset($val['mail'])){

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 8dafd74e517343c5d82230116d8da09ad96a407f..0c64897d726c4003adc65fe339d7783cf3c668cb 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -156,8 +156,8 @@ class ogroupManagement extends plugin
       $this->dn= "new";
 
       /* Create new usertab object */
-      $this->ogroup= new ogrouptabs($this->config,
-          $this->config->data['TABS']['OGROUPTABS'], $this->dn);
+      $this->ogroup= new ogrouptabs($this->config,$this->config->data['TABS']['OGROUPTABS'], $this->dn,"ogroups");
+      $this->ogroup->set_acl_base($this->DivListOGroup->selectedBase);
     }
 
 

diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index dbae97bb2a337e1a635168aafbbe2a758c8d476f..a8944ce26070a3dad00befd58a3ff3d686d158cf 100644 (file)
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -128,10 +128,10 @@ class ogrouptabs extends tabs
     return ( $str);
   }  
 
-  function ogrouptabs($config, $data, $dn)
+  function ogrouptabs($config, $data, $dn,$category ="")
   {
 
-    tabs::tabs($config, $data, $dn);
+    tabs::tabs($config, $data, $dn, $category);
     $this->base= $this->by_object['ogroup']->base;
 
     /* Insert extra tabs for several object types - if present */