Some acl fixes

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

diff --git a/plugins/admin/mimetypes/class_mimetypeManagement.inc b/plugins/admin/mimetypes/class_mimetypeManagement.inc
index 3f04ac0aadb7da952ed264d0f24b5225eff0b9f4..bca44d97930d02eacebf5d53ac46addd66ba41f7 100755 (executable)
--- a/plugins/admin/mimetypes/class_mimetypeManagement.inc
+++ b/plugins/admin/mimetypes/class_mimetypeManagement.inc
@@ -448,7 +448,7 @@ class mimetypeManagement extends plugin
       $dn = $this->mimetypes[$s_entry]['dn'];
 
       /* Check acls */
-      $acl_all= $this->ui->has_complete_category_acls($dn,"ogroups");
+      $acl_all= $this->ui->has_complete_category_acls($dn,"mimitypes");
       if(preg_match("/(c.*w|w.*c)/",$acl_all)){
         $obj    = new mimetabs($this->config, $this->config->data['TABS']['MIMETABS'], $dn,"mimetypes");
         $obj->set_acl_base($this->dn);
@@ -465,7 +465,7 @@ class mimetypeManagement extends plugin
       $dn = $this->mimetypes[$s_entry]['dn'];
 
       /* Check acls */
-      $acl_all= $this->ui->has_complete_category_acls($dn,"ogroups");
+      $acl_all= $this->ui->has_complete_category_acls($dn,"mimetypes");
       if(preg_match("/(c.*w|w.*c)/",$acl_all)){
         $obj = new mimetabs($this->config, $this->config->data['TABS']['MIMETABS'], $dn);
         $this->CopyPasteHandler->Cut($obj);

diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc
index 3c6ed8e66e96cfa005551e3311aa3cdb11da8f4f..2609fda973ec6da4c266234459f2018d5e9b0e17 100755 (executable)
--- a/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/plugins/admin/ogroups/class_divListOGroup.inc
@@ -111,7 +111,7 @@ class divListOGroup extends MultiSelectWindow
 
     /* Get copy & paste icon */
     $acls  = $ui->get_permissions($this->selectedBase,"ogroups/ogroup");
-    $acl_all= $ui->has_complete_category_acls($this->selectedBase,"groups");
+    $acl_all= $ui->has_complete_category_acls($this->selectedBase,"ogroups");
     if(preg_match("/(c.*w|w.*c)/",$acl_all) &&  $this->parent->CopyPasteHandler){
       $Copy_Paste = $this->parent->CopyPasteHandler->generatePasteIcon();
     }else{
@@ -182,7 +182,7 @@ class divListOGroup extends MultiSelectWindow
 
       /* Create action icons */
       $actions= "";
-      $acl_all= $ui->has_complete_category_acls($val['dn'],"groups");
+      $acl_all= $ui->has_complete_category_acls($val['dn'],"ogroups");
       if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){
         $actions.= "<input class='center' type='image'
           src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'>&nbsp;";

diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc
index 3edbf604d41ec5f1ec1f4e5a236eb6844fae1c60..499eb1762904769c93f0a9558c6d033333b06f28 100644 (file)
--- a/plugins/admin/users/class_divListUsers.inc
+++ b/plugins/admin/users/class_divListUsers.inc
@@ -88,12 +88,9 @@ class divListUsers extends MultiSelectWindow
     /* Load possible departments */
     $ui= get_userinfo();
     $tdeps= $ui->get_module_departments("users");
-
     $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>";